fixes mergeAllOf when circular references

Author: ivangsa

src/main/java/io/zenwave360/jsonrefparser/$RefParser.java

@@ -126,17 +126,26 @@ public class $RefParser {
 
     public $RefParser dereference() {
         this.refs.addPath(uri);
+        this.visited.clear();
         dereference(refs.jsonContext, refs.schema(), new String[0], uri);
         return this;
     }
 
     public $RefParser mergeAllOf() {
         this.refs.addPath(uri);
+        this.visited.clear();
         mergeAllOf(refs.schema(), new String[0], uri);
         return this;
     }
 
     private void mergeAllOf(Object value, String[] paths, URI currentFileURL) {
+        var visitedNodeRef = String.format("%s%s", currentFileURL.toString(), jsonPointer(paths));
+        log.trace("{}visiting {}", indent(), visitedNodeRef);
+        if(visited.contains(value)) {
+            log.trace("{}skipping visited {}", indent(), visitedNodeRef);
+            return;
+        }
+        visited.add(value);
         if(paths.length > 0 && "allOf".equals(paths[paths.length -1])) {
             List allOf = (List) value;
             List<String> required = new ArrayList<>();
@@ -185,7 +194,7 @@ private void mergeAllOf(Object value, String[] paths, URI currentFileURL) {
         }
     }
 
-    private Set<String> visited = new HashSet<>();
+    private List<Object> visited = new ArrayList<>();
     private List<String> indent = new ArrayList<>();
     private String indent() {
         return StringUtils.join(indent, "");

src/test/java/io/zenwave360/jsonrefparser/ParserTest.java

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import io.zenwave360.jsonrefparser.resolver.HttpResolver;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -269,4 +270,25 @@ public void testDereferenceRecursiveSimplest() throws IOException {
         //        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
         //        assertNoRefs(refs.schema());
     }
+
+    @Test
+    public void testMergeAllOfRecursive() throws IOException {
+        File file = new File("src/test/resources/asyncapi/orders-model.yml");
+        $RefParser parser = new $RefParser(file).parse();
+        $Refs refs = parser.dereference().mergeAllOf().getRefs();
+        //        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
+        //        assertNoRefs(refs.schema());
+    }
+
+    @Test
+    @Ignore
+    public void testDetectCircularRecursive() throws IOException {
+        File file = new File("src/test/resources/asyncapi/orders-model.yml");
+        $RefParser parser = new $RefParser(file).parse();
+        $Refs refs = parser.dereference().getRefs();
+        Assert.assertTrue(refs.circular);
+        //        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
+        //        assertNoRefs(refs.schema());
+    }
+
 }

src/test/resources/asyncapi/orders-model.yml

@@ -0,0 +1,20 @@
+asyncapi: 2.4.0
+
+components:
+  schemas:
+    CustomerOrder:
+      type: "object"
+      x-business-entity: "CustomerOrder"
+      properties:
+        orderedItems:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/OrderedItem"
+    OrderedItem:
+      type: "object"
+      x-business-entity: "OrderedItem"
+      properties:
+        customerOrders:
+          type: "array"
+          items:
+            $ref: "#/components/schemas/CustomerOrder"