Merge branch 'master' of https://github.com/erosb/json-schema-validator

Author: erosb

README.md

@@ -12,7 +12,7 @@ Add the following to your `pom.xml`:
 <dependency>
     <groupId>org.everit.json</groupId>
     <artifactId>org.everit.json.schema</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 

core/pom.xml

@@ -29,7 +29,7 @@
 
   <groupId>org.everit.json</groupId>
   <artifactId>org.everit.json.schema</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 
   <packaging>bundle</packaging>
 

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

@@ -60,25 +60,11 @@ public static class Builder extends Schema.Builder<ObjectSchema> {
 
     private final Map<String, Schema> schemaDependencies = new HashMap<>();
 
-    public Builder requiresObject(final boolean requiresObject) {
-      this.requiresObject = requiresObject;
-      return this;
-    }
-
     public Builder additionalProperties(final boolean additionalProperties) {
       this.additionalProperties = additionalProperties;
       return this;
     }
 
-    public Builder patternProperty(final Pattern pattern, final Schema schema) {
-      this.patternProperties.put(pattern, schema);
-      return this;
-    }
-
-    public Builder patternProperty(final String pattern, final Schema schema) {
-      return patternProperty(Pattern.compile(pattern), schema);
-    }
-
     /**
      * Adds a property schema.
      *
@@ -116,6 +102,15 @@ public Builder minProperties(final Integer minProperties) {
       return this;
     }
 
+    public Builder patternProperty(final Pattern pattern, final Schema schema) {
+      this.patternProperties.put(pattern, schema);
+      return this;
+    }
+
+    public Builder patternProperty(final String pattern, final Schema schema) {
+      return patternProperty(Pattern.compile(pattern), schema);
+    }
+
     /**
      * Adds a property dependency.
      *
@@ -137,6 +132,11 @@ public Builder propertyDependency(final String ifPresent, final String mustBePre
       return this;
     }
 
+    public Builder requiresObject(final boolean requiresObject) {
+      this.requiresObject = requiresObject;
+      return this;
+    }
+
     public Builder schemaDependency(final String ifPresent, final Schema expectedSchema) {
       schemaDependencies.put(ifPresent, expectedSchema);
       return this;
@@ -181,8 +181,8 @@ public static Builder builder() {
    */
   public ObjectSchema(final Builder builder) {
     super(builder);
-    this.propertySchemas = builder.propertySchemas == null ? null :
-        Collections.unmodifiableMap(builder.propertySchemas);
+    this.propertySchemas = builder.propertySchemas == null ? null
+        : Collections.unmodifiableMap(builder.propertySchemas);
     this.additionalProperties = builder.additionalProperties;
     this.schemaOfAdditionalProperties = builder.schemaOfAdditionalProperties;
     if (!additionalProperties && schemaOfAdditionalProperties != null) {
@@ -203,6 +203,18 @@ private void failure(final String exceptionMessage, final Object... params) {
     throw new ValidationException(String.format(exceptionMessage, params));
   }
 
+  private Stream<String> getAdditionalProperties(final JSONObject subject) {
+    String[] names = JSONObject.getNames(subject);
+    if (names == null) {
+      return Stream.empty();
+    } else {
+      return Arrays
+          .stream(names)
+          .filter(key -> !propertySchemas.containsKey(key))
+          .filter(key -> !matchesAnyPattern(key));
+    }
+  }
+
   public Integer getMaxProperties() {
     return maxProperties;
   }
@@ -211,6 +223,10 @@ public Integer getMinProperties() {
     return minProperties;
   }
 
+  public Map<Pattern, Schema> getPatternProperties() {
+    return patternProperties;
+  }
+
   public Map<String, Set<String>> getPropertyDependencies() {
     return propertyDependencies;
   }
@@ -231,17 +247,21 @@ public Schema getSchemaOfAdditionalProperties() {
     return schemaOfAdditionalProperties;
   }
 
-  public boolean permitsAdditionalProperties() {
-    return additionalProperties;
-  }
-
   private boolean matchesAnyPattern(final String key) {
     return patternProperties.keySet().stream()
         .filter(pattern -> pattern.matcher(key).find())
         .findAny()
         .isPresent();
   }
 
+  public boolean permitsAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  public boolean requiresObject() {
+    return requiresObject;
+  }
+
   private void testAdditionalProperties(final JSONObject subject) {
     if (!additionalProperties) {
       getAdditionalProperties(subject)
@@ -254,11 +274,18 @@ private void testAdditionalProperties(final JSONObject subject) {
     }
   }
 
-  private Stream<String> getAdditionalProperties(final JSONObject subject) {
-    return Arrays
-        .stream(JSONObject.getNames(subject))
-        .filter(key -> !propertySchemas.containsKey(key))
-        .filter(key -> !matchesAnyPattern(key));
+  private void testPatternProperties(final JSONObject subject) {
+    String[] propNames = JSONObject.getNames(subject);
+    if (propNames == null || propNames.length == 0) {
+      return;
+    }
+    for (Entry<Pattern, Schema> entry : patternProperties.entrySet()) {
+      for (String propName : propNames) {
+        if (entry.getKey().matcher(propName).find()) {
+          entry.getValue().validate(subject.get(propName));
+        }
+      }
+    }
   }
 
   private void testProperties(final JSONObject subject) {
@@ -274,11 +301,11 @@ private void testProperties(final JSONObject subject) {
 
   private void testPropertyDependencies(final JSONObject subject) {
     propertyDependencies.keySet().stream()
-    .filter(subject::has)
-    .flatMap(ifPresent -> propertyDependencies.get(ifPresent).stream())
-    .filter(mustBePresent -> !subject.has(mustBePresent))
-    .findFirst()
-    .ifPresent(missing -> failure("property [%s] is required", missing));
+        .filter(subject::has)
+        .flatMap(ifPresent -> propertyDependencies.get(ifPresent).stream())
+        .filter(mustBePresent -> !subject.has(mustBePresent))
+        .findFirst()
+        .ifPresent(missing -> failure("property [%s] is required", missing));
   }
 
   private void testRequiredProperties(final JSONObject subject) {
@@ -290,9 +317,9 @@ private void testRequiredProperties(final JSONObject subject) {
 
   private void testSchemaDependencies(final JSONObject subject) {
     schemaDependencies.keySet().stream()
-    .filter(subject::has)
-    .map(schemaDependencies::get)
-    .forEach(schema -> schema.validate(subject));
+        .filter(subject::has)
+        .map(schemaDependencies::get)
+        .forEach(schema -> schema.validate(subject));
   }
 
   private void testSize(final JSONObject subject) {
@@ -325,26 +352,4 @@ public void validate(final Object subject) {
     }
   }
 
-  private void testPatternProperties(final JSONObject subject) {
-    String[] propNames = JSONObject.getNames(subject);
-    if (propNames == null || propNames.length == 0) {
-      return;
-    }
-    for (Entry<Pattern, Schema> entry : patternProperties.entrySet()) {
-      for (String propName : propNames) {
-        if (entry.getKey().matcher(propName).find()) {
-          entry.getValue().validate(subject.get(propName));
-        }
-      }
-    }
-  }
-
-  public boolean requiresObject() {
-    return requiresObject;
-  }
-
-  public Map<Pattern, Schema> getPatternProperties() {
-    return patternProperties;
-  }
-
 }