Upgrade swagger-core to version 2.2.36

Upgrade swagger-ui to version 5.27.1

Author: bnasslahsen

pom.xml

@@ -55,8 +55,8 @@
 		<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.34</swagger-api.version>
-		<swagger-ui.version>5.27.0</swagger-ui.version>
+		<swagger-api.version>2.2.36</swagger-api.version>
+		<swagger-ui.version>5.27.1</swagger-ui.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jjwt.version>0.9.1</jjwt.version>
 		<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ModelConverterRegistrar.java

@@ -31,8 +31,6 @@
 
 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;
@@ -55,12 +53,6 @@ public class ModelConverterRegistrar {
 	 */
 	private final ModelConverters modelConvertersInstance;
 
-
-	/**
-	 * The singleton fallback instance.
-	 */
-	private static volatile ModelConverters modelConvertersFallbackInstance;
-	
 	/**
 	 * Instantiates a new Model converter registrar.
 	 *
@@ -74,30 +66,8 @@ 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/utils/SpringDocAnnotationsUtils.java

@@ -65,7 +65,6 @@
 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;
@@ -140,31 +139,7 @@ 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/resources/results/3.1.0/app26.json

@@ -45,24 +45,33 @@
   "components": {
     "schemas": {
       "Bar": {
+        "type": "object",
         "properties": {
           "bar": {
             "type": "string"
           }
         }
       },
       "Foo": {
+        "type": "object",
         "properties": {
           "foo": {
             "type": "string"
           }
         }
       },
       "MyModel": {
+        "type": "object",
         "properties": {
           "thing": {
             "description": "Hello",
             "oneOf": [
+              {
+                "$ref": "#/components/schemas/Foo"
+              },
+              {
+                "$ref": "#/components/schemas/Bar"
+              },
               {
                 "$ref": "#/components/schemas/Foo"
               },

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json

@@ -54,24 +54,38 @@
   "components": {
     "schemas": {
       "Bar": {
+        "type": "object",
+        "description": "The type Bar.",
         "properties": {
           "bar": {
-            "type": "string"
+            "type": "string",
+            "description": "The Bar."
           }
         }
       },
       "Foo": {
+        "type": "object",
+        "description": "The type Foo.",
         "properties": {
           "foo": {
-            "type": "string"
+            "type": "string",
+            "description": "The Foo."
           }
         }
       },
       "MyModel": {
+        "type": "object",
+        "description": "The type My model.",
         "properties": {
           "thing": {
             "description": "Hello",
             "oneOf": [
+              {
+                "$ref": "#/components/schemas/Foo"
+              },
+              {
+                "$ref": "#/components/schemas/Bar"
+              },
               {
                 "$ref": "#/components/schemas/Foo"
               },