fixing #41

Author: erosb

core/src/main/java/org/everit/json/schema/loader/SchemaLoader.java

@@ -513,7 +513,7 @@ public Schema.Builder<?> load() {
     } else {
       builder = tryCombinedSchema();
       if (builder == null) {
-        if (!schemaJson.has("type")) {
+        if (!schemaJson.has("type") || schemaJson.has("$ref")) {
           builder = buildSchemaWithoutExplicitType();
         } else {
           builder = loadForType(schemaJson.get("type"));
@@ -578,7 +578,7 @@ private Schema.Builder<?> lookupReference(final String relPointerString, final J
     QueryResult result = pointer.query();
     JSONObject resultObject = extend(withoutRef(ctx), result.getQueryResult());
     SchemaLoader childLoader =
-            selfBuilder().resolutionScope(isExternal ? withoutFragment(absPointerString) : id)
+        selfBuilder().resolutionScope(isExternal ? withoutFragment(absPointerString) : id)
             .schemaJson(resultObject)
             .rootSchemaJson(result.getContainingDocument()).build();
     Schema referredSchema = childLoader.load().build();
@@ -679,7 +679,7 @@ JSONObject withoutRef(final JSONObject original) {
     }
     JSONObject rval = new JSONObject();
     Arrays.stream(names)
-    .filter(name -> !"$ref".equals(name))
+        .filter(name -> !"$ref".equals(name))
         .forEach(name -> rval.put(name, original.get(name)));
     return rval;
   }

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -17,6 +17,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
 
@@ -101,13 +102,14 @@ public void booleanSchema() {
   public void builderhasDefaultFormatValidators() {
     SchemaLoader actual = SchemaLoader.builder().schemaJson(get("booleanSchema")).build();
     Assert
-    .assertTrue(actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
+        .assertTrue(
+            actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("uri").get() instanceof URIFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("email").get() instanceof EmailFormatValidator);
     Assert.assertTrue(actual.getFormatValidator("ipv4").get() instanceof IPV4Validator);
     Assert.assertTrue(actual.getFormatValidator("ipv6").get() instanceof IPV6Validator);
     Assert
-    .assertTrue(actual.getFormatValidator("hostname").get() instanceof HostnameFormatValidator);
+        .assertTrue(actual.getFormatValidator("hostname").get() instanceof HostnameFormatValidator);
   }
 
   @Test
@@ -327,7 +329,7 @@ public void pointerResolution() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("pointerResolution"));
     ObjectSchema rectangleSchema = (ObjectSchema) ((ReferenceSchema) actual.getPropertySchemas()
         .get("rectangle"))
-        .getReferredSchema();
+            .getReferredSchema();
     Assert.assertNotNull(rectangleSchema);
     ReferenceSchema aRef = (ReferenceSchema) rectangleSchema.getPropertySchemas().get("a");
     Assert.assertTrue(aRef.getReferredSchema() instanceof NumberSchema);
@@ -353,6 +355,14 @@ public void recursiveSchema() {
     SchemaLoader.load(get("recursiveSchema"));
   }
 
+  @Test
+  public void refWithType() {
+    ObjectSchema actualRoot = (ObjectSchema) SchemaLoader.load(get("refWithType"));
+    ReferenceSchema actual = (ReferenceSchema) actualRoot.getPropertySchemas().get("prop");
+    ObjectSchema propSchema = (ObjectSchema) actual.getReferredSchema();
+    Assert.assertEquals(propSchema.getRequiredProperties(), Arrays.asList("a", "b"));
+  }
+
   @Test
   public void remotePointerResulion() {
     SchemaClient httpClient = Mockito.mock(SchemaClient.class);

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -253,6 +253,19 @@
 			}
 		}
 	},
+	"refWithType" : {
+		"properties" : {
+			"prop" : {
+				"type": "object",
+				"$ref" : "#/definitions/PropDef"
+			}
+		},
+		"definitions" : {
+			"PropDef" : {
+				"required" : ["a", "b"]	
+			}
+		}
+	},
 	"resolutionScopeTest" : {
     	"id": "http://x.y.z/rootschema.json#",
     	"schema1": {