Merge pull request #149 from zgyorffi/if_then_else_support

If-then-else support: schema loading

Author: erosb

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

@@ -22,6 +22,7 @@
 import org.everit.json.schema.ArraySchema;
 import org.everit.json.schema.BooleanSchema;
 import org.everit.json.schema.CombinedSchema;
+import org.everit.json.schema.ConditionalSchema;
 import org.everit.json.schema.ConstSchema;
 import org.everit.json.schema.EmptySchema;
 import org.everit.json.schema.EnumSchema;
@@ -210,6 +211,8 @@ public SchemaLoaderBuilder nullableSupport(boolean nullableSupport) {
         }
     }
 
+    private static final List<String> CONDITIONAL_SCHEMA_KEYWORDS = asList("if", "then", "else");
+
     private static final List<String> NUMBER_SCHEMA_PROPS = asList("minimum", "maximum",
             "exclusiveMinimum", "exclusiveMaximum", "multipleOf");
 
@@ -363,6 +366,14 @@ private NumberSchema.Builder buildNumberSchema() {
         return builder;
     }
 
+    private ConditionalSchema.Builder buildConditionalSchema() {
+        ConditionalSchema.Builder builder = ConditionalSchema.builder();
+        ls.schemaJson().maybe("if").map(this::loadChild).map(Schema.Builder::build).ifPresent(builder::ifSchema);
+        ls.schemaJson().maybe("then").map(this::loadChild).map(Schema.Builder::build).ifPresent(builder::thenSchema);
+        ls.schemaJson().maybe("else").map(this::loadChild).map(Schema.Builder::build).ifPresent(builder::elseSchema);
+        return builder;
+    }
+
     private Schema.Builder loadSchemaBoolean(Boolean rawBoolean) {
         return rawBoolean ? TrueSchema.builder() : FalseSchema.builder();
     }
@@ -473,6 +484,8 @@ 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)) {
+            return buildConditionalSchema();
         }
         return null;
     }

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

@@ -3,6 +3,7 @@
 import static java.util.Arrays.asList;
 import static org.everit.json.schema.TestSupport.asStream;
 import static org.everit.json.schema.TestSupport.loadAsV6;
+import static org.everit.json.schema.TestSupport.loadAsV7;
 import static org.everit.json.schema.TestSupport.v6Loader;
 import org.everit.json.schema.internal.URIV4FormatValidator;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
@@ -24,6 +25,7 @@
 import org.everit.json.schema.ArraySchema;
 import org.everit.json.schema.BooleanSchema;
 import org.everit.json.schema.CombinedSchema;
+import org.everit.json.schema.ConditionalSchema;
 import org.everit.json.schema.ConstSchema;
 import org.everit.json.schema.EmptySchema;
 import org.everit.json.schema.EnumSchema;
@@ -140,6 +142,59 @@ public void integerSchema() {
         assertTrue(actual.requiresInteger());
     }
 
+    @Test
+    public void conditionalSchemaIf() {
+        ConditionalSchema actual = (ConditionalSchema) loadAsV7(get("conditionalSchemaIf"));
+        Assert.assertTrue(actual.getIfSchema().isPresent());
+        Assert.assertFalse(actual.getThenSchema().isPresent());
+        Assert.assertFalse(actual.getElseSchema().isPresent());
+    }
+
+    @Test
+    public void conditionalSchemaThen() {
+        ConditionalSchema actual = (ConditionalSchema) loadAsV7(get("conditionalSchemaThen"));
+        Assert.assertFalse(actual.getIfSchema().isPresent());
+        Assert.assertTrue(actual.getThenSchema().isPresent());
+        Assert.assertFalse(actual.getElseSchema().isPresent());
+    }
+
+    @Test
+    public void conditionalSchemaElse() {
+        ConditionalSchema actual = (ConditionalSchema) loadAsV7(get("conditionalSchemaElse"));
+        Assert.assertFalse(actual.getIfSchema().isPresent());
+        Assert.assertFalse(actual.getThenSchema().isPresent());
+        Assert.assertTrue(actual.getElseSchema().isPresent());
+    }
+
+    @Test
+    public void conditionalSchemaIfThenElse() {
+        ConditionalSchema actual = (ConditionalSchema) loadAsV7(get("conditionalSchemaIfThenElse"));
+        Assert.assertTrue(actual.getIfSchema().isPresent());
+        Assert.assertTrue(actual.getThenSchema().isPresent());
+        Assert.assertTrue(actual.getElseSchema().isPresent());
+    }
+
+    @Test
+    public void conditionalSchemaLoadingV4() {
+        Schema actual = SchemaLoader.load(get("conditionalSchemaIf"));
+        assertFalse(actual instanceof ConditionalSchema);
+    }
+
+    @Test
+    public void conditionalSchemaLoadingV6() {
+        Schema actual = loadAsV6(get("conditionalSchemaIf"));
+        assertFalse(actual instanceof ConditionalSchema);
+    }
+
+    @Test
+    public void conditionalSchemaIfSubSchemaTrue() {
+        ConditionalSchema actual = (ConditionalSchema) loadAsV7(get("conditionalSchemaIfSubSchemaTrue"));
+        Assert.assertTrue(actual.getIfSchema().isPresent());
+        Assert.assertFalse(actual.getThenSchema().isPresent());
+        Assert.assertFalse(actual.getElseSchema().isPresent());
+        assertTrue(actual.getIfSchema().get() instanceof TrueSchema);
+    }
+
     @Test(expected = SchemaException.class)
     public void invalidExclusiveMinimum() {
         SchemaLoader.load(get("invalidExclusiveMinimum"));

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

@@ -83,6 +83,35 @@
     "type": "integer",
     "exclusiveMinimum": "false"
   },
+  "conditionalSchemaIf": {
+    "if": {
+      "exclusiveMinimum": 0
+    }
+  },
+  "conditionalSchemaThen": {
+    "then": {
+      "maximum": 10
+    }
+  },
+  "conditionalSchemaElse": {
+    "else": {
+      "multipleOf": 2
+    }
+  },
+  "conditionalSchemaIfThenElse": {
+    "if": {
+      "exclusiveMinimum": 0
+    },
+    "then": {
+      "maximum": 10
+    },
+    "else": {
+      "multipleOf": 2
+    }
+  },
+  "conditionalSchemaIfSubSchemaTrue": {
+    "if": true
+  },
   "objectWithSchemaRectangleDep": {
     "type": "object",
     "dependencies": {