fix: mergeAllOf was applied twice in the root object

closes #36

Author: ivangsa

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

@@ -166,15 +166,7 @@ private void mergeAllOf(Object value, String[] paths, URI currentFileURL) {
                 Map<String, Object> originalAllOfRoot = refs.jsonContext.read(jsonPath);
 
                 AllOfObject allOfObject = new AllOfObject();
-                merge(allOfObject, originalAllOfRoot);
-                for (int i = 0; i < allOf.size(); i++) {
-                    if(allOf.get(i) instanceof Map) {
-                        Map<String, Object> item = (Map<String, Object>) allOf.get(i);
-                        merge(allOfObject, item);
-                    } else {
-                        throw new RuntimeException("Could not understand allOf: " + allOf.get(i));
-                    }
-                }
+                mergeAllOf(allOfObject, originalAllOfRoot);
 
                 try {
                     var isRoot = "$".equals(jsonPath);
@@ -216,20 +208,20 @@ private void mergeAllOf(Object value, String[] paths, URI currentFileURL) {
         }
     }
 
-    private void merge(AllOfObject allOfObject, List<Map<String, Object>> items) {
+    private void mergeAllOf(AllOfObject allOfObject, List<Map<String, Object>> items) {
         for (Map<String, Object> innerItem : items) {
-            merge(allOfObject, innerItem);
+            mergeAllOf(allOfObject, innerItem);
         }
     }
 
-    private void merge(AllOfObject allOfObject, Map<String, Object> item) {
+    private void mergeAllOf(AllOfObject allOfObject, Map<String, Object> item) {
         if(item.keySet().size() == 1 && item.containsKey("allOf")) {
             List<Map<String, Object>> items = (List) item.get("allOf");
-            merge(allOfObject, items);
+            mergeAllOf(allOfObject, items);
         } else {
             for (Map.Entry<String, Object> entry : item.entrySet()) {
                 if(entry.getKey().equals("allOf")) {
-                    merge(allOfObject, (List) item.get("allOf"));
+                    mergeAllOf(allOfObject, (List) item.get("allOf"));
                 } else {
                     allOfObject.allOf.put(entry.getKey(), entry.getValue());
                 }

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

@@ -0,0 +1,22 @@
+package io.zenwave360.jsonrefparser;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.Collection;
+
+public class GH36Test {
+
+    @Test
+    public void test() throws Exception {
+        $RefParser refParser = new $RefParser(new File("src/test/resources/GH-36/root.json"));
+
+        $Refs refs = refParser.parse().dereference().mergeAllOf().getRefs();
+        var schema = refs.schema();
+        Collection<String> required = (Collection<String>) schema.get("required");
+        Assert.assertEquals(2, required.size());
+        Assert.assertTrue(required.contains("ingressDomain"));
+        Assert.assertTrue(required.contains("a"));
+    }
+}

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

@@ -1,8 +1,10 @@
 package io.zenwave360.jsonrefparser;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.File;
+import java.util.Map;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -18,7 +20,17 @@ public void testMergeAllOfAtRoot() throws Exception {
         File file = new File("src/test/resources/gh-32-mergeAllOf-root.yml");
         $RefParser parser = new $RefParser(file).parse();
         $Refs refs = parser.dereference().mergeAllOf().getRefs();
+        
+        // Verify allOf is removed
+        Assert.assertFalse(refs.schema().containsKey("allOf"));
+        
+        // Verify properties from both Core and Extension are merged
         assertTrue(refs.schema().containsKey("properties"));
-//        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
+        var properties = (Map) refs.schema().get("properties");
+        Assert.assertEquals(2, properties.size());
+        Assert.assertTrue(properties.containsKey("prop1"));
+        Assert.assertTrue(properties.containsKey("prop2"));
+        
+        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
     }
 }

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

@@ -266,9 +266,16 @@ public void testDereferenceAndMergeChainedAllOf() throws IOException {
         File file = new File("src/test/resources/asyncapi/car-engine_chained_allOf.yml");
         $RefParser parser = new $RefParser(file).parse();
         $Refs refs = parser.dereference().mergeAllOf().getRefs();
-        // Assert.assertFalse(refs.circular);
-        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
+        
         assertNoAllOfs(refs.schema());
+        
+        // Verify Car has all properties from Base, Engine, and Car
+        var carProperties = (Map) refs.get("$.components.schemas.Car.properties");
+        Assert.assertTrue(carProperties.containsKey("reference")); // from Base
+        Assert.assertTrue(carProperties.containsKey("mileage")); // from Engine
+        Assert.assertTrue(carProperties.containsKey("make")); // from Car
+        
+        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(refs.schema()));
     }
 
     @Test

src/test/resources/GH-36/common.schema.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "ingressDomain": {
+      "type": "string"
+    }
+  },
+  "required": ["ingressDomain"]
+}

src/test/resources/GH-36/root.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "allOf": [
+    { "$ref": "common.schema.json" }
+  ],
+  "properties": {
+    "a": {
+      "type": "integer"
+    }
+  },
+  "required": ["a" ]
+}