fixing failing oneOf and anyOf tests, which were caused by a bug introduced in version 1.7.0

Author: erosb

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

@@ -1,13 +1,13 @@
 package org.everit.json.schema;
 
-import org.json.JSONObject;
+import static java.lang.String.format;
+import static org.everit.json.schema.EnumSchema.toJavaValue;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static java.lang.String.format;
-import static org.everit.json.schema.EnumSchema.toJavaValue;
+import org.json.JSONObject;
 
 class ValidatingVisitor extends Visitor {
 
@@ -150,10 +150,9 @@ void visitConditionalSchema(ConditionalSchema conditionalSchema) {
     ValidationException getFailureOfSchema(Schema schema, Object input) {
         Object origSubject = this.subject;
         this.subject = input;
-        return failureReporter.inContextOfSchema(schema, () -> {
-            visit(schema);
-            this.subject = origSubject;
-        });
+        ValidationException rval = failureReporter.inContextOfSchema(schema, () -> visit(schema));
+        this.subject = origSubject;
+        return rval;
     }
 
     void failIfErrorFound() {

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

@@ -1,19 +1,20 @@
 package org.everit.json.schema.loader;
 
-import org.everit.json.schema.CombinedSchema;
-import org.everit.json.schema.Schema;
-import org.everit.json.schema.SchemaException;
-import org.json.JSONArray;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static java.util.Objects.requireNonNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.joining;
+import org.everit.json.schema.CombinedSchema;
+import org.everit.json.schema.Schema;
 
 /**
  * @author erosb

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

@@ -258,18 +258,6 @@ public static Schema load(final JSONObject schemaJson, final SchemaClient httpCl
 
     private final ExclusiveLimitHandler exclusiveLimitHandler;
 
-    private URI extractURIFromIdAttribute(JsonObject obj) {
-        return obj.maybe(config.specVersion.idKeyword()).map(JsonValue::requireString)
-                .map(rawId -> {
-                    try {
-                        return new URI(rawId);
-                    } catch (URISyntaxException e) {
-                        throw new RuntimeException(e);
-                    }
-                })
-                .orElse(null);
-    }
-
     /**
      * Constructor.
      *

core/src/test/java/org/everit/json/schema/CombinedSchemaTest.java

@@ -15,17 +15,18 @@
  */
 package org.everit.json.schema;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 public class CombinedSchemaTest {
 
@@ -134,4 +135,26 @@ public void toStringTest() {
                 + "]}"), actual));
     }
 
+    @Test
+    public void oneOfEarlyFailureTest() {
+        CombinedSchema subject = CombinedSchema
+                .oneOf(asList(ObjectSchema.builder()
+                                .addPropertySchema("bar", NumberSchema.builder().requiresInteger(true).build())
+                                .addRequiredProperty("bar")
+                                .build(),
+                        ObjectSchema.builder()
+                                .addPropertySchema("foo", StringSchema.builder().requiresString(true).build())
+                                .addRequiredProperty("foo")
+                                .build()))
+                .build();
+        Validator validator = Validator.builder().failEarly().build();
+        validator.performValidation(subject, new JSONObject("{\"foo\":\"a\"}"));
+        validator.performValidation(subject, new JSONObject("{\"bar\":2}"));
+        TestSupport.failureOf(subject)
+                .validator(validator)
+                .input(new JSONObject("{\"bar\":\"quux\", \"foo\":2}"))
+                .expectedSchemaLocation(null)
+                .expect();
+    }
+
 }