Ensure to uses the correct document to resolve

Closes #793
Closes #322

Author: joelittlejohn

Diff for: jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java

@@ -193,7 +193,7 @@ private JsonNode resolveRefs(JsonNode node, Schema parent) {
         if (node.has("$ref")) {
             Schema refSchema = ruleFactory.getSchemaStore().create(parent, node.get("$ref").asText(), ruleFactory.getGenerationConfig().getRefFragmentPathDelimiters());
             JsonNode refNode = refSchema.getContent();
-            return resolveRefs(refNode, parent);
+            return resolveRefs(refNode, refSchema);
         } else {
             return node;
         }
@@ -245,54 +245,50 @@ private JMethod addSetter(JDefinedClass c, JFieldVar field, String jsonPropertyN
         return setter;
     }
 
-  private JMethod addBuilderMethod(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node) {
-    JMethod result = null;
-    if(ruleFactory.getGenerationConfig().isUseInnerClassBuilders()) {
-      result = addInnerBuilderMethod(c, field, jsonPropertyName, node);
-    } else {
-      result = addLegacyBuilder(c, field, jsonPropertyName, node);
+    private JMethod addBuilderMethod(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node) {
+        JMethod result = null;
+        if(ruleFactory.getGenerationConfig().isUseInnerClassBuilders()) {
+            result = addInnerBuilderMethod(c, field, jsonPropertyName, node);
+        } else {
+            result = addLegacyBuilder(c, field, jsonPropertyName, node);
+        }
+        return result;
     }
-    return result;
-  }
-
-  private JMethod addLegacyBuilder(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node) {
-    JMethod builder = c.method(JMod.PUBLIC, c, getBuilderName(jsonPropertyName, node));
 
-    JVar param = builder.param(field.type(), field.name());
-    JBlock body = builder.body();
-    body.assign(JExpr._this().ref(field), param);
-    body._return(JExpr._this());
+    private JMethod addLegacyBuilder(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node) {
+        JMethod builder = c.method(JMod.PUBLIC, c, getBuilderName(jsonPropertyName, node));
 
-    return builder;
-  }
+        JVar param = builder.param(field.type(), field.name());
+        JBlock body = builder.body();
+        body.assign(JExpr._this().ref(field), param);
+        body._return(JExpr._this());
 
-  private JMethod addInnerBuilderMethod(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node)    {
-    JDefinedClass builderClass = ruleFactory.getReflectionHelper().getBaseBuilderClass(c);
+        return builder;
+    }
 
-    JMethod builderMethod = builderClass.method(JMod.PUBLIC, builderClass, getBuilderName(jsonPropertyName, node));
+    private JMethod addInnerBuilderMethod(JDefinedClass c, JFieldVar field, String jsonPropertyName, JsonNode node)    {
+        JDefinedClass builderClass = ruleFactory.getReflectionHelper().getBaseBuilderClass(c);
 
-    JVar param = builderMethod.param(field.type(), field.name());
-    JBlock body = builderMethod.body();
-    body.assign(JExpr.ref(JExpr.cast(c, JExpr._this().ref("instance")), field), param);
-    body._return(JExpr._this());
+        JMethod builderMethod = builderClass.method(JMod.PUBLIC, builderClass, getBuilderName(jsonPropertyName, node));
 
-    return builderMethod;
-  }
+        JVar param = builderMethod.param(field.type(), field.name());
+        JBlock body = builderMethod.body();
+        body.assign(JExpr.ref(JExpr.cast(c, JExpr._this().ref("instance")), field), param);
+        body._return(JExpr._this());
 
-  private String getBuilderClassName(JDefinedClass c) {
-    return ruleFactory.getNameHelper().getBuilderClassName(c);
-  }
+        return builderMethod;
+    }
 
-  private String getBuilderName(String propertyName, JsonNode node) {
-      return ruleFactory.getNameHelper().getBuilderName(propertyName, node);
-  }
+    private String getBuilderName(String propertyName, JsonNode node) {
+        return ruleFactory.getNameHelper().getBuilderName(propertyName, node);
+    }
 
-  private String getSetterName(String propertyName, JsonNode node) {
-      return ruleFactory.getNameHelper().getSetterName(propertyName, node);
-  }
+    private String getSetterName(String propertyName, JsonNode node) {
+        return ruleFactory.getNameHelper().getSetterName(propertyName, node);
+    }
 
-  private String getGetterName(String propertyName, JType type, JsonNode node) {
-      return ruleFactory.getNameHelper().getGetterName(propertyName, type, node);
-  }
+    private String getGetterName(String propertyName, JType type, JsonNode node) {
+        return ruleFactory.getNameHelper().getGetterName(propertyName, type, node);
+    }
 
 }

Diff for: jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/ref/FragmentRefIT.java

@@ -16,8 +16,8 @@
 
 package org.jsonschema2pojo.integration.ref;
 
+import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 import java.io.IOException;
 
@@ -65,41 +65,50 @@ public void refToFragmentOfAnotherSchemaIsReadSuccessfully() throws NoSuchMethod
         assertThat(aClass.getName(), is("com.example.AdditionalPropertyValue"));
 
     }
