Rename SchemaResult to InstanceResult

Author: justin-tay

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

@@ -25,7 +25,7 @@
 import com.networknt.schema.annotation.Annotations;
 import com.networknt.schema.keyword.DiscriminatorState;
 import com.networknt.schema.path.NodePath;
-import com.networknt.schema.result.SchemaResults;
+import com.networknt.schema.result.InstanceResults;
 import com.networknt.schema.walk.WalkConfig;
 
 /**
@@ -37,7 +37,7 @@ public class ExecutionContext {
     private CollectorContext collectorContext = null;
 
     private Annotations annotations = null;
-    private SchemaResults results = null;
+    private InstanceResults instanceResults = null;
     private List<Error> errors = new ArrayList<>();
 
     private Map<NodePath, DiscriminatorState> discriminatorMapping = new HashMap<>();
@@ -156,11 +156,11 @@ public Annotations getAnnotations() {
         return annotations;
     }
 
-    public SchemaResults getResults() {
-        if (this.results == null) {
-            this.results = new SchemaResults();
+    public InstanceResults getInstanceResults() {
+        if (this.instanceResults == null) {
+            this.instanceResults = new InstanceResults();
         }
-        return results;
+        return instanceResults;
     }
 
     /**

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

@@ -703,7 +703,7 @@ 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.getResults().setResult(instanceLocation, getSchemaLocation(), getEvaluationPath(), false);
+            executionContext.getInstanceResults().setResult(instanceLocation, getSchemaLocation(), getEvaluationPath(), false);
         }
     }
 

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

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

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

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

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

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

src/main/java/com/networknt/schema/result/SchemaResult.java renamed to src/main/java/com/networknt/schema/result/InstanceResult.java

@@ -21,15 +21,15 @@
 import com.networknt.schema.path.NodePath;
 
 /**
- * Sub schema results.
+ * Instance results.
  */
-public class SchemaResult {
+public class InstanceResult {
     private final NodePath instanceLocation;
     private final SchemaLocation schemaLocation;
     private final NodePath evaluationPath;
     private final boolean valid;
 
-    public SchemaResult(NodePath instanceLocation, SchemaLocation schemaLocation, NodePath evaluationPath,
+    public InstanceResult(NodePath instanceLocation, SchemaLocation schemaLocation, NodePath evaluationPath,
             boolean valid) {
         super();
         this.instanceLocation = instanceLocation;
@@ -73,7 +73,7 @@ public boolean equals(Object obj) {
             return false;
         if (getClass() != obj.getClass())
             return false;
-        SchemaResult other = (SchemaResult) obj;
+        InstanceResult other = (InstanceResult) obj;
         return Objects.equals(evaluationPath, other.evaluationPath)
                 && Objects.equals(instanceLocation, other.instanceLocation)
                 && Objects.equals(schemaLocation, other.schemaLocation) && valid == other.valid;

src/main/java/com/networknt/schema/result/SchemaResults.java renamed to src/main/java/com/networknt/schema/result/InstanceResults.java

@@ -24,26 +24,26 @@
 import com.networknt.schema.path.NodePath;
 
 /**
- * Sub schema results.
+ * Instance results.
  */
-public class SchemaResults {
+public class InstanceResults {
 
     /**
      * Stores the invalid results.
      */
-    private final Map<NodePath, List<SchemaResult>> values = new HashMap<>();
+    private final Map<NodePath, List<InstanceResult>> values = new HashMap<>();
 
     public void setResult(NodePath instanceLocation, SchemaLocation schemaLocation, NodePath evaluationPath,
             boolean valid) {
-        SchemaResult result = new SchemaResult(instanceLocation, schemaLocation, evaluationPath, valid);
-        List<SchemaResult> v = values.computeIfAbsent(instanceLocation, k -> new ArrayList<>());
+        InstanceResult result = new InstanceResult(instanceLocation, schemaLocation, evaluationPath, valid);
+        List<InstanceResult> v = values.computeIfAbsent(instanceLocation, k -> new ArrayList<>());
         v.add(result);
     }
 
     public boolean isValid(NodePath instanceLocation, NodePath evaluationPath) {
-        List<SchemaResult> instance = values.get(instanceLocation);
+        List<InstanceResult> instance = values.get(instanceLocation);
         if (instance != null) {
-            for (SchemaResult result : instance) {
+            for (InstanceResult result : instance) {
                 if (evaluationPath.startsWith(result.getEvaluationPath())) {
                     if(!result.isValid()) {
                         return false;