From cde2afa8a7c3ae373e9ffc748c91e0cc4e5cf8a4 Mon Sep 17 00:00:00 2001 From: "Badr.NassLahsen" Date: Wed, 27 Mar 2024 23:34:02 +0100 Subject: [PATCH] code review --- .../org/springdoc/core/service/OpenAPIService.java | 11 +++-------- .../src/test/resources/results/app9.json | 4 +--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java index 1d7c96f60..fc5639bb8 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java +++ b/springdoc-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 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 index f7dd3ac61..91d57452d 100644 --- 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 @@ } } } -} \ No newline at end of file +}