Merge branch 'springdoc:master' into add-api-response-for-the-httpcode-specified-by-responseStatus

rudolfgrauberger · web-flow · commit 2fb6b4222460 · 2022-08-08T07:19:49.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java
@@ -184,10 +184,8 @@ public static Optional<Content> getContent(io.swagger.v3.oas.annotations.media.C
 			if (StringUtils.isNotBlank(annotationContent.mediaType())) {
 				content.addMediaType(annotationContent.mediaType(), mediaType);
 			}
-			else {
-				if (mediaType.getSchema() != null || mediaType.getEncoding() != null || mediaType.getExample() != null || mediaType.getExamples() != null || mediaType.getExtensions() != null)
-					applyTypes(classTypes, methodTypes, content, mediaType);
-			}
+			else if (mediaType.getSchema() != null || mediaType.getEncoding() != null || mediaType.getExample() != null || mediaType.getExamples() != null || mediaType.getExtensions() != null)
+				applyTypes(classTypes, methodTypes, content, mediaType);
 		}
 
 		if (content.size() == 0 && annotationContents.length != 1) {
@@ -353,7 +351,7 @@ private static MediaType getMediaType(Schema schema, Components components, Json
 							mediaType.schema(new Schema<Object>().type("object"));
 						}
 						Schema oSchema = mediaType.getSchema();
-						for (SchemaProperty sp: annotationContent.schemaProperties()) {
+						for (SchemaProperty sp : annotationContent.schemaProperties()) {
 							Class<?> schemaImplementation = sp.schema().implementation();
 							boolean isArray = false;
 							if (schemaImplementation == Void.class) {
@@ -366,7 +364,8 @@ private static MediaType getMediaType(Schema schema, Components components, Json
 									.ifPresent(s -> {
 										if ("array".equals(oSchema.getType())) {
 											oSchema.getItems().addProperty(sp.name(), s);
-										} else {
+										}
+										else {
 											oSchema.addProperty(sp.name(), s);
 										}
 									});
@@ -382,7 +381,8 @@ private static MediaType getMediaType(Schema schema, Components components, Json
 								.ifPresent(s -> {
 											if ("array".equals(mediaType.getSchema().getType())) {
 												mediaType.getSchema().getItems().additionalProperties(s);
-											} else {
+											}
+											else {
 												mediaType.getSchema().additionalProperties(s);
 											}
 										}
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java
@@ -30,8 +30,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.springdoc.core.Constants.SPRINGDOC_SORT_CONVERTER_ENABLED;
-import org.springframework.data.domain.Sort;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -94,6 +92,7 @@
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -110,6 +109,7 @@
 import static org.springdoc.core.Constants.SPRINGDOC_SCHEMA_RESOLVE_PROPERTIES;
 import static org.springdoc.core.Constants.SPRINGDOC_SHOW_ACTUATOR;
 import static org.springdoc.core.Constants.SPRINGDOC_SHOW_SPRING_CLOUD_FUNCTIONS;
+import static org.springdoc.core.Constants.SPRINGDOC_SORT_CONVERTER_ENABLED;
 import static org.springdoc.core.SpringDocUtils.getConfig;
 
 /**
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigParameters.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigParameters.java
@@ -24,7 +24,6 @@
 
 import java.net.URL;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigProperties.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigProperties.java
@@ -22,17 +22,18 @@
 
 package org.springdoc.core;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.StringUtils;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import static org.springdoc.core.Constants.SPRINGDOC_SWAGGER_UI_ENABLED;
 
 
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java
@@ -1,5 +1,3 @@
-package org.springdoc.core.converters;
-
 /*
  *
  *  *
@@ -21,6 +19,9 @@
  *  *
  *
  */
+
+package org.springdoc.core.converters;
+
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JavaType;
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/models/Sort.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/converters/models/Sort.java
@@ -1,5 +1,3 @@
-package org.springdoc.core.converters.models;
-
 /*
  *
  *  *
@@ -22,6 +20,8 @@
  *
  */
 
+package org.springdoc.core.converters.models;
+
 import java.util.List;
 import java.util.Objects;
 
diff --git a/springdoc-openapi-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java b/springdoc-openapi-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/HelloController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/HelloController.java
@@ -18,7 +18,10 @@
 
 package test.org.springdoc.api.app31;
 
+import java.util.List;
+
 import org.springdoc.api.annotations.ParameterObject;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
@@ -27,8 +30,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 public class HelloController {
 
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/SpringDocApp31Test.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/SpringDocApp31Test.java
@@ -23,9 +23,10 @@
 
 package test.org.springdoc.api.app31;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 public class SpringDocApp31Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/HelloController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/HelloController.java
@@ -18,14 +18,15 @@
 
 package test.org.springdoc.api.app32;
 
+import java.util.List;
+
 import org.springdoc.api.annotations.ParameterObject;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 public class HelloController {
 
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/SpringDocApp32Test.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/SpringDocApp32Test.java
@@ -23,21 +23,22 @@
 
 package test.org.springdoc.api.app32;
 
+import java.util.Optional;
+
 import org.springdoc.core.customizers.DataRestDelegatingMethodParameterCustomizer;
 import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
 import org.springdoc.core.providers.RepositoryRestConfigurationProvider;
 import org.springdoc.core.providers.SpringDataWebPropertiesProvider;
 import org.springdoc.data.rest.SpringDocDataRestConfiguration;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.test.context.TestPropertySource;
-import test.org.springdoc.api.AbstractSpringDocTest;
-
-import java.util.Optional;
 
 @TestPropertySource(properties = "spring.data.web.sort.sort-parameter=sorts")
 @EnableAutoConfiguration(exclude = {
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/ExampleSort.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/ExampleSort.java
@@ -1,10 +1,11 @@
 package test.org.springdoc.api.app33;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.Parameter;
-import org.springframework.data.domain.Sort;
 
-import java.util.List;
+import org.springframework.data.domain.Sort;
 
 public class ExampleSort extends Sort {
 
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/ExampleSortReplacement.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/ExampleSortReplacement.java
@@ -1,10 +1,10 @@
 package test.org.springdoc.api.app33;
 
+import java.util.List;
+
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springdoc.core.converters.models.Sort;
 
-import java.util.List;
-
 public class ExampleSortReplacement extends Sort {
 
 	@Parameter(description = "Anything")
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/HelloController.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/HelloController.java
@@ -1,6 +1,7 @@
 package test.org.springdoc.api.app33;
 
 import org.springdoc.api.annotations.ParameterObject;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/SpringDocApp33Test.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app33/SpringDocApp33Test.java
@@ -19,9 +19,10 @@
 package test.org.springdoc.api.app33;
 
 import org.springdoc.core.SpringDocUtils;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 public class SpringDocApp33Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication
diff --git a/springdoc-openapi-groovy/pom.xml b/springdoc-openapi-groovy/pom.xml
@@ -17,6 +17,7 @@
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
diff --git a/springdoc-openapi-groovy/src/main/java/org/springdoc/groovy/SpringDocGroovyConfiguration.java b/springdoc-openapi-groovy/src/main/java/org/springdoc/groovy/SpringDocGroovyConfiguration.java
@@ -29,6 +29,7 @@
 import org.springdoc.core.providers.ObjectMapperProvider;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,6 +44,7 @@
 @Lazy(false)
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
+@ConditionalOnClass(MetaClass.class)
 @ConditionalOnBean(SpringDocConfiguration.class)
 public class SpringDocGroovyConfiguration {
 
diff --git a/springdoc-openapi-javadoc/src/main/java/org/springdoc/openapi/javadoc/JavadocPropertyCustomizer.java b/springdoc-openapi-javadoc/src/main/java/org/springdoc/openapi/javadoc/JavadocPropertyCustomizer.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.JavaType;
 import io.swagger.v3.core.converter.AnnotatedType;
diff --git a/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app165/HelloController.java b/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app165/HelloController.java
@@ -18,11 +18,11 @@
 
 package test.org.springdoc.api.app165;
 
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-
 /**
  * The type Hello controller.
  */
diff --git a/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app165/SpringDocApp165Test.java b/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app165/SpringDocApp165Test.java
@@ -18,10 +18,10 @@
 
 package test.org.springdoc.api.app165;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 /**
  * The type Spring doc app 165 test.
  */
diff --git a/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app166/HelloController.java b/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app166/HelloController.java
@@ -24,6 +24,7 @@
 
 
 import org.springdoc.api.annotations.ParameterObject;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app166/SpringDocApp166Test.java b/springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app166/SpringDocApp166Test.java
@@ -18,9 +18,10 @@
 
 package test.org.springdoc.api.app166;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 /**
  * The type Spring doc app 165 test.
  */
diff --git a/springdoc-openapi-native/src/test/java/test/org/springdoc/api/app1/TestApplicationTests.java b/springdoc-openapi-native/src/test/java/test/org/springdoc/api/app1/TestApplicationTests.java
@@ -23,6 +23,7 @@
 package test.org.springdoc.api.app1;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app186/SpringDocApp186Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app186/SpringDocApp186Test.java
@@ -20,21 +20,21 @@
 
 package test.org.springdoc.api.app186;
 
-import static org.springdoc.core.Constants.ALL_PATTERN;
-
 import org.junit.jupiter.api.Test;
 import org.springdoc.core.Constants;
 import org.springdoc.core.GroupedOpenApi;
 import org.springdoc.core.customizers.OpenApiCustomiser;
 import org.springdoc.core.customizers.OperationCustomizer;
+import test.org.springdoc.api.AbstractCommonTest;
+
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.context.TestPropertySource;
 
-import test.org.springdoc.api.AbstractCommonTest;
+import static org.springdoc.core.Constants.ALL_PATTERN;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties={ "springdoc.show-actuator=true",
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app186/SpringDocApp186Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app186/SpringDocApp186Test.java
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/HelloController.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/HelloController.java
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app191/HelloController.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app191/HelloController.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-package org.springdoc.core.converters;`
`2`		`-`
`3`	`1`	`/*`
`4`	`2`	`*`
`5`	`3`	`* *`
`@@ -21,6 +19,9 @@`
`21`	`19`	`* *`
`22`	`20`	`*`
`23`	`21`	`*/`
	`22`	`+`
	`23`	`+package org.springdoc.core.converters;`
	`24`	`+`
`24`	`25`	`import java.util.Iterator;`
`25`	`26`
`26`	`27`	`import com.fasterxml.jackson.databind.JavaType;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-package org.springdoc.core.converters.models;`
`2`		`-`
`3`	`1`	`/*`
`4`	`2`	`*`
`5`	`3`	`* *`
`@@ -22,6 +20,8 @@`
`22`	`20`	`*`
`23`	`21`	`*/`
`24`	`22`
	`23`	`+package org.springdoc.core.converters.models;`
	`24`	`+`
`25`	`25`	`import java.util.List;`
`26`	`26`	`import java.util.Objects;`
`27`	`27`