Remove need for InstanceResults

Author: justin-tay

src/main/java/com/networknt/schema/ExecutionContext.java

@@ -26,7 +26,7 @@
 import com.networknt.schema.annotation.Annotations;
 import com.networknt.schema.keyword.DiscriminatorState;
 import com.networknt.schema.path.NodePath;
-import com.networknt.schema.result.InstanceResults;
+//import com.networknt.schema.result.InstanceResults;
 import com.networknt.schema.walk.WalkConfig;
 
 /**
@@ -38,7 +38,7 @@ public class ExecutionContext {
     private CollectorContext collectorContext = null;
 
     private Annotations annotations = null;
-    private InstanceResults instanceResults = null;
+//    private InstanceResults instanceResults = null;
     private List<Error> errors = new ArrayList<>();
 
     private final Map<NodePath, DiscriminatorState> discriminatorMapping = new HashMap<>();
@@ -186,12 +186,12 @@ public Annotations getAnnotations() {
         return annotations;
     }
 
-    public InstanceResults getInstanceResults() {
-        if (this.instanceResults == null) {
-            this.instanceResults = new InstanceResults();
-        }
-        return instanceResults;
-    }
+//    public InstanceResults getInstanceResults() {
+//        if (this.instanceResults == null) {
+//            this.instanceResults = new InstanceResults();
+//        }
+//        return instanceResults;
+//    }
 
     /**
      * Determines if the validator should immediately throw a fail fast exception if

src/main/java/com/networknt/schema/Schema.java

@@ -40,6 +40,7 @@
 import com.networknt.schema.resource.ClasspathResourceLoader;
 import com.networknt.schema.resource.InputStreamSource;
 import com.networknt.schema.resource.ResourceLoader;
+import com.networknt.schema.annotation.Annotation;
 import com.networknt.schema.keyword.KeywordType;
 import com.networknt.schema.utils.JsonNodes;
 
@@ -634,7 +635,16 @@ public void validate(ExecutionContext executionContext, JsonNode jsonNode, JsonN
             if (executionContext.getErrors().size() > currentErrors) {
                 // Failed with assertion set result and drop all annotations from this schema
                 // and all subschemas
-                executionContext.getInstanceResults().setResult(instanceLocation, getSchemaLocation(), executionContext.getEvaluationPath(), false);
+                List<Annotation> annotations = executionContext.getAnnotations().asMap().get(instanceLocation);
+                if (annotations != null) {
+                    for (Annotation annotation : annotations) {
+                        if (annotation.getEvaluationPath().startsWith(executionContext.getEvaluationPath())) {
+                            annotation.setValid(false);
+                        }
+                    }
+                }
+                
+                //executionContext.getInstanceResults().setResult(instanceLocation, getSchemaLocation(), executionContext.getEvaluationPath(), false);
             }
         } finally {
             executionContext.evaluationSchema.removeLast();

src/main/java/com/networknt/schema/annotation/Annotation.java

@@ -30,6 +30,7 @@ public class Annotation {
     private final SchemaLocation schemaLocation;
     private final NodePath evaluationPath;
     private final Object value;
+    private boolean valid = true; // If not valid it means dropped
 
     public Annotation(String keyword, NodePath instanceLocation, SchemaLocation schemaLocation,
             NodePath evaluationPath, Object value) {
@@ -90,6 +91,14 @@ public <T> T getValue() {
         return (T) value;
     }
 
+    public boolean isValid() {
+        return valid;
+    }
+
+    public void setValid(boolean valid) {
+        this.valid = valid;
+    }
+
     @Override
     public String toString() {
         return "Annotation [evaluationPath=" + evaluationPath + ", schemaLocation=" + schemaLocation

src/main/java/com/networknt/schema/keyword/UnevaluatedItemsValidator.java

@@ -72,7 +72,8 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
         boolean evaluated = false;
 
         // Get all the valid adjacent annotations
-        Predicate<Annotation> validEvaluationPathFilter = a -> executionContext.getInstanceResults().isValid(instanceLocation, a.getEvaluationPath());
+        Predicate<Annotation> validEvaluationPathFilter = a -> a.isValid();
+        //Predicate<Annotation> validEvaluationPathFilter = a -> executionContext.getInstanceResults().isValid(instanceLocation, a.getEvaluationPath());
 
         Predicate<Annotation> adjacentEvaluationPathFilter = a -> a.getEvaluationPath()
                 .startsWith(executionContext.getEvaluationPath().getParent());

src/main/java/com/networknt/schema/keyword/UnevaluatedPropertiesValidator.java

@@ -56,7 +56,8 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
 
 
         // Get all the valid adjacent annotations
-        Predicate<Annotation> validEvaluationPathFilter = a -> executionContext.getInstanceResults().isValid(instanceLocation, a.getEvaluationPath());
+        Predicate<Annotation> validEvaluationPathFilter = a -> a.isValid();
+        //Predicate<Annotation> validEvaluationPathFilter = a -> executionContext.getInstanceResults().isValid(instanceLocation, a.getEvaluationPath());
 
         Predicate<Annotation> adjacentEvaluationPathFilter = a -> a.getEvaluationPath()
                 .startsWith(executionContext.getEvaluationPath().getParent());

src/main/java/com/networknt/schema/output/OutputUnitData.java

@@ -100,8 +100,9 @@ public static OutputUnitData from(List<Error> validationErrors, ExecutionContext
 
                     OutputUnitKey key = new OutputUnitKey(annotation.getEvaluationPath().getParent(),
                             annotationSchemaLocation, annotation.getInstanceLocation());
-                    boolean validResult = executionContext.getInstanceResults().isValid(annotation.getInstanceLocation(),
-                            annotation.getEvaluationPath());
+//                    boolean validResult = executionContext.getInstanceResults().isValid(annotation.getInstanceLocation(),
+//                            annotation.getEvaluationPath());
+                    boolean validResult = annotation.isValid();
                     valid.put(key, validResult);
                     if (validResult) {
                         // annotations