-    
+
+    @Test
+    public void refToFragmentOfAnotherSchemaThatAlsoHasARefIsReadSuccessfully() throws NoSuchMethodException {
+
+        Class<?> aClass = fragmentRefsClass.getMethod("getFragmentWithAnotherRef").getReturnType();
+
+        assertThat(aClass.getName(), is("java.lang.String"));
+
+    }
+
     @Test
     public void selfRefWithoutParentFile() throws IOException {
         JCodeModel codeModel = new JCodeModel();
         JsonNode schema = new ObjectMapper().readTree("{\"type\":\"object\", \"properties\":{\"a\":{\"$ref\":\"#/b\"}}, \"b\":\"string\"}");
-        
+
         JPackage p = codeModel._package("com.example");
         new RuleFactory().getSchemaRule().apply("Example", schema, null, p, new Schema(null, schema, null));
     }
-    
+
     @Test
     public void refToInnerFragmentThatHasRefToOuterFragmentWithoutParentFile() throws IOException {
         JCodeModel codeModel = new JCodeModel();
-        JsonNode schema = new ObjectMapper().readTree("{\n" + 
-              "    \"type\": \"object\",\n" + 
-              "    \"definitions\": {\n" + 
-              "        \"location\": {\n" + 
-              "            \"type\": \"object\",\n" + 
-              "            \"properties\": {\n" + 
-              "                \"cat\": {\n" + 
-              "                    \"$ref\": \"#/definitions/cat\"\n" + 
-              "                }\n" + 
-              "            }\n" + 
-              "        },\n" + 
-              "        \"cat\": {\n" + 
-              "            \"type\": \"number\"\n" + 
-              "        }\n" + 
-              "    },\n" + 
-              "    \"properties\": {\n" + 
-              "        \"location\": {\n" + 
-              "            \"$ref\": \"#/definitions/location\"\n" + 
-              "        }\n" + 
-              "    }\n" + 
-              "}");
-        
+        JsonNode schema = new ObjectMapper().readTree("{\n" +
+                "    \"type\": \"object\",\n" +
+                "    \"definitions\": {\n" +
+                "        \"location\": {\n" +
+                "            \"type\": \"object\",\n" +
+                "            \"properties\": {\n" +
+                "                \"cat\": {\n" +
+                "                    \"$ref\": \"#/definitions/cat\"\n" +
+                "                }\n" +
+                "            }\n" +
+                "        },\n" +
+                "        \"cat\": {\n" +
+                "            \"type\": \"number\"\n" +
+                "        }\n" +
+                "    },\n" +
+                "    \"properties\": {\n" +
+                "        \"location\": {\n" +
+                "            \"$ref\": \"#/definitions/location\"\n" +
+                "        }\n" +
+                "    }\n" +
+                "}");
+
         JPackage p = codeModel._package("com.example");
         new RuleFactory().getSchemaRule().apply("Example", schema, null, p, new Schema(null, schema, null));
     }

Diff for: jsonschema2pojo-integration-tests/src/test/resources/schema/ref/fragmentRefs.json

@@ -9,6 +9,9 @@
         },
         "fragmentOfA" : {
             "$ref" : "a.json/#/additionalProperties"
+        },
+        "fragmentWithAnotherRef" : {
+            "$ref" : "nestedSelfRefsReadAsString.json/#/definitions/Thing/properties/namespace"
         }
     },
     "additionalProperties" : false