Skip to content

Commit cde2afa

Browse files
committed
code review
1 parent 806187f commit cde2afa

File tree

2 files changed

+4
-11
lines changed
  • springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service
  • springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results

2 files changed

+4
-11
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.util.stream.Collectors;
4343
import java.util.stream.Stream;
4444

45-
import com.fasterxml.jackson.annotation.JsonInclude;
4645
import com.fasterxml.jackson.core.JsonProcessingException;
4746
import com.fasterxml.jackson.databind.ObjectMapper;
4847
import io.swagger.v3.core.jackson.TypeNameResolver;
@@ -71,7 +70,6 @@
7170
import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
7271
import org.springdoc.core.properties.SpringDocConfigProperties;
7372
import org.springdoc.core.providers.JavadocProvider;
74-
import org.springdoc.core.providers.ObjectMapperProvider;
7573
import org.springdoc.core.utils.PropertyResolverUtils;
7674

7775
import org.springframework.beans.BeansException;
@@ -246,11 +244,8 @@ public OpenAPI build(Locale locale) {
246244
}
247245
else {
248246
try {
249-
ObjectMapper objectMapper = ObjectMapperProvider.createJson(springDocConfigProperties);
247+
ObjectMapper objectMapper = new ObjectMapper();
250248
calculatedOpenAPI = objectMapper.readValue(objectMapper.writeValueAsString(openAPI), OpenAPI.class);
251-
objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
252-
Map extensionsClone = objectMapper.readValue(objectMapper.writeValueAsString(openAPI.getExtensions()), Map.class);
253-
calculatedOpenAPI.extensions(extensionsClone);
254249
}
255250
catch (JsonProcessingException e) {
256251
LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage());
@@ -614,9 +609,9 @@ private Info resolveProperties(Info info, Locale locale) {
614609

615610
if(propertyResolverUtils.isResolveExtensionsProperties()){
616611
Map<String, Object> extensionsResolved = propertyResolverUtils.resolveExtensions(locale, info.getExtensions());
617-
info.setExtensions(extensionsResolved);
612+
info.setExtensions(extensionsResolved);
618613
}
619-
614+
620615
return info;
621616
}
622617

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/app9.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@
6262
"components": {
6363
"schemas": {
6464
"FeedResponse": {
65-
"type": "object",
6665
"properties": {
6766
"_links": {
68-
"type": "object",
6967
"properties": {
7068
"next": {
7169
"$ref": "#/components/schemas/Link"
@@ -139,4 +137,4 @@
139137
}
140138
}
141139
}
142-
}
140+
}

0 commit comments

Comments
 (0)