Correcting the ref listeners config in WalkEvent class when fetching the getRefSchema

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

@@ -153,16 +153,16 @@ private void doWalk(HashSet<ValidationMessage> validationMessages, int i, JsonNo
     }
 
     private void walkSchema(JsonSchema walkSchema, JsonNode node, JsonNode rootNode, String at,
-            boolean shouldValidateSchema, Set<ValidationMessage> validationMessages) {
+                            boolean shouldValidateSchema, Set<ValidationMessage> validationMessages) {
         boolean executeWalk = arrayItemWalkListenerRunner.runPreWalkListeners(ValidatorTypeCode.ITEMS.getValue(), node,
                 rootNode, at, walkSchema.getSchemaPath(), walkSchema.getSchemaNode(), walkSchema.getParentSchema(),
-                validationContext.getJsonSchemaFactory());
+                validationContext, validationContext.getJsonSchemaFactory());
         if (executeWalk) {
             validationMessages.addAll(walkSchema.walk(node, rootNode, at, shouldValidateSchema));
         }
         arrayItemWalkListenerRunner.runPostWalkListeners(ValidatorTypeCode.ITEMS.getValue(), node, rootNode, at,
                 walkSchema.getSchemaPath(), walkSchema.getSchemaNode(), walkSchema.getParentSchema(),
-                validationContext.getJsonSchemaFactory(), validationMessages);
+                validationContext, validationContext.getJsonSchemaFactory(), validationMessages);
 
     }
 

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

@@ -80,7 +80,7 @@ public JsonSchema(ValidationContext validationContext, URI baseUri, JsonNode sch
     private JsonSchema(ValidationContext validationContext, String schemaPath, URI currentUri, JsonNode schemaNode,
                        JsonSchema parent, boolean suppressSubSchemaRetrieval) {
         super(schemaPath, schemaNode, parent, null, suppressSubSchemaRetrieval,
-              validationContext.getConfig() != null && validationContext.getConfig().isFailFast());
+                validationContext.getConfig() != null && validationContext.getConfig().isFailFast());
         this.validationContext = validationContext;
         this.idKeyword = validationContext.getMetaSchema().getIdKeyword();
         this.currentUri = this.combineCurrentUriWithIds(currentUri, schemaNode);
@@ -109,9 +109,9 @@ private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
                 return this.validationContext.getURIFactory().create(currentUri, id);
             } catch (IllegalArgumentException e) {
                 throw new JsonSchemaException(ValidationMessage.of(ValidatorTypeCode.ID.getValue(),
-                                                                   ValidatorTypeCode.ID,
-                                                                   id,
-                                                                   currentUri == null ? "null" : currentUri.toString()));
+                        ValidatorTypeCode.ID,
+                        id,
+                        currentUri == null ? "null" : currentUri.toString()));
             }
         }
     }
