code review

springdoc · Aug 20, 2022 · fb02518 · fb02518
1 parent 14bb1bf
commit fb02518
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
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
@@ -353,13 +353,7 @@ private static MediaType getMediaType(Schema schema, Components components, Json
 						Schema oSchema = mediaType.getSchema();
 						for (SchemaProperty sp : annotationContent.schemaProperties()) {
 							Class<?> schemaImplementation = sp.schema().implementation();
-							boolean isArray = false;
-							if (schemaImplementation == Void.class) {
-								schemaImplementation = sp.array().schema().implementation();
-								if (schemaImplementation != Void.class) {
-									isArray = true;
-								}
-							}
+							boolean isArray = isArray(annotationContent);
 							getSchema(sp.schema(), sp.array(), isArray, schemaImplementation, components, jsonViewAnnotation)
 									.ifPresent(s -> {
 										if ("array".equals(oSchema.getType())) {

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
@@ -75,6 +75,7 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
@@ -164,6 +165,7 @@ AdditionalModelsConverter additionalModelsConverter(ObjectMapperProvider objectM
 	 */
 	@Bean
 	@Lazy(false)
+	@ConditionalOnBean(PropertyCustomizer.class)
 	PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<PropertyCustomizer>> customizers) {
 		return new PropertyCustomizingConverter(customizers);
 	}