check schemaDependencies and remove notSchema definesProperty

Author: Viktor Buldakov

core/src/main/java/org/everit/json/schema/NotSchema.java

@@ -62,8 +62,4 @@ public void validate(final Object subject) {
     throw new ValidationException(this, "subject must not be valid agains schema " + mustNotMatch);
   }
 
-  @Override
-  public boolean definesProperty(String field) {
-    return !mustNotMatch.definesProperty(field);
-  }
 }

core/src/main/java/org/everit/json/schema/ObjectSchema.java

@@ -396,14 +396,12 @@ public void validate(final Object subject) {
 
   @Override
   public boolean definesProperty(String field) {
-    if (field.isEmpty()) {
-      return false;
-    }
-    for (Entry<Pattern, Schema> entry : patternProperties.entrySet()) {
-      if (entry.getKey().matcher(field).matches()) {
-        return true;
-      }
-    }
+    return !field.isEmpty() && (definesPatternProperty(field)
+            || definesSchemaDependencyProperty(field)
+            || definesSchemaProperty(field));
+  }
+
+  private boolean definesSchemaProperty(String field) {
     List<String> fields = Lists.newArrayList(Splitter.on(".").limit(2).split(field));
     String current = fields.get(0);
     boolean hasSuffix = fields.size() > 1;
@@ -418,4 +416,26 @@ public boolean definesProperty(String field) {
     return false;
   }
 
+  private boolean definesPatternProperty(String field) {
+    for (Entry<Pattern, Schema> entry : patternProperties.entrySet()) {
+      if (entry.getKey().matcher(field).matches()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private boolean definesSchemaDependencyProperty(String field) {
+    if (schemaDependencies.containsKey(field)) {
+      return true;
+    }
+
+    for (Schema schema : schemaDependencies.values()) {
+      if (schema.definesProperty(field)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
 }

core/src/test/java/org/everit/json/schema/loader/HasFieldTest.java renamed to core/src/test/java/org/everit/json/schema/loader/DefinesPropertyTest.java

@@ -25,13 +25,13 @@
 
 import java.io.InputStream;
 
-public class HasFieldTest {
+public class DefinesPropertyTest {
 
   private static JSONObject ALL_SCHEMAS;
 
   @BeforeClass
   public static void before() {
-    InputStream stream = HasFieldTest.class.getResourceAsStream(
+    InputStream stream = DefinesPropertyTest.class.getResourceAsStream(
             "/org/everit/jsonvalidator/testschemas.json");
     ALL_SCHEMAS = new JSONObject(new JSONTokener(stream));
   }
@@ -77,4 +77,25 @@ public void patternPropertiesHasField() {
     Assert.assertFalse(actual.definesProperty("b"));
   }
 
+  @Test
+  public void objectWithSchemaDep() {
+    ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("objectWithSchemaDep"));
+    Assert.assertTrue(actual.definesProperty("a"));
+    Assert.assertTrue(actual.definesProperty("b"));
+
+    Assert.assertFalse(actual.definesProperty("c"));
+  }
+
+  @Test
+  public void objectWithSchemaRectangleDep() {
+    ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("objectWithSchemaRectangleDep"));
+    Assert.assertTrue(actual.definesProperty("d.e"));
+    Assert.assertTrue(actual.definesProperty("rectangle.a"));
+    Assert.assertTrue(actual.definesProperty("rectangle.b"));
+
+    Assert.assertFalse(actual.definesProperty("c"));
+    Assert.assertFalse(actual.definesProperty("d.c"));
+    Assert.assertFalse(actual.definesProperty("rectangle.c"));
+  }
+
 }

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

@@ -113,6 +113,30 @@
 			}
 		}
 	},
+	"objectWithSchemaRectangleDep" : {
+		"type" : "object",
+		"dependencies" : {
+			"d.e" : {
+				"type" : "object",
+				"properties" : {
+					"rectangle" : {"$ref" : "#/definitions/Rectangle" }
+				}
+			}
+		},
+		"definitions" : {
+			"size" : {
+				"type" : "number",
+				"minimum" : 0
+			},
+			"Rectangle" : {
+				"type" : "object",
+				"properties" : {
+					"a" : {"$ref" : "#/definitions/size"},
+					"b" : {"$ref" : "#/definitions/size"}
+				}
+			}
+		}
+	},
 	"invalidDependency" : {
 		"type" : "object",
 		"dependencies" : {