fix eval schema

Author: justin-tay

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

@@ -260,9 +260,7 @@ public void setUnevaluatedPropertiesPresent(boolean set) {
         this.unevaluatedPropertiesPresent = set;
     }
 
-    public boolean setUnevaluatedItemsPresent(boolean set) {
-        boolean existing = this.unevaluatedItemsPresent;
+    public void setUnevaluatedItemsPresent(boolean set) {
         this.unevaluatedItemsPresent = set;
-        return existing;
     }
 }

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

@@ -229,10 +229,10 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
      */
     protected boolean canShortCircuit(ExecutionContext executionContext) {
         if (hasUnevaluatedItemsInEvaluationPath(executionContext)) {
-            return true;
+            return false;
         }
         if (hasUnevaluatedPropertiesInEvaluationPath(executionContext)) {
-            return true;
+            return false;
         }
         return !executionContext.getExecutionConfig().isAnnotationCollectionEnabled();
     }

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

@@ -71,7 +71,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
             }
 
             // Add annotation
-            if (collectAnnotations() || collectAnnotations(executionContext)) {
+            if (hasUnevaluatedItemsInEvaluationPath(executionContext) || collectAnnotations(executionContext)) {
                 // Tuples
                 int items = node.isArray() ? node.size() : 1;
                 int schemas = this.tupleSchema.size();
@@ -113,7 +113,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
             }
 
             // Add annotation
-            if (collectAnnotations() || collectAnnotations(executionContext)) {
+            if (hasUnevaluatedItemsInEvaluationPath(executionContext) || collectAnnotations(executionContext)) {
                 // Tuples
                 int items = node.isArray() ? node.size() : 1;
                 int schemas = this.tupleSchema.size();
@@ -192,21 +192,9 @@ public List<Schema> getTupleSchema() {
         return this.tupleSchema;
     }
 
-    private boolean collectAnnotations() {
-        return hasUnevaluatedItemsValidator();
-    }
-
-    private boolean hasUnevaluatedItemsValidator() {
-        if (this.hasUnevaluatedItemsValidator == null) {
-            this.hasUnevaluatedItemsValidator = hasAdjacentKeywordInEvaluationPath("unevaluatedItems");
-        }
-        return hasUnevaluatedItemsValidator;
-    }
-
     @Override
     public void preloadSchema() {
         preloadSchemas(this.tupleSchema);
-        collectAnnotations(); // cache the flag
     }
 
 }

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

@@ -44,8 +44,6 @@ public class PropertiesValidator extends BaseKeywordValidator {
     public static final String PROPERTY = "properties";
     private final Map<String, Schema> schemas = new LinkedHashMap<>();
 
-    private Boolean hasUnevaluatedPropertiesValidator;
-
     public PropertiesValidator(SchemaLocation schemaLocation, NodePath evaluationPath, JsonNode schemaNode, Schema parentSchema, SchemaContext schemaContext) {
         super(KeywordType.PROPERTIES, schemaNode, schemaLocation, parentSchema, schemaContext, evaluationPath);
         for (Iterator<Entry<String, JsonNode>> it = schemaNode.fields(); it.hasNext();) {
@@ -70,7 +68,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
 //            throw new RuntimeException();
 //        }
         Set<String> matchedInstancePropertyNames = null;
-        boolean collectAnnotations = /*collectAnnotations() ||*/ collectAnnotations(executionContext);
+        boolean collectAnnotations =  hasUnevaluatedPropertiesInEvaluationPath(executionContext) || collectAnnotations(executionContext);
         for (Entry<String, Schema> entry : this.schemas.entrySet()) {
             JsonNode propertyNode = node.get(entry.getKey());
             if (propertyNode != null) {
@@ -142,17 +140,6 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
         }
     }
 
-//    private boolean collectAnnotations() {
-//        return hasUnevaluatedPropertiesValidator();
-//    }
-//
-//    private boolean hasUnevaluatedPropertiesValidator() {
-//        if (this.hasUnevaluatedPropertiesValidator == null) {
-//            this.hasUnevaluatedPropertiesValidator = hasAdjacentKeywordInEvaluationPath("unevaluatedProperties");
-//        }
-//        return hasUnevaluatedPropertiesValidator;
-//    }
-
     private void applyPropertyDefaults(ObjectNode node, ExecutionContext executionContext) {
         for (Map.Entry<String, Schema> entry : this.schemas.entrySet()) {
             JsonNode propertyNode = node.get(entry.getKey());
@@ -208,6 +195,5 @@ public Map<String, Schema> getSchemas() {
     @Override
     public void preloadSchema() {
         preloadSchemas(this.schemas.values());
-//        collectAnnotations(); // cache the flag
     }
 }