rename field and have default realisation

Viktor Buldakov · Viktor Buldakov · commit 3ccf56b787b1 · 2016-08-05T17:32:19.000+02:00
diff --git a/core/src/main/java/org/everit/json/schema/ArraySchema.java b/core/src/main/java/org/everit/json/schema/ArraySchema.java
@@ -291,9 +291,4 @@ public void validate(final Object subject) {
     ValidationException.throwFor(this, failures);
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
-
 }
diff --git a/core/src/main/java/org/everit/json/schema/BooleanSchema.java b/core/src/main/java/org/everit/json/schema/BooleanSchema.java
@@ -49,9 +49,4 @@ public void validate(final Object subject) {
     }
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
-
 }
diff --git a/core/src/main/java/org/everit/json/schema/CombinedSchema.java b/core/src/main/java/org/everit/json/schema/CombinedSchema.java
@@ -180,9 +180,9 @@ public void validate(final Object subject) {
   }
 
   @Override
-  public boolean hasField(String field) {
+  public boolean definesProperty(String field) {
     List<Schema> matching = subschemas.stream()
-            .filter(schema -> schema.hasField(field))
+            .filter(schema -> schema.definesProperty(field))
             .collect(Collectors.toList());
     try {
       criterion.validate(subschemas.size(), matching.size());
diff --git a/core/src/main/java/org/everit/json/schema/EmptySchema.java b/core/src/main/java/org/everit/json/schema/EmptySchema.java
@@ -47,9 +47,4 @@ public void validate(final Object subject) {
     // always passing
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
-
 }
diff --git a/core/src/main/java/org/everit/json/schema/EnumSchema.java b/core/src/main/java/org/everit/json/schema/EnumSchema.java
@@ -74,9 +74,4 @@ public void validate(final Object subject) {
                 subject), "enum"));
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
-
 }
diff --git a/core/src/main/java/org/everit/json/schema/NotSchema.java b/core/src/main/java/org/everit/json/schema/NotSchema.java
@@ -63,7 +63,7 @@ public void validate(final Object subject) {
   }
 
   @Override
-  public boolean hasField(String field) {
-    return !mustNotMatch.hasField(field);
+  public boolean definesProperty(String field) {
+    return !mustNotMatch.definesProperty(field);
   }
 }
diff --git a/core/src/main/java/org/everit/json/schema/NullSchema.java b/core/src/main/java/org/everit/json/schema/NullSchema.java
@@ -51,8 +51,4 @@ public void validate(final Object subject) {
     }
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
 }
diff --git a/core/src/main/java/org/everit/json/schema/NumberSchema.java b/core/src/main/java/org/everit/json/schema/NumberSchema.java
@@ -198,9 +198,4 @@ public void validate(final Object subject) {
     }
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
-
 }
diff --git a/core/src/main/java/org/everit/json/schema/ObjectSchema.java b/core/src/main/java/org/everit/json/schema/ObjectSchema.java
@@ -395,7 +395,7 @@ public void validate(final Object subject) {
   }
 
   @Override
