Optimise AdditionalPropertiesValidator

Author: justin-tay

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

@@ -74,7 +74,7 @@ public AdditionalPropertiesValidator(SchemaLocation schemaLocation, JsonNode sch
                 patternProperties.add(RegularExpression.compile(it.next(), schemaContext));
             }
         } else {
-            this.patternProperties = Collections.emptyList();
+            this.patternProperties = null;
         }
     }
 
@@ -91,29 +91,11 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
             return;
         }
 
-        Set<String> matchedInstancePropertyNames = null;
-        
-        boolean collectAnnotations = hasUnevaluatedPropertiesInEvaluationPath(executionContext)
-                || collectAnnotations(executionContext);
-        // if allowAdditionalProperties is true, add all the properties as evaluated.
-        if (allowAdditionalProperties && collectAnnotations) {
-            for (Iterator<String> it = node.fieldNames(); it.hasNext();) {
-                if (matchedInstancePropertyNames == null) {
-                    matchedInstancePropertyNames = new LinkedHashSet<>();
-                }
-                String fieldName = it.next();
-                matchedInstancePropertyNames.add(fieldName);
-            }
-        }
-
         for (Iterator<Entry<String, JsonNode>> it = node.fields(); it.hasNext(); ) {
             Entry<String, JsonNode> entry = it.next();
             String pname = entry.getKey();
-            // skip the context items
-            if (pname.startsWith("#")) {
-                continue;
-            }
-            if (!allowedProperties.contains(pname) && !handledByPatternProperties(pname)) {
+            if (!allowedProperties.contains(pname)
+                    && (this.patternProperties == null || !handledByPatternProperties(pname))) {
                 if (!allowAdditionalProperties) {
                     executionContext.addError(error().instanceNode(node).property(pname)
                             .instanceLocation(instanceLocation)
@@ -133,7 +115,20 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
                 }
             }
         }
+        boolean collectAnnotations = hasUnevaluatedPropertiesInEvaluationPath(executionContext)
+                || collectAnnotations(executionContext);
         if (collectAnnotations) {
+            Set<String> matchedInstancePropertyNames = null;
+            // if allowAdditionalProperties is true, add all the properties as evaluated.
+            if (allowAdditionalProperties) {
+                for (Iterator<String> it = node.fieldNames(); it.hasNext();) {
+                    if (matchedInstancePropertyNames == null) {
+                        matchedInstancePropertyNames = new LinkedHashSet<>();
+                    }
+                    String fieldName = it.next();
+                    matchedInstancePropertyNames.add(fieldName);
+                }
+            }
             executionContext.getAnnotations().put(Annotation.builder().instanceLocation(instanceLocation)
                     .evaluationPath(executionContext.getEvaluationPath()).schemaLocation(this.schemaLocation).keyword(getKeyword())
                     .value(matchedInstancePropertyNames != null ? matchedInstancePropertyNames : Collections.emptySet())
@@ -156,11 +151,8 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
         // Else continue walking.
         for (Iterator<String> it = node.fieldNames(); it.hasNext(); ) {
             String pname = it.next();
-            // skip the context items
-            if (pname.startsWith("#")) {
-                continue;
-            }
-            if (!allowedProperties.contains(pname) && !handledByPatternProperties(pname)) {
+            if (!allowedProperties.contains(pname)
+                    && (this.patternProperties == null || !handledByPatternProperties(pname))) {
                 if (allowAdditionalProperties) {
                     if (additionalPropertiesSchema != null) {
                         additionalPropertiesSchema.walk(executionContext, node.get(pname), rootNode,