resolve infinite recursion

Author: martinitus

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

@@ -134,7 +134,7 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 		if(resolvedSchema.get$ref().contains(Components.COMPONENTS_SCHEMAS_REF)) {
 			String schemaName = resolvedSchema.get$ref().substring(Components.COMPONENTS_SCHEMAS_REF.length());
 			Schema existingSchema = context.getDefinedModels().get(schemaName);
-			if (existingSchema != null && existingSchema.getOneOf() != null) {
+			if (existingSchema != null && (existingSchema.getOneOf() != null || existingSchema.getAllOf() != null || existingSchema.getAnyOf() != null)) {
 				return resolvedSchema;
 			}
 		}

springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/app13.json

@@ -36,33 +36,30 @@
       "KeyValue" : {
         "required" : [ "key", "value" ],
         "type" : "object",
-        "properties" : {
-          "key" : {
-            "type" : "string"
-          },
-          "value" : {
-            "type" : "string"
+        "description" : "Generic description",
+        "allOf" : [ {
+          "$ref" : "#/components/schemas/KeyValue"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "key" : {
+              "type" : "string"
+            },
+            "value" : {
+              "type" : "string"
+            }
           }
-        },
-        "description" : "Generic description"
+        } ]
       },
       "SomeDTO" : {
         "required" : [ "fieldA", "fieldB" ],
         "type" : "object",
         "properties" : {
           "fieldA" : {
-            "type" : "object",
-            "description" : "Description A",
-            "allOf" : [ {
-              "$ref" : "#/components/schemas/KeyValue"
-            } ]
+            "$ref" : "#/components/schemas/KeyValue"
           },
           "fieldB" : {
-            "type" : "object",
-            "description" : "Description B",
-            "allOf" : [ {
-              "$ref" : "#/components/schemas/KeyValue"
-            } ]
+            "$ref" : "#/components/schemas/KeyValue"
           }
         }
       }