-  public boolean hasField(String field) {
+  public boolean definesProperty(String field) {
     if (field.isEmpty()) {
       return false;
     }
@@ -410,7 +410,7 @@ public boolean hasField(String field) {
     if (propertySchemas.containsKey(current)) {
       if (hasSuffix) {
         String suffix = fields.get(1);
-        return propertySchemas.get(current).hasField(suffix);
+        return propertySchemas.get(current).definesProperty(suffix);
       } else {
         return true;
       }
diff --git a/core/src/main/java/org/everit/json/schema/ReferenceSchema.java b/core/src/main/java/org/everit/json/schema/ReferenceSchema.java
@@ -62,11 +62,11 @@ public void validate(final Object subject) {
   }
 
   @Override
-  public boolean hasField(String field) {
+  public boolean definesProperty(String field) {
     if (referredSchema == null) {
       throw new IllegalStateException("referredSchema must be injected before validation");
     }
-    return referredSchema.hasField(field);
+    return referredSchema.definesProperty(field);
   }
 
   public Schema getReferredSchema() {
diff --git a/core/src/main/java/org/everit/json/schema/Schema.java b/core/src/main/java/org/everit/json/schema/Schema.java
@@ -85,7 +85,9 @@ protected Schema(final Builder<?> builder) {
    */
   public abstract void validate(final Object subject);
 
-  public abstract boolean hasField(final String field);
+  public boolean definesProperty(final String field) {
+    return false;
+  }
 
   @Override
   public int hashCode() {
diff --git a/core/src/main/java/org/everit/json/schema/StringSchema.java b/core/src/main/java/org/everit/json/schema/StringSchema.java
@@ -174,8 +174,4 @@ public void validate(final Object subject) {
     }
   }
 
-  @Override
-  public boolean hasField(String field) {
-    return false;
-  }
 }
diff --git a/core/src/test/java/org/everit/json/schema/loader/HasFieldTest.java b/core/src/test/java/org/everit/json/schema/loader/HasFieldTest.java
@@ -43,38 +43,38 @@ private JSONObject get(final String schemaName) {
   @Test
   public void objectSchemaHasField() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("pointerResolution"));
-    Assert.assertTrue(actual.hasField("rectangle"));
-    Assert.assertTrue(actual.hasField("rectangle.a"));
-    Assert.assertTrue(actual.hasField("rectangle.b"));
+    Assert.assertTrue(actual.definesProperty("rectangle"));
+    Assert.assertTrue(actual.definesProperty("rectangle.a"));
+    Assert.assertTrue(actual.definesProperty("rectangle.b"));
 
-    Assert.assertFalse(actual.hasField("rectangle.c"));
-    Assert.assertFalse(actual.hasField("rectangle."));
-    Assert.assertFalse(actual.hasField("."));
-    Assert.assertFalse(actual.hasField(".a"));
-    Assert.assertFalse(actual.hasField(""));
-    Assert.assertFalse(actual.hasField("rectangle.a.d"));
+    Assert.assertFalse(actual.definesProperty("rectangle.c"));
+    Assert.assertFalse(actual.definesProperty("rectangle."));
+    Assert.assertFalse(actual.definesProperty("."));
+    Assert.assertFalse(actual.definesProperty(".a"));
+    Assert.assertFalse(actual.definesProperty(""));
+    Assert.assertFalse(actual.definesProperty("rectangle.a.d"));
   }
 
   @Test
   public void recursiveSchemaHasField() {
     Schema recursiveSchema = SchemaLoader.load(get("recursiveSchema"));
 
-    Assert.assertTrue(recursiveSchema.hasField("prop"));
-    Assert.assertTrue(recursiveSchema.hasField("prop.subprop"));
-    Assert.assertTrue(recursiveSchema.hasField("prop.subprop.subprop"));
-    Assert.assertTrue(recursiveSchema.hasField("prop.subprop.subprop.subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("prop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop.subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop.subprop.subprop"));
   }
 
   @Test
   public void patternPropertiesHasField() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("patternProperties"));
-    Assert.assertTrue(actual.hasField("a"));
-    Assert.assertTrue(actual.hasField("aa"));
-    Assert.assertTrue(actual.hasField("aaa"));
-    Assert.assertTrue(actual.hasField("aaaa"));
-    Assert.assertTrue(actual.hasField("aaaaa"));
+    Assert.assertTrue(actual.definesProperty("a"));
+    Assert.assertTrue(actual.definesProperty("aa"));
+    Assert.assertTrue(actual.definesProperty("aaa"));
+    Assert.assertTrue(actual.definesProperty("aaaa"));
+    Assert.assertTrue(actual.definesProperty("aaaaa"));
 
-    Assert.assertFalse(actual.hasField("b"));
+    Assert.assertFalse(actual.definesProperty("b"));
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -291,9 +291,4 @@ public void validate(final Object subject) {`
`291`	`291`	`ValidationException.throwFor(this, failures);`
`292`	`292`	`}`
`293`	`293`
`294`		`- @Override`
`295`		`- public boolean hasField(String field) {`
`296`		`- return false;`
`297`		`- }`
`298`		`-`
`299`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,4 @@ public void validate(final Object subject) {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- @Override`
`53`		`- public boolean hasField(String field) {`
`54`		`- return false;`
`55`		`- }`
`56`		`-`
`57`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,4 @@ public void validate(final Object subject) {`
`47`	`47`	`// always passing`
`48`	`48`	`}`
`49`	`49`
`50`		`- @Override`
`51`		`- public boolean hasField(String field) {`
`52`		`- return false;`
`53`		`- }`
`54`		`-`
`55`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,4 @@ public void validate(final Object subject) {`
`74`	`74`	`subject), "enum"));`
`75`	`75`	`}`
`76`	`76`
`77`		`- @Override`
`78`		`- public boolean hasField(String field) {`
`79`		`- return false;`
`80`		`- }`
`81`		`-`
`82`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void validate(final Object subject) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public boolean hasField(String field) {`
`67`		`- return !mustNotMatch.hasField(field);`
	`66`	`+ public boolean definesProperty(String field) {`
	`67`	`+ return !mustNotMatch.definesProperty(field);`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,4 @@ public void validate(final Object subject) {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- @Override`
`55`		`- public boolean hasField(String field) {`
`56`		`- return false;`
`57`		`- }`
`58`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,4 @@ public void validate(final Object subject) {`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`
`201`		`- @Override`
`202`		`- public boolean hasField(String field) {`
`203`		`- return false;`
`204`		`- }`
`205`		`-`
`206`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ public void validate(final Object subject) {`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`@Override`
`398`		`- public boolean hasField(String field) {`
	`398`	`+ public boolean definesProperty(String field) {`
`399`	`399`	`if (field.isEmpty()) {`
`400`	`400`	`return false;`
`401`	`401`	`}`
`@@ -410,7 +410,7 @@ public boolean hasField(String field) {`
`410`	`410`	`if (propertySchemas.containsKey(current)) {`
`411`	`411`	`if (hasSuffix) {`
`412`	`412`	`String suffix = fields.get(1);`
`413`		`- return propertySchemas.get(current).hasField(suffix);`
	`413`	`+ return propertySchemas.get(current).definesProperty(suffix);`
`414`	`414`	`} else {`
`415`	`415`	`return true;`
`416`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ public void validate(final Object subject) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- public boolean hasField(String field) {`
	`65`	`+ public boolean definesProperty(String field) {`
`66`	`66`	`if (referredSchema == null) {`
`67`	`67`	`throw new IllegalStateException("referredSchema must be injected before validation");`
`68`	`68`	`}`
`69`		`- return referredSchema.hasField(field);`
	`69`	`+ return referredSchema.definesProperty(field);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public Schema getReferredSchema() {`