changing ObjectSchema#definesProperty() implementation to recursively handle pattern properties

Author: erosb

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

@@ -32,9 +32,6 @@
 
 import org.json.JSONObject;
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-
 /**
  * Object schema validator.
  */
@@ -398,30 +395,39 @@ public void validate(final Object subject) {
   @Override
   public boolean definesProperty(String field) {
     field = field.replaceFirst("^#", "").replaceFirst("^/", "");
-    return !field.isEmpty() && (definesPatternProperty(field)
-        || definesSchemaDependencyProperty(field)
-        || definesSchemaProperty(field));
+    int firstSlashIdx = field.indexOf('/');
+    String nextToken, remaining;
+    if (firstSlashIdx == -1) {
+      nextToken = field;
+      remaining = null;
+    } else {
+      nextToken = field.substring(0, firstSlashIdx);
+      remaining = field.substring(firstSlashIdx + 1);
+    }
+    return !field.isEmpty() && (definesSchemaProperty(nextToken, remaining)
+        || definesPatternProperty(nextToken, remaining)
+        || definesSchemaDependencyProperty(field));
   }
 
-  private boolean definesSchemaProperty(final String field) {
-    List<String> fields = Lists.newArrayList(Splitter.on("/").limit(2).split(field));
-    String current = unescape(fields.get(0));
-    boolean hasSuffix = fields.size() > 1;
+  private boolean definesSchemaProperty(String current, final String remaining) {
+    current = unescape(current);
+    boolean hasSuffix = !(remaining == null);
     if (propertySchemas.containsKey(current)) {
       if (hasSuffix) {
-        String suffix = fields.get(1);
-        return propertySchemas.get(current).definesProperty(suffix);
+        return propertySchemas.get(current).definesProperty(remaining);
       } else {
         return true;
       }
     }
     return false;
   }
 
-  private boolean definesPatternProperty(final String field) {
+  private boolean definesPatternProperty(final String current, final String remaining) {
     return patternProperties.keySet()
         .stream()
-        .filter(pattern -> pattern.matcher(field).matches())
+        .filter(pattern -> pattern.matcher(current).matches())
+        .map(pattern -> patternProperties.get(pattern))
+        .filter(schema -> remaining == null || schema.definesProperty(remaining))
         .findAny()
         .isPresent();
   }

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

@@ -15,6 +15,8 @@
  */
 package org.everit.json.schema.loader;
 
+import java.io.InputStream;
+
 import org.everit.json.schema.ObjectSchema;
 import org.everit.json.schema.Schema;
 import org.json.JSONObject;
@@ -23,16 +25,14 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.InputStream;
-
 public class DefinesPropertyTest {
 
   private static JSONObject ALL_SCHEMAS;
 
   @BeforeClass
   public static void before() {
     InputStream stream = DefinesPropertyTest.class.getResourceAsStream(
-            "/org/everit/jsonvalidator/testschemas.json");
+        "/org/everit/jsonvalidator/testschemas.json");
     ALL_SCHEMAS = new JSONObject(new JSONTokener(stream));
   }
 
@@ -107,4 +107,22 @@ public void objectEscape() {
     Assert.assertFalse(actual.definesProperty("#/a~0b/c/d"));
   }
 
+  @Test
+  public void testOfTest() {
+    ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("patternPropsAndSchemaDeps"));
+    JSONObject input = new JSONObject(new JSONTokener(
+        getClass().getResourceAsStream("/org/everit/jsonvalidator/objecttestcases.json")))
+            .getJSONObject("validOfPatternPropsAndSchemaDeps");
+    actual.validate(input);
+  }
+
+  @Test
+  public void patternPropsAndSchemaDefs() {
+    ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("patternPropsAndSchemaDeps"));
+    // Assert.assertTrue(actual.definesProperty("#/1stLevel"));
+    // Assert.assertTrue(actual.definesProperty("#/1stLevel/2ndLevel"));
+    Assert.assertTrue(actual.definesProperty("#/1stLevel/2ndLevel/3rdLev"));
+    // Assert.assertTrue(actual.definesProperty("#/1stLevel/2ndLevel/3rdLevel/4thLevel"));
+  }
+
 }

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

@@ -47,5 +47,13 @@
 			"a" : -5,
 			"b" : "asd"
 		}
+	},
+	"validOfPatternPropsAndSchemaDeps" : {
+		"1stLevel" : {
+			"2ndLevel" : {
+				"3rdLev" :  "whatever"
+				
+			}
+		}
 	}
 }

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

@@ -367,5 +367,31 @@
 		"properties" : {
 			"prop" : { "$ref" : "schema.json" } 
 		}
+	},
+	"patternPropsAndSchemaDeps": {
+		"type" : "object",
+		"properties" : {
+			"1stLevel" : {
+				"dependencies" : {
+					"2ndLevel" : {
+						"type" : "object",
+						"additionalProperties":false,
+						"patternProperties" : {
+							"2ndL.*l$" : {
+								"type" : "object",
+								"properties" : {
+									"3rdLev" : {
+										"type" : "string"
+									}
+								},
+								"additionalProperties":false
+							}
+						}
+					}
+				}
+				
+			}
+		},
+		"additionalProperties" : false
 	}
 }