@@ -242,7 +242,7 @@ private Map<String, JsonValidator> read(JsonNode schemaNode) {
     private String getCustomMessage(JsonNode schemaNode, String pname) {
         final JsonSchema parentSchema = getParentSchema();
         final JsonNode message = getMessageNode(schemaNode, parentSchema);
-        if(message != null && message.get(pname) != null) {
+        if (message != null && message.get(pname) != null) {
             return message.get(pname).asText();
         }
         return null;
@@ -251,7 +251,7 @@ private String getCustomMessage(JsonNode schemaNode, String pname) {
     private JsonNode getMessageNode(JsonNode schemaNode, JsonSchema parentSchema) {
         JsonNode nodeContainingMessage;
         if (parentSchema == null)
-            nodeContainingMessage  = schemaNode;
+            nodeContainingMessage = schemaNode;
         else
             nodeContainingMessage = parentSchema.schemaNode;
         return nodeContainingMessage.get("message");
@@ -291,9 +291,9 @@ public Set<ValidationMessage> validate(JsonNode jsonNode, JsonNode rootNode, Str
                     final JsonNode discriminatorNode = jsonNode.get(discriminatorPropertyName);
                     final String discriminatorPropertyValue = discriminatorNode == null ? null : discriminatorNode.asText();
                     checkDiscriminatorMatch(discriminatorContext,
-                                            discriminatorToUse,
-                                            discriminatorPropertyValue,
-                                            this);
+                            discriminatorToUse,
+                            discriminatorPropertyValue,
+                            this);
                 }
             }
         }
@@ -316,12 +316,17 @@ public ValidationResult validateAndCollect(JsonNode node) {
      */
     protected ValidationResult validateAndCollect(JsonNode jsonNode, JsonNode rootNode, String at) {
         try {
+            // Get the config.
+            SchemaValidatorsConfig config = validationContext.getConfig();
             // Get the collector context from the thread local.
             CollectorContext collectorContext = getCollectorContext();
             // Valdiate.
             Set<ValidationMessage> errors = validate(jsonNode, rootNode, at);
-            // Load all the data from collectors into the context.
-            collectorContext.loadCollectors();
+            // When walk is called in series of nested call we don't want to load the collectors every time. Leave to the API to decide when to call collectors.
+            if (config.doLoadCollectors()) {
+                // Load all the data from collectors into the context.
+                collectorContext.loadCollectors();
+            }
             // Collect errors and collector context into validation result.
             ValidationResult validationResult = new ValidationResult(errors, collectorContext);
             return validationResult;
@@ -336,19 +341,25 @@ protected ValidationResult validateAndCollect(JsonNode jsonNode, JsonNode rootNo
 
     /**
      * Walk the JSON node
-     * @param node JsonNode
+     *
+     * @param node                 JsonNode
      * @param shouldValidateSchema indicator on validation
      * @return result of ValidationResult
      */
     public ValidationResult walk(JsonNode node, boolean shouldValidateSchema) {
+        // Get the config.
+        SchemaValidatorsConfig config = validationContext.getConfig();
         // Get the collector context from the thread local.
         CollectorContext collectorContext = getCollectorContext();
         // Set the walkEnabled flag in internal validator state.
         setValidatorState(true, shouldValidateSchema);
         // Walk through the schema.
         Set<ValidationMessage> errors = walk(node, node, AT_ROOT, shouldValidateSchema);
-        // Load all the data from collectors into the context.
-        collectorContext.loadCollectors();
+        // When walk is called in series of nested call we don't want to load the collectors every time. Leave to the API to decide when to call collectors.
+        if (config.doLoadCollectors()) {
+            // Load all the data from collectors into the context.
+            collectorContext.loadCollectors();
+        }
         // Collect errors and collector context into validation result.
         ValidationResult validationResult = new ValidationResult(errors, collectorContext);
         return validationResult;
@@ -366,26 +377,28 @@ public Set<ValidationMessage> walk(JsonNode node, JsonNode rootNode, String at,
                 // Call all the pre-walk listeners. If atleast one of the pre walk listeners
                 // returns SKIP, then skip the walk.
                 if (keywordWalkListenerRunner.runPreWalkListeners(schemaPathWithKeyword,
-                                                                  node,
-                                                                  rootNode,
-                                                                  at,
-                                                                  schemaPath,
-                                                                  schemaNode,
-                                                                  parentSchema,
-                                                                  validationContext.getJsonSchemaFactory())) {
+                        node,
+                        rootNode,
+                        at,
+                        schemaPath,
+                        schemaNode,
+                        parentSchema,
+                        validationContext,
+                        validationContext.getJsonSchemaFactory())) {
                     validationMessages.addAll(jsonWalker.walk(node, rootNode, at, shouldValidateSchema));
                 }
             } finally {
                 // Call all the post-walk listeners.
                 keywordWalkListenerRunner.runPostWalkListeners(schemaPathWithKeyword,
-                                                               node,
-                                                               rootNode,
-                                                               at,
-                                                               schemaPath,
-                                                               schemaNode,
-                                                               parentSchema,
-                                                               validationContext.getJsonSchemaFactory(),
-                                                               validationMessages);
+                        node,
+                        rootNode,
+                        at,
+                        schemaPath,
+                        schemaNode,
+                        parentSchema,
+                        validationContext,
+                        validationContext.getJsonSchemaFactory(),
+                        validationMessages);
             }
         }
         return validationMessages;

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

@@ -119,15 +119,15 @@ private void walkSchema(Map.Entry<String, JsonSchema> entry, JsonNode node, Json
         JsonNode propertyNode = (node == null ? null : node.get(entry.getKey()));
         boolean executeWalk = propertyWalkListenerRunner.runPreWalkListeners(ValidatorTypeCode.PROPERTIES.getValue(),
                 propertyNode, rootNode, at + "." + entry.getKey(), propertySchema.getSchemaPath(),
-                propertySchema.getSchemaNode(), propertySchema.getParentSchema(),
+                propertySchema.getSchemaNode(), propertySchema.getParentSchema(), validationContext,
                 validationContext.getJsonSchemaFactory());
         if (executeWalk) {
             validationMessages.addAll(
                     propertySchema.walk(propertyNode, rootNode, at + "." + entry.getKey(), shouldValidateSchema));
         }
         propertyWalkListenerRunner.runPostWalkListeners(ValidatorTypeCode.PROPERTIES.getValue(), propertyNode, rootNode,
                 at + "." + entry.getKey(), propertySchema.getSchemaPath(), propertySchema.getSchemaNode(),
-                propertySchema.getParentSchema(), validationContext.getJsonSchemaFactory(), validationMessages);
+                propertySchema.getParentSchema(), validationContext, validationContext.getJsonSchemaFactory(), validationMessages);
 
     }
 

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

@@ -87,6 +87,8 @@ public class SchemaValidatorsConfig {
 
     private CollectorContext collectorContext;
 
+    private boolean loadCollectors = true;
+
     public boolean isTypeLoose() {
         return typeLoose;
     }
@@ -257,4 +259,12 @@ public boolean isOpenAPI3StyleDiscriminators() {
     public void setOpenAPI3StyleDiscriminators(boolean openAPI3StyleDiscriminators) {
         this.openAPI3StyleDiscriminators = openAPI3StyleDiscriminators;
     }
+
+    public void setLoadCollectors(boolean loadCollectors) {
+        this.loadCollectors = loadCollectors;
+    }
+
+    public boolean doLoadCollectors() {
+        return loadCollectors;
+    }
 }

src/main/java/com/networknt/schema/walk/AbstractWalkListenerRunner.java

@@ -3,47 +3,48 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.ValidationContext;
 import com.networknt.schema.ValidationMessage;
 
 import java.util.List;
 import java.util.Set;
 
 public abstract class AbstractWalkListenerRunner implements WalkListenerRunner {
 
-	protected String getKeywordName(String keyWordPath) {
-		return keyWordPath.substring(keyWordPath.lastIndexOf('/') + 1);
-	}
+    protected String getKeywordName(String keyWordPath) {
+        return keyWordPath.substring(keyWordPath.lastIndexOf('/') + 1);
+    }
 
-	protected WalkEvent constructWalkEvent(String keyWordName, JsonNode node, JsonNode rootNode, String at,
-			String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
-			JsonSchemaFactory currentJsonSchemaFactory) {
-		return WalkEvent.builder().at(at).keyWordName(keyWordName).node(node).parentSchema(parentSchema)
-				.rootNode(rootNode).schemaNode(schemaNode).schemaPath(schemaPath)
-				.currentJsonSchemaFactory(currentJsonSchemaFactory).build();
-	}
+    protected WalkEvent constructWalkEvent(String keyWordName, JsonNode node, JsonNode rootNode, String at,
+                                           String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext,
+                                           JsonSchemaFactory currentJsonSchemaFactory) {
+        return WalkEvent.builder().at(at).keyWordName(keyWordName).node(node).parentSchema(parentSchema)
+                .rootNode(rootNode).schemaNode(schemaNode).schemaPath(schemaPath)
+                .currentJsonSchemaFactory(currentJsonSchemaFactory).validationContext(validationContext).build();
+    }
 
-	protected boolean runPreWalkListeners(List<JsonSchemaWalkListener> walkListeners, WalkEvent walkEvent) {
-		boolean continueToWalkMethod = true;
-		if (walkListeners != null) {
-			for (JsonSchemaWalkListener walkListener : walkListeners) {
-				WalkFlow walkFlow = walkListener.onWalkStart(walkEvent);
-				if (WalkFlow.SKIP.equals(walkFlow) || WalkFlow.ABORT.equals(walkFlow)) {
-					continueToWalkMethod = false;
-					if (WalkFlow.ABORT.equals(walkFlow)) {
-						break;
-					}
-				}
-			}
-		}
-		return continueToWalkMethod;
-	}
+    protected boolean runPreWalkListeners(List<JsonSchemaWalkListener> walkListeners, WalkEvent walkEvent) {
+        boolean continueToWalkMethod = true;
+        if (walkListeners != null) {
+            for (JsonSchemaWalkListener walkListener : walkListeners) {
+                WalkFlow walkFlow = walkListener.onWalkStart(walkEvent);
+                if (WalkFlow.SKIP.equals(walkFlow) || WalkFlow.ABORT.equals(walkFlow)) {
+                    continueToWalkMethod = false;
+                    if (WalkFlow.ABORT.equals(walkFlow)) {
+                        break;
+                    }
+                }
+            }
+        }
+        return continueToWalkMethod;
+    }
 
-	protected void runPostWalkListeners(List<JsonSchemaWalkListener> walkListeners, WalkEvent walkEvent,
-			Set<ValidationMessage> validationMessages) {
-		if (walkListeners != null) {
-			for (JsonSchemaWalkListener walkListener : walkListeners) {
-				walkListener.onWalkEnd(walkEvent, validationMessages);
-			}
-		}
-	}
+    protected void runPostWalkListeners(List<JsonSchemaWalkListener> walkListeners, WalkEvent walkEvent,
+                                        Set<ValidationMessage> validationMessages) {
+        if (walkListeners != null) {
+            for (JsonSchemaWalkListener walkListener : walkListeners) {
+                walkListener.onWalkEnd(walkEvent, validationMessages);
+            }
+        }
+    }
 }

src/main/java/com/networknt/schema/walk/DefaultItemWalkListenerRunner.java

@@ -3,35 +3,36 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.ValidationContext;
 import com.networknt.schema.ValidationMessage;
 
 import java.util.List;
 import java.util.Set;
 
 public class DefaultItemWalkListenerRunner extends AbstractWalkListenerRunner {
 
-	private List<JsonSchemaWalkListener> itemWalkListeners;
-
-	public DefaultItemWalkListenerRunner(List<JsonSchemaWalkListener> itemWalkListeners) {
-		this.itemWalkListeners = itemWalkListeners;
-	}
-
-	@Override
-	public boolean runPreWalkListeners(String keyWordPath, JsonNode node, JsonNode rootNode, String at,
-			String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
-			JsonSchemaFactory currentJsonSchemaFactory) {
-		WalkEvent walkEvent = constructWalkEvent(keyWordPath, node, rootNode, at, schemaPath, schemaNode, parentSchema,
-				currentJsonSchemaFactory);
-		return runPreWalkListeners(itemWalkListeners, walkEvent);
-	}
-
-	@Override
-	public void runPostWalkListeners(String keyWordPath, JsonNode node, JsonNode rootNode, String at, String schemaPath,
-			JsonNode schemaNode, JsonSchema parentSchema, JsonSchemaFactory currentJsonSchemaFactory,
-			Set<ValidationMessage> validationMessages) {
-		WalkEvent walkEvent = constructWalkEvent(keyWordPath, node, rootNode, at, schemaPath, schemaNode, parentSchema,
-				currentJsonSchemaFactory);
-		runPostWalkListeners(itemWalkListeners, walkEvent, validationMessages);
-	}
+    private List<JsonSchemaWalkListener> itemWalkListeners;
+
+    public DefaultItemWalkListenerRunner(List<JsonSchemaWalkListener> itemWalkListeners) {
+        this.itemWalkListeners = itemWalkListeners;
+    }
+
+    @Override
+    public boolean runPreWalkListeners(String keyWordPath, JsonNode node, JsonNode rootNode, String at,
+                                       String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext,
+                                       JsonSchemaFactory currentJsonSchemaFactory) {
+        WalkEvent walkEvent = constructWalkEvent(keyWordPath, node, rootNode, at, schemaPath, schemaNode, parentSchema, validationContext,
+                currentJsonSchemaFactory);
+        return runPreWalkListeners(itemWalkListeners, walkEvent);
+    }
+
+    @Override
+    public void runPostWalkListeners(String keyWordPath, JsonNode node, JsonNode rootNode, String at, String schemaPath,
+                                     JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext, JsonSchemaFactory currentJsonSchemaFactory,
+                                     Set<ValidationMessage> validationMessages) {
+        WalkEvent walkEvent = constructWalkEvent(keyWordPath, node, rootNode, at, schemaPath, schemaNode, parentSchema,
+                validationContext, currentJsonSchemaFactory);
+        runPostWalkListeners(itemWalkListeners, walkEvent, validationMessages);
+    }
 
 }