code review

springdoc · Mar 27, 2024 · cde2afa · DennisBecker · Sep 18, 2024 · cde2afa
1 parent 806187f
commit cde2afa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/...ngdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java b/...ngdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java
@@ -42,7 +42,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.core.jackson.TypeNameResolver;
@@ -71,7 +70,6 @@
 import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.providers.JavadocProvider;
-import org.springdoc.core.providers.ObjectMapperProvider;
 import org.springdoc.core.utils.PropertyResolverUtils;
 
 import org.springframework.beans.BeansException;
@@ -246,11 +244,8 @@ public OpenAPI build(Locale locale) {
 		}
 		else {
 			try {
-				ObjectMapper objectMapper = ObjectMapperProvider.createJson(springDocConfigProperties);
+				ObjectMapper objectMapper = new ObjectMapper();
 				calculatedOpenAPI = objectMapper.readValue(objectMapper.writeValueAsString(openAPI), OpenAPI.class);
-				objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
-				Map extensionsClone = objectMapper.readValue(objectMapper.writeValueAsString(openAPI.getExtensions()), Map.class);
-				calculatedOpenAPI.extensions(extensionsClone);
 			}
 			catch (JsonProcessingException e) {
 				LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage());
@@ -614,9 +609,9 @@ private Info resolveProperties(Info info, Locale locale) {
 
 		if(propertyResolverUtils.isResolveExtensionsProperties()){
 			Map<String, Object> extensionsResolved = propertyResolverUtils.resolveExtensions(locale, info.getExtensions());
-			info.setExtensions(extensionsResolved);			
+			info.setExtensions(extensionsResolved);
 		}
-		
+
 		return info;
 	}
 

diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/app9.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/app9.json
@@ -62,10 +62,8 @@
   "components": {
     "schemas": {
       "FeedResponse": {
-        "type": "object",
         "properties": {
           "_links": {
-            "type": "object",
             "properties": {
               "next": {
                 "$ref": "#/components/schemas/Link"
@@ -139,4 +137,4 @@
       }
     }
   }
-}
+}