Refactor evaluation context out from validator state

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

@@ -17,6 +17,8 @@
 
 import java.util.Objects;
 
+import com.networknt.schema.utils.Strings;
+
 /**
  * The absolute IRI is an IRI without the fragment.
  * <p>
@@ -131,7 +133,7 @@ public static String resolve(String parent, String iri) {
                 }
                 base = parent(base, scheme);
 
-                String[] iriParts = iri.split("/");
+                String[] iriParts = Strings.split(iri, '/');
                 for (int x = 0; x < iriParts.length; x++) {
                     if ("..".equals(iriParts[x])) {
                         base = parent(base, scheme);
@@ -149,9 +151,6 @@ public static String resolve(String parent, String iri) {
                         }
                     }
                 }
-                if (iri.endsWith("/")) {
-                    base = base + "/";
-                }
                 return base;
             }
         }

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

@@ -16,6 +16,7 @@
 
 package com.networknt.schema;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,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;
 
 /**
@@ -37,11 +38,40 @@ 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 Map<NodePath, DiscriminatorState> discriminatorMapping = new HashMap<>();
+    private final Map<NodePath, DiscriminatorState> discriminatorMapping = new HashMap<>();
 
+    NodePath evaluationPath;
+    final ArrayDeque<Schema> evaluationSchema = new ArrayDeque<>(64);
+    final ArrayDeque<Object> evaluationSchemaPath = new ArrayDeque<>(64);
+
+    public NodePath getEvaluationPath() {
+        return evaluationPath;
+    }
+
+    public void evaluationPathAddLast(String token) {
+        this.evaluationPath = evaluationPath.append(token);
+    }
+
+    public void evaluationPathAddLast(int token) {
+        this.evaluationPath = evaluationPath.append(token);
+    }
+
+    public void evaluationPathRemoveLast() {
+        this.evaluationPath = evaluationPath.getParent();
+    }
+
+
+    public ArrayDeque<Schema> getEvaluationSchema() {
+        return evaluationSchema;
+    }
+
+    public ArrayDeque<Object> getEvaluationSchemaPath() {
+        return evaluationSchemaPath;
+    }
+
     public Map<NodePath, DiscriminatorState> getDiscriminatorMapping() {
 		return discriminatorMapping;
 	}
@@ -156,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
@@ -224,4 +254,24 @@ public void walkConfig(Consumer<WalkConfig.Builder> customizer) {
     	customizer.accept(builder);
     	this.walkConfig = builder.build();
     }
+
+    boolean unevaluatedPropertiesPresent = false;
+
+    boolean unevaluatedItemsPresent = false;
+
+    public boolean isUnevaluatedPropertiesPresent() {
+        return this.unevaluatedPropertiesPresent;
+    }
+
+    public boolean isUnevaluatedItemsPresent() {
+        return this.unevaluatedItemsPresent;
+    }
+
+    public void setUnevaluatedPropertiesPresent(boolean set) {
+        this.unevaluatedPropertiesPresent = set;
+    }
+
+    public void setUnevaluatedItemsPresent(boolean set) {
+        this.unevaluatedItemsPresent = set;
+    }
 }