Handle recursive refs in ComposedSchema (allOf/anyOf)

Author: maksim-kosolapov

core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java

@@ -27,8 +27,13 @@
 import org.openapitools.openapidiff.core.model.deferred.RecursiveSchemaSet;
 import org.openapitools.openapidiff.core.utils.RefPointer;
 import org.openapitools.openapidiff.core.utils.RefType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.text.MutableAttributeSet;
 
 public class SchemaDiff {
+  private static final Logger logger = LoggerFactory.getLogger(SchemaDiff.class);
 
   private static final RefPointer<Schema<?>> refPointer = new RefPointer<>(RefType.SCHEMAS);
   private static final Map<Class<? extends Schema>, Class<? extends SchemaDiffResult>>
@@ -96,7 +101,7 @@ protected static Schema<?> resolveComposedSchema(
             updatedVisitedRefs.add(composed.get$ref());
             composed = refPointer.resolveRef(components, composed, composed.get$ref());
             composed = resolveComposedSchema(components, composed, updatedVisitedRefs);
-            schema = addSchema(schema, composed);
+            addSchema(schema, composed);
           }
         }
         composedSchema.setAllOf(null);
@@ -340,8 +345,8 @@ public DeferredChanged<ChangedSchema> computeDiffForReal(
     left = refPointer.resolveRef(this.leftComponents, left, getSchemaRef(left));
     right = refPointer.resolveRef(this.rightComponents, right, getSchemaRef(right));
 
-    left = resolveComposedSchema(leftComponents, left, new HashSet<>());
-    right = resolveComposedSchema(rightComponents, right, new HashSet<>());
+    left = resolveComposedSchema(leftComponents, left, refSet.getLeftKeys());
+    right = resolveComposedSchema(rightComponents, right, refSet.getRightKeys());
 
     // If type of schemas are different, just set old & new schema, set changedType to true in
     // SchemaDiffResult and

core/src/main/java/org/openapitools/openapidiff/core/model/deferred/RecursiveSchemaSet.java

@@ -7,12 +7,20 @@ public class RecursiveSchemaSet {
   HashSet<String> leftKeys = new HashSet<>();
   HashSet<String> rightKeys = new HashSet<>();
 
+  public HashSet<String> getLeftKeys() {
+    return leftKeys;
+  }
+
+  public HashSet<String> getRightKeys() {
+    return rightKeys;
+  }
+
   public boolean contains(CacheKey key) {
     return leftKeys.contains(key.getLeft()) || rightKeys.contains(key.getRight());
   }
 
   public void put(CacheKey key) {
     leftKeys.add(key.getLeft());
-    leftKeys.add(key.getRight());
+    rightKeys.add(key.getRight());
   }
 }

core/src/test/resources/recursive_model_1.yaml

@@ -25,6 +25,17 @@ components:
           type: string
         message2:
           type: string
+        recursiveDirect:
+          $ref: '#/components/schemas/B'
+        recursiveAllOf:
+          allOf:
+            - $ref: '#/components/schemas/B'
+        recursiveOneOf:
+          oneOf:
+            - $ref: '#/components/schemas/B'
+        recursiveAnyOf:
+          anyOf:
+            - $ref: '#/components/schemas/B'
         details:
           type: array
           items: