|
42 | 42 | import java.util.stream.Collectors;
|
43 | 43 | import java.util.stream.Stream;
|
44 | 44 |
|
45 |
| -import com.fasterxml.jackson.annotation.JsonInclude; |
46 | 45 | import com.fasterxml.jackson.core.JsonProcessingException;
|
47 | 46 | import com.fasterxml.jackson.databind.ObjectMapper;
|
48 | 47 | import io.swagger.v3.core.jackson.TypeNameResolver;
|
|
71 | 70 | import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
|
72 | 71 | import org.springdoc.core.properties.SpringDocConfigProperties;
|
73 | 72 | import org.springdoc.core.providers.JavadocProvider;
|
74 |
| -import org.springdoc.core.providers.ObjectMapperProvider; |
75 | 73 | import org.springdoc.core.utils.PropertyResolverUtils;
|
76 | 74 |
|
77 | 75 | import org.springframework.beans.BeansException;
|
@@ -246,11 +244,8 @@ public OpenAPI build(Locale locale) {
|
246 | 244 | }
|
247 | 245 | else {
|
248 | 246 | try {
|
249 |
| - ObjectMapper objectMapper = ObjectMapperProvider.createJson(springDocConfigProperties); |
| 247 | + ObjectMapper objectMapper = new ObjectMapper(); |
250 | 248 | 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); |
254 | 249 | }
|
255 | 250 | catch (JsonProcessingException e) {
|
256 | 251 | LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage());
|
@@ -614,9 +609,9 @@ private Info resolveProperties(Info info, Locale locale) {
|
614 | 609 |
|
615 | 610 | if(propertyResolverUtils.isResolveExtensionsProperties()){
|
616 | 611 | Map<String, Object> extensionsResolved = propertyResolverUtils.resolveExtensions(locale, info.getExtensions());
|
617 |
| - info.setExtensions(extensionsResolved); |
| 612 | + info.setExtensions(extensionsResolved); |
618 | 613 | }
|
619 |
| - |
| 614 | + |
620 | 615 | return info;
|
621 | 616 | }
|
622 | 617 |
|
|
0 commit comments