Skip to content

Commit fb02518

Browse files
committed
code review
1 parent 14bb1bf commit fb02518

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,7 @@ private static MediaType getMediaType(Schema schema, Components components, Json
353353
Schema oSchema = mediaType.getSchema();
354354
for (SchemaProperty sp : annotationContent.schemaProperties()) {
355355
Class<?> schemaImplementation = sp.schema().implementation();
356-
boolean isArray = false;
357-
if (schemaImplementation == Void.class) {
358-
schemaImplementation = sp.array().schema().implementation();
359-
if (schemaImplementation != Void.class) {
360-
isArray = true;
361-
}
362-
}
356+
boolean isArray = isArray(annotationContent);
363357
getSchema(sp.schema(), sp.array(), isArray, schemaImplementation, components, jsonViewAnnotation)
364358
.ifPresent(s -> {
365359
if ("array".equals(oSchema.getType())) {

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
7676
import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
7777
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
78+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
7879
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
7980
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
8081
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
@@ -164,6 +165,7 @@ AdditionalModelsConverter additionalModelsConverter(ObjectMapperProvider objectM
164165
*/
165166
@Bean
166167
@Lazy(false)
168+
@ConditionalOnBean(PropertyCustomizer.class)
167169
PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<PropertyCustomizer>> customizers) {
168170
return new PropertyCustomizingConverter(customizers);
169171
}

0 commit comments

Comments
 (0)