Upgrade swagger-core to version 2.2.34

Author: bnasslahsen

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.30</swagger-api.version>
+		<swagger-api.version>2.2.34</swagger-api.version>
 		<swagger-ui.version>5.21.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/converters/ModelConverterRegistrar.java

@@ -31,6 +31,8 @@
 
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverters;
+import io.swagger.v3.core.jackson.ModelResolver;
+import io.swagger.v3.core.util.Json31;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +55,12 @@ public class ModelConverterRegistrar {
 	 */
 	private final ModelConverters modelConvertersInstance;
 
+
+	/**
+	 * The singleton fallback instance.
+	 */
+	private static volatile ModelConverters modelConvertersFallbackInstance;
+	
 	/**
 	 * Instantiates a new Model converter registrar.
 	 *
@@ -66,8 +74,30 @@ public ModelConverterRegistrar(List<ModelConverter> modelConverters, SpringDocCo
 			registeredConverterOptional.ifPresent(modelConvertersInstance::removeConverter);
 			modelConvertersInstance.addConverter(modelConverter);
 		}
+		if (springDocConfigProperties.isOpenapi31()) {
+			initializeFallbackInstance();
+		}
 	}
 
+	/**
+	 * Initialize fallback instance.
+	 */
+	private static synchronized void initializeFallbackInstance() {
+		if (modelConvertersFallbackInstance == null) {
+			modelConvertersFallbackInstance = new ModelConverters(true);
+			modelConvertersFallbackInstance.addConverter(new ModelResolver(Json31.mapper()));
+		}
+	}
+
+	/**
+	 * Gets model converters fallback instance.
+	 *
+	 * @return the model converters fallback instance
+	 */
+	public static ModelConverters getModelConvertersFallbackInstance() {
+		return modelConvertersFallbackInstance;
+	}
+	
 	/**
 	 * Gets registered converter same as.
 	 *

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

@@ -449,6 +449,11 @@ public Class<?> contains() {
 							return parameterSchema.$dynamicAnchor();
 						}
 
+						@Override
+						public String $dynamicRef() {
+							return parameterSchema.$dynamicRef();
+						}
+
 						@Override
 						public String contentEncoding() {
 							return parameterSchema.contentEncoding();
@@ -836,6 +841,11 @@ public Class<?> contains() {
 									return schema.$dynamicAnchor();
 								}
 
+								@Override
+								public String $dynamicRef() {
+									return schema.$dynamicRef();
+								}
+
 								@Override
 								public String contentEncoding() {
 									return schema.contentEncoding();

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

@@ -299,6 +299,11 @@ public class Builder {
 	 */
 	private String $dynamicAnchor = "";
 
+	/**
+	 * The Dynamic ref.
+	 */
+	private String $dynamicRef = "";
+
 	/**
 	 * The Content encoding.
 	 */
@@ -1149,6 +1154,11 @@ public Class<?> contains() {
 				return $dynamicAnchor;
 			}
 
+			@Override
+			public String $dynamicRef() {
+				return $dynamicRef;
+			}
+
 			@Override
 			public String contentEncoding() {
 				return contentEncoding;

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

@@ -706,8 +706,10 @@ private Info resolveProperties(Info info, Map<String, Object> extensions, Locale
 
 		if (extensions != null) {
 			Map<String, Object> extensionsResolved = propertyResolverUtils.resolveExtensions(locale, extensions);
-			if (propertyResolverUtils.isOpenapi31())
+			if (propertyResolverUtils.isOpenapi31()){
 				extensionsResolved.forEach(info::addExtension31);
+				info.setExtensions(extensionsResolved);
+			}
 			else
 				info.setExtensions(extensionsResolved);
 		}

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

@@ -65,6 +65,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springdoc.core.converters.ModelConverterRegistrar;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -139,7 +140,31 @@ public static Schema extractSchema(Components components, Type returnType, JsonV
 							new AnnotatedType(returnType)
 									.resolveAsRef(true).jsonViewAnnotation(jsonView).ctxAnnotations(annotations));
 		}
+		// Handle ClassCastException - related to https://github.com/swagger-api/swagger-core/issues/4904
+		catch (ClassCastException e) {
+			if (openapi31) {
+				try {
+					resolvedSchema = ModelConverterRegistrar.getModelConvertersFallbackInstance()
+							.resolveAsResolvedSchema(
+									new AnnotatedType(returnType)
+											.resolveAsRef(true)
+											.jsonViewAnnotation(jsonView)
+											.ctxAnnotations(annotations));
+				} catch (Exception fallbackEx) {
+					LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, fallbackEx);
+					return null;
+				}
+			} else {
+				LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
+				return null;
+			}
+		}
 		catch (Exception e) {
+			if(e instanceof ClassCastException && openapi31) {
+				resolvedSchema = ModelConverterRegistrar.getModelConvertersFallbackInstance()
+						.resolveAsResolvedSchema(new AnnotatedType(returnType)
+								.resolveAsRef(true).jsonViewAnnotation(jsonView).ctxAnnotations(annotations));
+			}
 			LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e);
 			return null;
 		}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app193/SpringDocApp193Test.java

@@ -39,7 +39,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@SpringBootTest(properties = { "springdoc.api-docs.version=openapi_3_1" })
+@SpringBootTest(properties = { "springdoc.api-docs.version=openapi_3_1", "springdoc.remove-broken-reference-definitions=false"})
 public class SpringDocApp193Test extends AbstractCommonTest {
 
 	@Test