Changes for walk listener

Author: prashanth-chaitanya

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

@@ -34,12 +34,12 @@ public class ItemsValidator extends BaseJsonValidator implements JsonValidator {
     public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ITEMS, validationContext);
         if (schemaNode.isObject() || schemaNode.isBoolean()) {
-            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
+            schema = new JsonSchema(validationContext, schemaPath, parentSchema.getCurrentUri(), schemaNode, parentSchema)
                 .initialize();
         } else {
             tupleSchema = new ArrayList<JsonSchema>();
             for (JsonNode s : schemaNode) {
-                tupleSchema.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), s, parentSchema)
+                tupleSchema.add(new JsonSchema(validationContext, schemaPath, parentSchema.getCurrentUri(), s, parentSchema)
                     .initialize());
             }
 

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

@@ -26,7 +26,7 @@ protected boolean runPreWalkListeners(List<WalkListener> walkListeners, WalkEven
 		boolean continueRunningListenersAndWalk = true;
 		if (walkListeners != null) {
 			for (WalkListener walkListener : walkListeners) {
-				if (!walkListener.onWalkStart(walkEvent)) {
+				if (WalkMethodInvocation.SKIP_WALK.equals(walkListener.onWalkStart(walkEvent))) {
 					continueRunningListenersAndWalk = false;
 					break;
 				}

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

@@ -54,49 +54,49 @@ public JsonSchema getRefSchema(URI schemaUri) {
 		return currentJsonSchemaFactory.getSchema(schemaUri);
 	}
 
-	static class KeywordWalkEventBuilder {
+	static class WalkEventBuilder {
 		private WalkEvent keywordWalkEvent = null;
 
-		KeywordWalkEventBuilder() {
+		WalkEventBuilder() {
 			keywordWalkEvent = new WalkEvent();
 		}
 
-		public KeywordWalkEventBuilder schemaPath(String schemaPath) {
+		public WalkEventBuilder schemaPath(String schemaPath) {
 			keywordWalkEvent.schemaPath = schemaPath;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder schemaNode(JsonNode schemaNode) {
+		public WalkEventBuilder schemaNode(JsonNode schemaNode) {
 			keywordWalkEvent.schemaNode = schemaNode;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder parentSchema(JsonSchema parentSchema) {
+		public WalkEventBuilder parentSchema(JsonSchema parentSchema) {
 			keywordWalkEvent.parentSchema = parentSchema;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder keyWordName(String keyWordName) {
+		public WalkEventBuilder keyWordName(String keyWordName) {
 			keywordWalkEvent.keyWordName = keyWordName;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder node(JsonNode node) {
+		public WalkEventBuilder node(JsonNode node) {
 			keywordWalkEvent.node = node;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder rootNode(JsonNode rootNode) {
+		public WalkEventBuilder rootNode(JsonNode rootNode) {
 			keywordWalkEvent.rootNode = rootNode;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder at(String at) {
+		public WalkEventBuilder at(String at) {
 			keywordWalkEvent.at = at;
 			return this;
 		}
 
-		public KeywordWalkEventBuilder currentJsonSchemaFactory(JsonSchemaFactory currentJsonSchemaFactory) {
+		public WalkEventBuilder currentJsonSchemaFactory(JsonSchemaFactory currentJsonSchemaFactory) {
 			keywordWalkEvent.currentJsonSchemaFactory = currentJsonSchemaFactory;
 			return this;
 		}
@@ -107,8 +107,8 @@ public WalkEvent build() {
 
 	}
 
-	public static KeywordWalkEventBuilder builder() {
-		return new KeywordWalkEventBuilder();
+	public static WalkEventBuilder builder() {
+		return new WalkEventBuilder();
 	}
 
 }

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

@@ -11,7 +11,7 @@
  */
 public interface WalkListener {
 
-	public boolean onWalkStart(WalkEvent walkEvent);
+	public WalkMethodInvocation onWalkStart(WalkEvent walkEvent);
 
 	public void onWalkEnd(WalkEvent walkEvent, Set<ValidationMessage> validationMessages);
 }

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

@@ -0,0 +1,26 @@
+package com.networknt.schema.walk;
+
+public enum WalkMethodInvocation {
+
+    SKIP_WALK("SkipWalk", "Skip the walk methods"),
+
+    CONTINUE_TO_WALK("ContinueToWalk", "continue to invoke the walk method");
+
+    private String name;
+
+    private String description;
+
+    WalkMethodInvocation(String name, String description) {
+        this.name = name;
+        this.description = description;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+}