Upgrade swagger-core from version 2.2.43 to 2.2.45

Author: Mattias-Sehlstedt

pom.xml

@@ -55,7 +55,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/core/configuration/SpringDocRequiredModule.java

@@ -30,7 +30,8 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.swagger.v3.core.jackson.SwaggerAnnotationIntrospector;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.apache.commons.lang3.StringUtils;
+
+import static org.springdoc.core.utils.SpringDocAnnotationsUtils.hasADefaultValue;
 
 /**
  * The type Spring doc required module.
@@ -57,7 +58,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 || hasADefaultValue(schemaAnnotation)) {
 					return false;
 				}
 			}

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

@@ -1122,7 +1122,7 @@ private String getDescription(String parameterName, String originalDescription)
 	 * @return the default value
 	 */
 	private String getDefaultValue(String parameterName, PageableDefault pageableDefault, String defaultSchemaVal) {
-		String defaultValue = null;
+		String defaultValue = defaultSchemaVal;
 		switch (parameterName) {
 			case "size":
 				if (pageableDefault != null) {

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.
@@ -47,6 +48,12 @@ public class Builder {
 	 */
 	private String[] scopes = {};
 
+	/**
+	 * If multiple requirements apply at the same time, use this value instead of {@link #name} and {@link #scopes}.
+	 * If any one of multiple security schemes is required, use multiple {@link SecurityRequirement} annotations instead.
+	 * <p>Exactly one of this and {@link #name} must be set.</p>
+	 */
+	private SecurityRequirementEntry[] securityRequirementEntries = {};
 
 	/**
 	 * Instantiates a new Security requirement builder.
@@ -85,6 +92,17 @@ public Builder scopes(String[] scopes) {
 		return this;
 	}
 
+	/**
+	 * SecurityRequirementEntries security requirement builder.
+	 *
+	 * @param securityRequirementEntries the securityRequirementEntries
+	 * @return the security requirement builder
+	 */
+	public Builder securityRequirementEntries(SecurityRequirementEntry[] securityRequirementEntries) {
+		this.securityRequirementEntries = securityRequirementEntries;
+		return this;
+	}
+
 	/**
 	 * Build security requirement.
 	 *
@@ -106,6 +124,11 @@ public String name() {
 			public String[] scopes() {
 				return scopes;
 			}
+
+			@Override
+			public SecurityRequirementEntry[] combine() {
+				return securityRequirementEntries;
+			}
 		};
 	}
 }

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

@@ -35,22 +35,10 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.security.Principal;
+import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TimeZone;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -639,21 +627,36 @@ public Parameter buildParam(ParameterInfo parameterInfo, Components components,
 			Schema<?> schema = parameterBuilder.calculateSchema(components, parameterInfo, null,
 					jsonView);
 			if (parameterInfo.getDefaultValue() != null && schema != null) {
-				Object defaultValue = parameterInfo.getDefaultValue();
-				// Cast default value
 				PrimitiveType primitiveType = PrimitiveType.fromTypeAndFormat(schema.getType(), schema.getFormat());
-				if (primitiveType != null) {
-					Schema<?> primitiveSchema = primitiveType.createProperty();
-					primitiveSchema.setDefault(parameterInfo.getDefaultValue());
-					defaultValue = primitiveSchema.getDefault();
-				}
+				Object defaultValue = castDefaultValue(primitiveType, parameterInfo.getDefaultValue());
 				schema.setDefault(defaultValue);
 			}
 			parameter.setSchema(schema);
 		}
 		return parameter;
 	}
 
+	/**
+	 * Cast the default value so that it matches the {@link PrimitiveType}
+	 *
+	 * @param primitiveType the primitive type
+	 * @param defaultValue the default value
+	 * @return the cast default value
+	 */
+	private Object castDefaultValue(PrimitiveType primitiveType, Object defaultValue) {
+		if (primitiveType != null) {
+			Schema<?> primitiveSchema = primitiveType.createProperty();
+			if (primitiveType.equals(PrimitiveType.DATE) && defaultValue instanceof LocalDate localDate) {
+				defaultValue = localDate.toString();
+			}
+			primitiveSchema.setDefault(defaultValue);
+			if (primitiveSchema.getDefault() != null) {
+				defaultValue = primitiveSchema.getDefault();
+			}
+		}
+		return defaultValue;
+	}
+
 	/**
 	 * Apply bean validator annotations.
 	 *

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

@@ -357,7 +357,7 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 			if (schema == null && parameterDoc.array() != null) {
 				schema = AnnotationsUtils.getSchema(parameterDoc.schema(), parameterDoc.array(), true, parameterDoc.array().schema().implementation(), components, jsonView, propertyResolverUtils.isOpenapi31()).orElse(null);
 				// default value not set by swagger-core for array !
-				if (schema != null) {
+				if (schema != null && SpringDocAnnotationsUtils.hasADefaultValue(parameterDoc.array().arraySchema())) {
 					Object defaultValue = SpringDocAnnotationsUtils.resolveDefaultValue(parameterDoc.array().arraySchema().defaultValue(), objectMapperProvider.jsonMapper());
 					schema.setDefault(defaultValue);
 				}

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

@@ -51,17 +51,16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.core.jackson.TypeNameResolver;
 import io.swagger.v3.core.util.AnnotationsUtils;
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.core.util.Json31;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.Webhook;
 import io.swagger.v3.oas.annotations.Webhooks;
 import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tags;
-import io.swagger.v3.oas.models.Components;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
@@ -76,6 +75,7 @@
 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;
@@ -247,7 +247,7 @@ public OpenAPI build(Locale locale) {
 			calculatedOpenAPI.setPaths(new Paths());
 		}
 		else {
-			calculatedOpenAPI = cloneViaJson(openAPI, OpenAPI.class, new ObjectMapper());
+			calculatedOpenAPI = cloneViaJson(openAPI, OpenAPI.class, ObjectMapperProvider.createJson(springDocConfigProperties));
 		}
 
 		if (apiDef.isPresent()) {

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

@@ -468,6 +468,16 @@ private static boolean isArray(io.swagger.v3.oas.annotations.media.Content annot
 		return isArray;
 	}
 
+	/**
+	 * Whether the schema has defined a default value.
+	 *
+	 * @param schema The schema annotation
+	 * @return Whether the schema annotation has defined a default value
+	 */
+	public static boolean hasADefaultValue(io.swagger.v3.oas.annotations.media.Schema schema) {
+		return schema != null && !schema.defaultValue().equals(io.swagger.v3.oas.annotations.media.Schema.DEFAULT_SENTINEL);
+	}
+
 	/**
 	 * Resolve default value object.
 	 *
@@ -519,7 +529,7 @@ public static Optional<Map<String, Header>> getHeaders(io.swagger.v3.oas.annotat
 	public static void clearCache(JavadocProvider javadocProvider) {
 		if (javadocProvider != null)
 			javadocProvider.clearCache();
-		MODEL_CONVERTER_CONTEXT_MAP.remove();;
+		MODEL_CONVERTER_CONTEXT_MAP.remove();
 	}
 
 	/**

springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json

@@ -23,7 +23,8 @@
             "in": "query",
             "required": false,
             "schema": {
-              "type": "string"
+              "type": "string",
+              "nullable": true
             }
           },
           {
@@ -86,7 +87,8 @@
             "in": "query",
             "required": false,
             "schema": {
-              "type": "string"
+              "type": "string",
+              "nullable": true
             }
           },
           {