Upgrade swagger-core from version 2.2.43 to 2.2.45 - fixes #3245

Author: bnasslahsen

pom.xml

@@ -58,7 +58,7 @@
 		<central-publishing-maven-plugin.version>0.7.0
 		</central-publishing-maven-plugin.version>
 		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-		<swagger-api.version>2.2.43</swagger-api.version>
+		<swagger-api.version>2.2.45</swagger-api.version>
 		<swagger-ui.version>5.32.0</swagger-ui.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jjwt.version>0.9.1</jjwt.version>

springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -402,6 +402,9 @@ protected OpenAPI getOpenApi(String serverBaseUrl, Locale locale) {
 				}
 				getPaths(mappingsMap, finalLocale, openAPI);
 
+				if (OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion())
+					handleComponentSchemaTypes(openAPI);
+
 				if (springDocConfigProperties.isTrimKotlinIndent())
 					this.trimIndent(openAPI);
 
@@ -472,6 +475,20 @@ private void trimIndent(OpenAPI openAPI) {
 		trimPaths(openAPI);
 	}
 
+	/**
+	 * Fix component schemas for OAS 3.1 post-processing.
+	 *
+	 * @param openAPI the open api
+	 */
+	private static void handleComponentSchemaTypes(OpenAPI openAPI) {
+		if (openAPI.getComponents() == null || openAPI.getComponents().getSchemas() == null) {
+			return;
+		}
+		for (Schema<?> schema : openAPI.getComponents().getSchemas().values()) {
+			SpringDocUtils.fixNullOnlyAdditionalProperties(schema);
+		}
+	}
+
 	/**
 	 * Trim the indent for descriptions in the 'components' of open api.
 	 *

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java

@@ -57,7 +57,7 @@ public Boolean hasRequiredMarker(AnnotatedMember annotatedMember) {
 				if (schemaAnnotation.required() || requiredMode == Schema.RequiredMode.REQUIRED) {
 					return true;
 				}
-				else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || StringUtils.isNotEmpty(schemaAnnotation.defaultValue())) {
+				else if (requiredMode == Schema.RequiredMode.NOT_REQUIRED || (StringUtils.isNotEmpty(schemaAnnotation.defaultValue()) && !Schema.DEFAULT_SENTINEL.equals(schemaAnnotation.defaultValue()))) {
 					return false;
 				}
 			}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java

@@ -366,7 +366,8 @@ public String[] allowableValues() {
 
 						@Override
 						public String defaultValue() {
-							return getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
+							String defaultValue = getDefaultValue(parameterName, pageableDefault, parameterSchema.defaultValue());
+						return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
 						}
 
 						@Override
@@ -757,8 +758,8 @@ public String[] allowableValues() {
 
 								@Override
 								public String defaultValue() {
-									return getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
-
+									String defaultValue = getArrayDefaultValue(parameterName, pageableDefault, sortDefault, schema.defaultValue());
+									return defaultValue != null ? defaultValue : io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL;
 								}
 
 								@Override

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java

@@ -197,7 +197,7 @@ public class Builder {
 	/**
 	 * Provides a default value.
 	 */
-	private String defaultValue = "";
+	private String defaultValue = Schema.DEFAULT_SENTINEL;
 
 	/**
 	 * Provides a discriminator property value.

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java

@@ -29,6 +29,7 @@
 import java.lang.annotation.Annotation;
 
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.security.SecurityRequirementEntry;
 
 /**
  * The type Security requirement builder.
@@ -106,6 +107,11 @@ public String name() {
 			public String[] scopes() {
 				return scopes;
 			}
+
+			@Override
+			public SecurityRequirementEntry[] combine() {
+				return new SecurityRequirementEntry[0];
+			}
 		};
 	}
 }

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ObjectMapperProvider.java

@@ -35,6 +35,7 @@
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.core.util.Yaml31;
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.core.util.PrimitiveType;
 import io.swagger.v3.oas.models.media.Schema;
 import org.springdoc.core.mixins.SortedOpenAPIMixin;
 import org.springdoc.core.mixins.SortedOpenAPIMixin31;
@@ -80,10 +81,14 @@ public ObjectMapperProvider(SpringDocConfigProperties springDocConfigProperties)
 			if (springDocConfigProperties.isExplicitObjectSchema()) {
 				System.setProperty(Schema.EXPLICIT_OBJECT_SCHEMA_PROPERTY, "true");
 			}
+			else {
+				PrimitiveType.explicitObjectType = false;
+			}
 		}
 		else {
 			jsonMapper = Json.mapper();
 			yamlMapper = Yaml.mapper();
+			PrimitiveType.explicitObjectType = null;
 		}
 	}
 

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

@@ -340,8 +340,13 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 					PrimitiveType primitiveType = PrimitiveType.fromTypeAndFormat(schema.getType(), schema.getFormat());
 					if (primitiveType != null) {
 						Schema<?> primitiveSchema = primitiveType.createProperty();
-						primitiveSchema.setDefault(schema.getDefault());
-						schema.setDefault(primitiveSchema.getDefault());
+						if (schema.getDefault() instanceof String stringValue) {
+							primitiveSchema.setDefault(propertyResolverUtils.resolve(stringValue, locale));
+						} else {
+							primitiveSchema.setDefault(schema.getDefault());
+						}
+						if (primitiveSchema.getDefault() != null)
+							schema.setDefault(primitiveSchema.getDefault());
 					}
 				}
 			}
@@ -353,7 +358,8 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 				// default value not set by swagger-core for array !
 				if (schema != null) {
 					Object defaultValue = SpringDocAnnotationsUtils.resolveDefaultValue(parameterDoc.array().arraySchema().defaultValue(), objectMapperProvider.jsonMapper());
-					schema.setDefault(defaultValue);
+					if (defaultValue != null)
+						schema.setDefault(defaultValue);
 				}
 			}
 			if (isOpenapi31())

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

@@ -247,7 +247,8 @@ public OpenAPI build(Locale locale) {
 			calculatedOpenAPI.setPaths(new Paths());
 		}
 		else {
-			calculatedOpenAPI = cloneViaJson(openAPI, OpenAPI.class, new ObjectMapper());
+			calculatedOpenAPI = cloneViaJson(openAPI, OpenAPI.class, new ObjectMapper()
+				.setDefaultPropertyInclusion(com.fasterxml.jackson.annotation.JsonInclude.Value.construct(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL, com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS)));
 		}
 
 		if (apiDef.isPresent()) {

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

@@ -513,7 +513,7 @@ public static Object castDefaultValue(Schema schema, Object defaultValue) {
 	 */
 	public static Object resolveDefaultValue(String defaultValueStr, ObjectMapper objectMapper) {
 		Object defaultValue = null;
-		if (StringUtils.isNotEmpty(defaultValueStr)) {
+		if (StringUtils.isNotEmpty(defaultValueStr) && !io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL.equals(defaultValueStr)) {
 			try {
 				defaultValue = objectMapper.readTree(defaultValueStr);
 			}