reverts fixes mergeAllOf when circular references

Author: ivangsa

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

@@ -139,13 +139,13 @@ public class $RefParser {
     }
 
     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);
+//        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<>();

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

@@ -36,6 +36,15 @@ private void assertNoRefs(Object object) throws JsonProcessingException {
         Assert.assertFalse(hasRefs);
     }
 
+    private void assertNoAllOfs(Object object) throws JsonProcessingException {
+        String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
+        boolean hasRefs = json.contains("allOf");
+        if(hasRefs) {
+            System.out.println(json);
+        }
+        Assert.assertFalse(hasRefs);
+    }
+
     @Test
     public void testDereferenceAsyncapiNestedSchemas() throws IOException {
         File file = new File("src/test/resources/asyncapi/schemas/json-schemas-payload.yml");
@@ -272,12 +281,14 @@ public void testDereferenceRecursiveSimplest() throws IOException {
     }
 
     @Test
+    @Ignore
     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());
+        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
+        assertNoRefs(refs.schema());
+        assertNoAllOfs(refs.schema());
     }
 
     @Test

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

@@ -18,3 +18,36 @@ components:
           type: "array"
           items:
             $ref: "#/components/schemas/CustomerOrder"
+    CustomerOrderPaginated:
+      allOf:
+        - $ref: "#/components/schemas/Page"
+        - x-business-entity-paginated: "CustomerOrder"
+        - properties:
+            content:
+              type: "array"
+              items:
+                $ref: "#/components/schemas/CustomerOrder"
+    Page:
+      type: object
+      required:
+        - "content"
+        - "totalElements"
+        - "totalPages"
+        - "size"
+        - "number"
+      properties:
+        number:
+          type: integer
+          minimum: 0
+        numberOfElements:
+          type: integer
+          minimum: 0
+        size:
+          type: integer
+          minimum: 0
+          maximum: 200
+          multipleOf: 25
+        totalElements:
+          type: integer
+        totalPages:
+          type: integer