introducing SpecificationVersion#isAtLeast() , fixing "propertyNames" not working in DRAFT_7 mode

Author: erosb

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

@@ -1,11 +1,11 @@
 package org.everit.json.schema.loader;
 
-import org.everit.json.schema.ObjectSchema;
-import org.everit.json.schema.Schema;
-
 import static java.util.Objects.requireNonNull;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
 
+import org.everit.json.schema.ObjectSchema;
+import org.everit.json.schema.Schema;
+
 /**
  * @author erosb
  */
@@ -31,21 +31,21 @@ ObjectSchema.Builder load() {
                 .ifPresent(propertyDefs -> populatePropertySchemas(propertyDefs, builder));
         ls.schemaJson().maybe("additionalProperties").ifPresent(rawAddProps -> {
             rawAddProps.canBe(Boolean.class, p -> builder.additionalProperties(p))
-                .or(JsonObject.class, def -> builder.schemaOfAdditionalProperties(defaultLoader.loadChild(def).build()))
-                .requireAny();
+                    .or(JsonObject.class, def -> builder.schemaOfAdditionalProperties(defaultLoader.loadChild(def).build()))
+                    .requireAny();
         });
         ls.schemaJson().maybe("required").map(JsonValue::requireArray)
-            .ifPresent(arr -> arr.forEach((i, val) -> builder.addRequiredProperty(val.requireString())));
+                .ifPresent(arr -> arr.forEach((i, val) -> builder.addRequiredProperty(val.requireString())));
         ls.schemaJson().maybe("patternProperties").map(JsonValue::requireObject)
-        .ifPresent(patternProps -> {
-            patternProps.keySet().forEach(pattern -> {
-                Schema patternSchema = defaultLoader.loadChild(patternProps.require(pattern)).build();
-                builder.patternProperty(pattern, patternSchema);
-            });
-        });
+                .ifPresent(patternProps -> {
+                    patternProps.keySet().forEach(pattern -> {
+                        Schema patternSchema = defaultLoader.loadChild(patternProps.require(pattern)).build();
+                        builder.patternProperty(pattern, patternSchema);
+                    });
+                });
         ls.schemaJson().maybe("dependencies").map(JsonValue::requireObject)
                 .ifPresent(deps -> addDependencies(builder, deps));
-        if (DRAFT_6.equals(ls.specVersion())) {
+        if (ls.specVersion().isAtLeast(DRAFT_6)) {
             ls.schemaJson().maybe("propertyNames")
                     .map(defaultLoader::loadChild)
                     .map(Schema.Builder::build)
@@ -57,11 +57,11 @@ ObjectSchema.Builder load() {
     private void populatePropertySchemas(JsonObject propertyDefs,
             ObjectSchema.Builder builder) {
         propertyDefs.forEach((key, value) -> {
-                    if (!key.equals(ls.specVersion().idKeyword())
-                            || value instanceof JsonObject) {
-                        addPropertySchemaDefinition(key, value, builder);
-                    }
-                });
+            if (!key.equals(ls.specVersion().idKeyword())
+                    || value instanceof JsonObject) {
+                addPropertySchemaDefinition(key, value, builder);
+            }
+        });
     }
 
     private void addPropertySchemaDefinition(String keyOfObj, JsonValue definition, ObjectSchema.Builder builder) {

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

@@ -484,7 +484,7 @@ Schema.Builder<?> sniffSchemaByProps() {
             return buildNumberSchema().requiresNumber(false);
         } else if (schemaHasAnyOf(STRING_SCHEMA_PROPS)) {
             return new StringSchemaLoader(ls, config.formatValidators).load().requiresString(false);
-        } else if (config.specVersion.compareTo(DRAFT_6) > 0 && schemaHasAnyOf(CONDITIONAL_SCHEMA_KEYWORDS)) {
+        } else if (config.specVersion.isAtLeast(DRAFT_7) && schemaHasAnyOf(CONDITIONAL_SCHEMA_KEYWORDS)) {
             return buildConditionalSchema();
         }
         return null;

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

@@ -172,4 +172,7 @@ private static final List<String> keywords(String... keywords) {
 
     abstract Map<String, FormatValidator> defaultFormatValidators();
 
+    public boolean isAtLeast(SpecificationVersion lowerInclusiveBound) {
+        return this.ordinal() >= lowerInclusiveBound.ordinal();
+    }
 }

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

@@ -3,7 +3,9 @@
 import static java.util.Arrays.asList;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_4;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
+import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_7;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
@@ -33,4 +35,20 @@ public void v6MapMatchesFormatNames() {
             assertEquals(entry.getKey(), entry.getValue().formatName());
         }
     }
+
+    @Test
+    public void isAtLeastTrue() {
+        assertTrue(DRAFT_7.isAtLeast(DRAFT_6));
+    }
+
+    @Test
+    public void isAtLeast_False() {
+        assertFalse(DRAFT_6.isAtLeast(DRAFT_7));
+    }
+
+    @Test
+    public void isAtLeast_equal() {
+        assertTrue(DRAFT_6.isAtLeast(DRAFT_6));
+    }
+
 }