Allow boolean subschema during loading of conditional schema

Author: zgyorffi

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

@@ -368,15 +368,9 @@ private NumberSchema.Builder buildNumberSchema() {
 
     private ConditionalSchema.Builder buildConditionalSchema() {
         ConditionalSchema.Builder builder = ConditionalSchema.builder();
-        if (ls.schemaJson().containsKey("if")) {
-            builder.ifSchema(loadChild(ls.schemaJson().require("if").requireObject()).build());
-        }
-        if (ls.schemaJson().containsKey("then")) {
-            builder.thenSchema(loadChild(ls.schemaJson().require("then").requireObject()).build());
-        }
-        if (ls.schemaJson().containsKey("else")) {
-            builder.elseSchema(loadChild(ls.schemaJson().require("else").requireObject()).build());
-        }
+        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;
     }
 
@@ -390,8 +384,6 @@ private Schema.Builder loadSchemaObject(JsonObject o) {
             builder = buildEnumSchema();
         } else if (ls.schemaJson().containsKey("const") && (config.specVersion != DRAFT_4)) {
             builder = buildConstSchema();
-        } else if (config.specVersion.compareTo(DRAFT_6) > 0 && schemaHasAnyOf(CONDITIONAL_SCHEMA_KEYWORDS)) {
-            builder = buildConditionalSchema();
         } else {
             builder = new CombinedSchemaLoader(ls, this).load()
                     .orElseGet(() -> {
@@ -492,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

@@ -186,6 +186,15 @@ public void conditionalSchemaLoadingV6() {
         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

@@ -109,6 +109,9 @@
       "multipleOf": 2
     }
   },
+  "conditionalSchemaIfSubSchemaTrue": {
+    "if": true
+  },
   "objectWithSchemaRectangleDep": {
     "type": "object",
     "dependencies": {