Ensure outermost document is used when resolving refs within a string (no file)

Closes #1237

Author: joelittlejohn

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/Schema.java

@@ -62,7 +62,15 @@ public JsonNode getContent() {
     public Schema getParent() {
         return parent;
     }
-    
+
+    public Schema getGrandParent() {
+        if (parent == this) {
+            return this;
+        } else {
+            return this.parent.getGrandParent();
+        }
+    }
+
     public boolean isGenerated() {
         return javaType != null;
     }

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/SchemaStore.java

@@ -44,7 +44,7 @@ public SchemaStore(ContentResolver contentResolver) {
      * Create or look up a new schema which has the given ID and read the
      * contents of the given ID as a URL. If a schema with the given ID is
      * already known, then a reference to the original schema will be returned.
-     * 
+     *
      * @param id
      *            the id of the schema being created
      * @param refFragmentPathDelimiters A string containing any characters
@@ -82,7 +82,7 @@ protected URI removeFragment(URI id) {
      * path as a relative reference. If a schema with the given parent and
      * relative path is already known, then a reference to the original schema
      * will be returned.
-     * 
+     *
      * @param parent
      *            the schema which is the parent of the schema to be created.
      * @param path
@@ -126,8 +126,8 @@ public Schema create(Schema parent, String path, String refFragmentPathDelimiter
         }
 
         if (selfReferenceWithoutParentFile(parent, path) || substringBefore(stringId, "#").isEmpty()) {
-            JsonNode parentContent = parent.getParent().getContent();
-            Schema schema = new Schema(id, fragmentResolver.resolve(parentContent, path, refFragmentPathDelimiters), parent.getParent());
+            JsonNode parentContent = parent.getGrandParent().getContent();
+            Schema schema = new Schema(id, fragmentResolver.resolve(parentContent, path, refFragmentPathDelimiters), parent.getGrandParent());
             schemas.put(id, schema);
             return schema;
         }

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

@@ -20,6 +20,8 @@
 import static org.hamcrest.Matchers.*;
 
 import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 
 import org.jsonschema2pojo.Schema;
 import org.jsonschema2pojo.integration.util.Jsonschema2PojoRule;
@@ -40,7 +42,7 @@ public class FragmentRefIT {
     private static Class<?> fragmentRefsClass;
 
     @BeforeClass
-    public static void generateAndCompileEnum() throws ClassNotFoundException {
+    public static void generateAndCompile() throws ClassNotFoundException {
 
         ClassLoader fragmentRefsClassLoader = classSchemaRule.generateAndCompile("/schema/ref/fragmentRefs.json", "com.example");
 
@@ -113,4 +115,73 @@ public void refToInnerFragmentThatHasRefToOuterFragmentWithoutParentFile() throw
         new RuleFactory().getSchemaRule().apply("Example", schema, null, p, new Schema(null, schema, null));
     }
 
+    @Test
+    public void refToInnerFragmentThatHasRefToAnotherFragmentWithoutParentFile() throws IOException {
+        JCodeModel codeModel = new JCodeModel();
+        JsonNode schema = new ObjectMapper().readTree("{\n"
+                + "    \"$schema\": \"http://json-schema.org/draft-07/schema#\",\n"
+                + "    \"title\": \"Inbox Item Datalake DTO\",\n"
+                + "    \"definitions\": {\n"
+                + "        \"PropertyA\": {\n"
+                + "            \"type\": \"object\",\n"
+                + "            \"properties\": {\n"
+                + "                \"value\": {\n"
+                + "                    \"type\": \"string\"\n"
+                + "                }\n"
+                + "            }\n"
+                + "        },\n"
+                + "        \"PropertyB\": {\n"
+                + "            \"type\": \"object\",\n"
+                + "            \"properties\": {\n"
+                + "                \"data\": {\n"
+                + "                    \"type\": \"array\",\n"
+                + "                    \"items\": {\n"
+                + "                        \"$ref\": \"#/definitions/PropertyA\"\n"
+                + "                    },\n"
+                + "                    \"default\": []\n"
+                + "                }\n"
+                + "            }\n"
+                + "        }\n"
+                + "    },\n"
+                + "    \"properties\": {\n"
+                + "        \"FinalProperty\": {\n"
+                + "            \"type\": \"array\",\n"
+                + "            \"items\": {\n"
+                + "                \"$ref\": \"#/definitions/PropertyB\"\n"
+                + "            },\n"
+                + "            \"default\": []\n"
+                + "        }\n"
+                + "    }\n"
+                + "}");
+
+        JPackage p = codeModel._package("com.example");
+        new RuleFactory().getSchemaRule().apply("Example", schema, null, p, new Schema(null, schema, null));
+    }
+
+
+    @Test
+    public void refToInnerFragmentThatHasRefToAnotherFragment() throws IOException, ClassNotFoundException, NoSuchMethodException, SecurityException {
+        final ClassLoader fragmentRefsClassLoader = classSchemaRule.generateAndCompile("/schema/ref/refToRefToDefinitions.json", "com.example");
+
+        final Class<?> finalPropertyClass = fragmentRefsClassLoader.loadClass("com.example.RefToRefToDefinitions");
+
+        Class<?> finalPropertyType = finalPropertyClass.getMethod("getFinalProperty").getReturnType();
+        assertThat(finalPropertyType.getName(), is("java.util.List"));
+
+        Type finalPropertyItemType = ((ParameterizedType)finalPropertyClass.getMethod("getFinalProperty").getGenericReturnType()).getActualTypeArguments()[0];
+        assertThat(finalPropertyItemType.getTypeName(), is("com.example.PropertyB"));
+
+        final Class<?> propertyBClass = fragmentRefsClassLoader.loadClass("com.example.PropertyB");
+
+        Class<?> dataType = propertyBClass.getMethod("getData").getReturnType();
+        assertThat(dataType.getName(), is("java.util.List"));
+
+        Type dataItemType = ((ParameterizedType)propertyBClass.getMethod("getData").getGenericReturnType()).getActualTypeArguments()[0];
+        assertThat(dataItemType.getTypeName(), is("com.example.PropertyA"));
+
+        final Class<?> propertyAClass = fragmentRefsClassLoader.loadClass("com.example.PropertyA");
+
+        Class<?> valueType = propertyAClass.getMethod("getValue").getReturnType();
+        assertThat(valueType.getName(), is("java.lang.String"));
+    }
 }

jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/util/Jsonschema2PojoRule.java

@@ -55,12 +55,11 @@ public class Jsonschema2PojoRule implements TestRule {
     private boolean captureDiagnostics = false;
     private boolean sourceDirInitialized = false;
     private boolean classesDirInitialized = false;
-    private ClassLoader classLoader;
     private List<Diagnostic<? extends JavaFileObject>> diagnostics;
 
     public Jsonschema2PojoRule captureDiagnostics() {
-      this.captureDiagnostics = true;
-      return this;
+        this.captureDiagnostics = true;
+        return this;
     }
 
     /**
@@ -85,20 +84,9 @@ public File getCompileDir() {
         return compileDir;
     }
 
-    /**
-     * Returns the class loader for compiled classes. Only defined after calling
-     * a compile method.
-     *
-     * @return The class loader for compiled classes.
-     */
-    public ClassLoader getClassLoader() {
-        checkActive();
-        return classLoader;
-    }
-
     public List<Diagnostic<? extends JavaFileObject>> getDiagnostics() {
-      checkActive();
-      return diagnostics;
+        checkActive();
+        return diagnostics;
     }
 
     @Override
@@ -119,7 +107,6 @@ public void evaluate() throws Throwable {
                 } finally {
                     generateDir = null;
                     compileDir = null;
-                    classLoader = null;
                     sourceDirInitialized = false;
                     classesDirInitialized = false;
                     captureDiagnostics = captureDiagnosticsStart;
@@ -156,16 +143,12 @@ public ClassLoader compile(List<File> classpath) {
     }
 
     public ClassLoader compile(List<File> classpath, Map<String, Object> config) {
-      return compile(systemJavaCompiler(), null, classpath, config);
+        return compile(systemJavaCompiler(), null, classpath, config);
     }
 
     public ClassLoader compile(JavaCompiler compiler, Writer out, List<File> classpath, Map<String, Object> config) {
-        if (classLoader != null) {
-            throw new IllegalStateException("cannot recompile sources");
-        }
         DiagnosticListener<JavaFileObject> diagnosticListener = captureDiagnostics ? new CapturingDiagnosticListener() : null;
-        classLoader = CodeGenerationHelper.compile(compiler, out, getGenerateDir(), getCompileDir(), classpath, config, diagnosticListener);
-        return classLoader;
+        return CodeGenerationHelper.compile(compiler, out, getGenerateDir(), getCompileDir(), classpath, config, diagnosticListener);
     }
 
     public ClassLoader generateAndCompile(String schema, String targetPackage, Map<String, Object> configValues) {
@@ -199,10 +182,10 @@ private void checkActive() {
     }
 
     class CapturingDiagnosticListener implements DiagnosticListener<JavaFileObject> {
-      @Override
-      public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
-        diagnostics.add(diagnostic);
-      }
+        @Override
+        public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+            diagnostics.add(diagnostic);
+        }
     }
 
     private static List<File> emptyClasspath() {

jsonschema2pojo-integration-tests/src/test/resources/schema/ref/refToRefToDefinitions.json

@@ -0,0 +1,35 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Inbox Item Datalake DTO",
+    "definitions": {
+        "PropertyA": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            }
+        },
+        "PropertyB": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/PropertyA"
+                    },
+                    "default": []
+                }
+            }
+        }
+    },
+    "properties": {
+        "FinalProperty": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/PropertyB"
+            },
+            "default": []
+        }
+    }
+}