Upgrade swagger-core from version 2.2.42 to 2.2.43

Author: bnasslahsen

.gitignore

@@ -143,4 +143,6 @@ Desktop.ini
 ######################
 # ESLint
 ######################
-.eslintcache
+.eslintcache
+/CLAUDE.md
+/.claude/

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.42</swagger-api.version>
+		<swagger-api.version>2.2.43</swagger-api.version>
 		<swagger-ui.version>5.31.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

@@ -1239,15 +1239,25 @@ private void fillParametersList(Operation operation, Map<String, String> queryPa
 			if(methodAttributes.getSpringDocVersionStrategy() != null)
 				versionDefaultMap= methodAttributes.getSpringDocVersionStrategy().getVersionDefaultMap();
 			for (Entry<String, String> entry : queryParams.entrySet()) {
-				Parameter parameter = new Parameter();
 				String name = entry.getKey();
 				String value = entry.getValue();
 				String defaultValue = (versionDefaultMap != null) ? versionDefaultMap.get(name) : value;
-				parameter.setName(name);
-				parameter.setSchema(new StringSchema()._default(defaultValue)._enum(Collections.singletonList(value)));
-				parameter.setRequired(true);
-				parameter.setIn(ParameterIn.QUERY.toString());
-				GenericParameterService.mergeParameter(parametersList, parameter);
+				Optional<Parameter> existingParam = parametersList.stream()
+						.filter(p -> name.equals(p.getName()) && ParameterIn.QUERY.toString().equals(p.getIn()))
+						.findAny();
+				if (existingParam.isPresent() && existingParam.get().getSchema() != null
+						&& existingParam.get().getSchema().getEnum() != null
+						&& !existingParam.get().getSchema().getEnum().contains(value)) {
+					existingParam.get().getSchema().getEnum().add(value);
+				}
+				else {
+					Parameter parameter = new Parameter();
+					parameter.setName(name);
+					parameter.setSchema(new StringSchema()._default(defaultValue)._enum(new ArrayList<>(Collections.singletonList(value))));
+					parameter.setRequired(true);
+					parameter.setIn(ParameterIn.QUERY.toString());
+					GenericParameterService.mergeParameter(parametersList, parameter);
+				}
 			}
 			operation.setParameters(parametersList);
 		}

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

@@ -332,6 +332,8 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com
 				}
 				// Cast default value
 				if (schema != null && schema.getDefault() != null) {
+					Object resolvedDefault = resolveEmbeddedValuesAndExpressions(schema.getDefault().toString());
+					schema.setDefault(resolvedDefault);
 					PrimitiveType primitiveType = PrimitiveType.fromTypeAndFormat(schema.getType(), schema.getFormat());
 					if (primitiveType != null) {
 						Schema<?> primitiveSchema = primitiveType.createProperty();

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-zh-CN.json

@@ -49,6 +49,7 @@
             "in": "query",
             "required": true,
             "schema": {
+              "minLength": 1,
               "type": "string"
             }
           }

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app25.json

@@ -54,7 +54,7 @@
             "required": false,
             "schema": {
               "type": "number",
-              "example": 10
+              "example": "10"
             }
           }
         ],

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app114.json

@@ -57,7 +57,7 @@
         "properties": {
           "amount": {
             "type": "number",
-            "example": 99.96
+            "example": "99.96"
           },
           "currency": {
             "type": "string",

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app25.json

@@ -54,7 +54,7 @@
             "required": false,
             "schema": {
               "type": "number",
-              "example": 10
+              "example": "10"
             }
           }
         ],

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app29.json

@@ -68,7 +68,7 @@
             "type": "number",
             "description": "The data value",
             "format": "double",
-            "example": 19.0
+            "example": "19.0"
           }
         }
       }

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app4.json

@@ -65,7 +65,7 @@
             "type": "number",
             "description": "The data value",
             "format": "double",
-            "example": 19.0
+            "example": "19.0"
           }
         }
       }