executionCustomizer) {
+ return walk(createExecutionContext(), deserialize(input, inputFormat), validate, executionCustomizer);
+ }
/**
* Walk at the node.
@@ -1529,7 +1569,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
try {
// Call all the pre-walk listeners. If at least one of the pre walk listeners
// returns SKIP, then skip the walk.
- if (executionContext.getWalkConfig().getKeywordWalkListenerRunner().runPreWalkListeners(executionContext,
+ if (executionContext.getWalkConfig().getKeywordWalkHandler().preWalk(executionContext,
validator.getKeyword(), node, rootNode, instanceLocation,
this, validator)) {
executionContext.evaluationPathAddLast(validator.getKeyword());
@@ -1543,7 +1583,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
}
} finally {
// Call all the post-walk listeners.
- executionContext.getWalkConfig().getKeywordWalkListenerRunner().runPostWalkListeners(executionContext,
+ executionContext.getWalkConfig().getKeywordWalkHandler().postWalk(executionContext,
validator.getKeyword(), node, rootNode, instanceLocation,
this, validator,
executionContext.getErrors().subList(currentErrors, executionContext.getErrors().size()));
diff --git a/src/main/java/com/networknt/schema/SchemaRegistry.java b/src/main/java/com/networknt/schema/SchemaRegistry.java
index 0b8af9432..8095d4176 100644
--- a/src/main/java/com/networknt/schema/SchemaRegistry.java
+++ b/src/main/java/com/networknt/schema/SchemaRegistry.java
@@ -36,7 +36,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -651,6 +650,69 @@ public Schema getSchema(final SchemaLocation schemaUri) {
return schema;
}
+ /**
+ * Gets the schema.
+ *
+ * @param schemaUri the base absolute IRI
+ * @param jsonNode the node
+ * @return the schema
+ */
+ public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
+ return newSchema(schemaUri, jsonNode);
+ }
+
+ /**
+ * Gets the schema.
+ *
+ * @param schemaUri the base absolute IRI
+ * @param schema the input schema data
+ * @param inputFormat input format
+ * @return the schema
+ */
+ public Schema getSchema(final SchemaLocation schemaUri, final String schema, InputFormat inputFormat) {
+ try {
+ final JsonNode schemaNode = readTree(schema, inputFormat);
+ return newSchema(schemaUri, schemaNode);
+ } catch (IOException ioe) {
+ logger.error("Failed to load json schema!", ioe);
+ throw new SchemaException(ioe);
+ }
+ }
+
+ /**
+ * Gets the schema.
+ *
+ * @param schemaUri the base absolute IRI
+ * @param schemaStream the input schema data
+ * @param inputFormat input format
+ * @return the schema
+ */
+ public Schema getSchema(final SchemaLocation schemaUri, final InputStream schemaStream, InputFormat inputFormat) {
+ try {
+ final JsonNode schemaNode = readTree(schemaStream, inputFormat);
+ return newSchema(schemaUri, schemaNode);
+ } catch (IOException ioe) {
+ logger.error("Failed to load json schema!", ioe);
+ throw new SchemaException(ioe);
+ }
+ }
+
+ /**
+ * Gets the schema.
+ *
+ * Using this is not recommended as there is potentially no base IRI for
+ * resolving references to the absolute IRI.
+ *
+ * Prefer {@link #getSchema(SchemaLocation, JsonNode)} instead to ensure the
+ * base IRI if no id is present.
+ *
+ * @param jsonNode the node
+ * @return the schema
+ */
+ public Schema getSchema(final JsonNode jsonNode) {
+ return newSchema(null, jsonNode);
+ }
+
/**
* Loads the schema.
*
@@ -720,56 +782,6 @@ protected Schema getMappedSchema(final SchemaLocation schemaUri) {
}
}
- /**
- * Gets the schema.
- *
- * @param schemaUri the absolute IRI of the schema which can map to the
- * retrieval IRI.
- * @return the schema
- */
- public Schema getSchema(final URI schemaUri) {
- return getSchema(SchemaLocation.of(schemaUri.toString()));
- }
-
- /**
- * Gets the schema.
- *
- * @param schemaUri the absolute IRI of the schema which can map to the
- * retrieval IRI.
- * @param jsonNode the node
- * @return the schema
- */
- public Schema getSchema(final URI schemaUri, final JsonNode jsonNode) {
- return newSchema(SchemaLocation.of(schemaUri.toString()), jsonNode);
- }
-
- /**
- * Gets the schema.
- *
- * @param schemaUri the base absolute IRI
- * @param jsonNode the node
- * @return the schema
- */
- public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
- return newSchema(schemaUri, jsonNode);
- }
-
- /**
- * Gets the schema.
- *
- * Using this is not recommended as there is potentially no base IRI for
- * resolving references to the absolute IRI.
- *
- * Prefer {@link #getSchema(SchemaLocation, JsonNode)} instead to ensure the
- * base IRI if no id is present.
- *
- * @param jsonNode the node
- * @return the schema
- */
- public Schema getSchema(final JsonNode jsonNode) {
- return newSchema(null, jsonNode);
- }
-
/**
* Gets the schema registry config.
*
diff --git a/src/main/java/com/networknt/schema/keyword/DependenciesValidator.java b/src/main/java/com/networknt/schema/keyword/DependenciesValidator.java
index af18b6293..1acad4aba 100644
--- a/src/main/java/com/networknt/schema/keyword/DependenciesValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/DependenciesValidator.java
@@ -24,6 +24,7 @@
import com.networknt.schema.SchemaContext;
import java.util.*;
+import java.util.Map.Entry;
/**
* {@link KeywordValidator} for dependencies.
@@ -44,9 +45,10 @@ public DependenciesValidator(SchemaLocation schemaLocation, JsonNode schemaNode,
super(KeywordType.DEPENDENCIES, schemaNode, schemaLocation, parentSchema, schemaContext);
- for (Iterator it = schemaNode.fieldNames(); it.hasNext(); ) {
- String pname = it.next();
- JsonNode pvalue = schemaNode.get(pname);
+ for (Iterator> it = schemaNode.fields(); it.hasNext(); ) {
+ Entry entry = it.next();
+ String pname = entry.getKey();
+ JsonNode pvalue = entry.getValue();
if (pvalue.isArray()) {
List depsProps = propertyDeps.get(pname);
if (depsProps == null) {
diff --git a/src/main/java/com/networknt/schema/keyword/ItemsLegacyValidator.java b/src/main/java/com/networknt/schema/keyword/ItemsLegacyValidator.java
index 85e5c7d7e..5c83a5658 100644
--- a/src/main/java/com/networknt/schema/keyword/ItemsLegacyValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/ItemsLegacyValidator.java
@@ -367,13 +367,13 @@ private void walkSchema(ExecutionContext executionContext, Schema walkSchema, Js
executionContext.evaluationPathAddLast(keyword);
}
try {
- boolean executeWalk = executionContext.getWalkConfig().getItemWalkListenerRunner()
- .runPreWalkListeners(executionContext, keyword, node, rootNode, instanceLocation, walkSchema, this);
+ boolean executeWalk = executionContext.getWalkConfig().getItemWalkHandler()
+ .preWalk(executionContext, keyword, node, rootNode, instanceLocation, walkSchema, this);
int currentErrors = executionContext.getErrors().size();
if (executeWalk) {
walkSchema.walk(executionContext, node, rootNode, instanceLocation, shouldValidateSchema);
}
- executionContext.getWalkConfig().getItemWalkListenerRunner().runPostWalkListeners(executionContext, keyword,
+ executionContext.getWalkConfig().getItemWalkHandler().postWalk(executionContext, keyword,
node, rootNode, instanceLocation, walkSchema, this,
executionContext.getErrors().subList(currentErrors, executionContext.getErrors().size()));
} finally {
diff --git a/src/main/java/com/networknt/schema/keyword/ItemsValidator.java b/src/main/java/com/networknt/schema/keyword/ItemsValidator.java
index 5877edaf3..5938a247c 100644
--- a/src/main/java/com/networknt/schema/keyword/ItemsValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/ItemsValidator.java
@@ -146,7 +146,7 @@ private static JsonNode getDefaultNode(Schema schema, ExecutionContext execution
private void walkSchema(ExecutionContext executionContext, Schema walkSchema, JsonNode node, JsonNode rootNode,
NodePath instanceLocation, boolean shouldValidateSchema) {
//@formatter:off
- boolean executeWalk = executionContext.getWalkConfig().getItemWalkListenerRunner().runPreWalkListeners(
+ boolean executeWalk = executionContext.getWalkConfig().getItemWalkHandler().preWalk(
executionContext,
KeywordType.ITEMS.getValue(),
node,
@@ -158,7 +158,7 @@ private void walkSchema(ExecutionContext executionContext, Schema walkSchema, Js
if (executeWalk) {
walkSchema.walk(executionContext, node, rootNode, instanceLocation, shouldValidateSchema);
}
- executionContext.getWalkConfig().getItemWalkListenerRunner().runPostWalkListeners(
+ executionContext.getWalkConfig().getItemWalkHandler().postWalk(
executionContext,
KeywordType.ITEMS.getValue(),
node,
diff --git a/src/main/java/com/networknt/schema/keyword/PatternPropertiesValidator.java b/src/main/java/com/networknt/schema/keyword/PatternPropertiesValidator.java
index 6b262ed79..6dc0355bc 100644
--- a/src/main/java/com/networknt/schema/keyword/PatternPropertiesValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/PatternPropertiesValidator.java
@@ -26,6 +26,7 @@
import com.networknt.schema.path.NodePath;
import com.networknt.schema.regex.RegularExpression;
import java.util.*;
+import java.util.Map.Entry;
/**
* {@link KeywordValidator} for patternProperties.
@@ -56,11 +57,12 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
return;
}
Set matchedInstancePropertyNames = null;
- Iterator names = node.fieldNames();
+ Iterator> fields = node.fields();
boolean collectAnnotations = hasUnevaluatedPropertiesInEvaluationPath(executionContext) || collectAnnotations(executionContext);
- while (names.hasNext()) {
- String name = names.next();
- JsonNode n = node.get(name);
+ while (fields.hasNext()) {
+ Entry field = fields.next();
+ String name = field.getKey();
+ JsonNode n = field.getValue();
for (Map.Entry entry : schemas.entrySet()) {
if (entry.getKey().matches(name)) {
NodePath path = instanceLocation.append(name);
diff --git a/src/main/java/com/networknt/schema/keyword/PrefixItemsValidator.java b/src/main/java/com/networknt/schema/keyword/PrefixItemsValidator.java
index a81f6c60d..0d443b3f4 100644
--- a/src/main/java/com/networknt/schema/keyword/PrefixItemsValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/PrefixItemsValidator.java
@@ -157,7 +157,7 @@ private void doWalk(ExecutionContext executionContext, int i,
private void walkSchema(ExecutionContext executionContext, int schemaIndex, Schema walkSchema, JsonNode node, JsonNode rootNode,
NodePath instanceLocation, boolean shouldValidateSchema) {
//@formatter:off
- boolean executeWalk = executionContext.getWalkConfig().getItemWalkListenerRunner().runPreWalkListeners(
+ boolean executeWalk = executionContext.getWalkConfig().getItemWalkHandler().preWalk(
executionContext,
KeywordType.PREFIX_ITEMS.getValue(),
node,
@@ -174,7 +174,7 @@ private void walkSchema(ExecutionContext executionContext, int schemaIndex, Sche
executionContext.evaluationPathRemoveLast();
}
}
- executionContext.getWalkConfig().getItemWalkListenerRunner().runPostWalkListeners(
+ executionContext.getWalkConfig().getItemWalkHandler().postWalk(
executionContext,
KeywordType.PREFIX_ITEMS.getValue(),
node,
diff --git a/src/main/java/com/networknt/schema/keyword/PropertiesValidator.java b/src/main/java/com/networknt/schema/keyword/PropertiesValidator.java
index 884e0e880..603ce880f 100644
--- a/src/main/java/com/networknt/schema/keyword/PropertiesValidator.java
+++ b/src/main/java/com/networknt/schema/keyword/PropertiesValidator.java
@@ -28,7 +28,7 @@
import com.networknt.schema.annotation.Annotation;
import com.networknt.schema.path.NodePath;
import com.networknt.schema.utils.SchemaRefs;
-import com.networknt.schema.walk.WalkListenerRunner;
+import com.networknt.schema.walk.WalkHandler;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -81,7 +81,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
entry.getValue().validate(executionContext, propertyNode, rootNode, path);
} else {
// check if walker is enabled. If it is enabled it is upto the walker implementation to decide about the validation.
- walkSchema(executionContext, entry, node, rootNode, instanceLocation, true, executionContext.getWalkConfig().getPropertyWalkListenerRunner());
+ walkSchema(executionContext, entry, node, rootNode, instanceLocation, true, executionContext.getWalkConfig().getPropertyWalkHandler());
}
} finally {
executionContext.evaluationPathRemoveLast();
@@ -96,7 +96,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
executionContext.evaluationPathAddLast(entry.getKey());
try {
walkSchema(executionContext, entry, node, rootNode, instanceLocation, true,
- executionContext.getWalkConfig().getPropertyWalkListenerRunner());
+ executionContext.getWalkConfig().getPropertyWalkHandler());
} finally {
executionContext.evaluationPathRemoveLast();
}
@@ -123,11 +123,11 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
validate(executionContext, node == null ? MissingNode.getInstance() : node, rootNode,
instanceLocation, true);
} else {
- WalkListenerRunner propertyWalkListenerRunner = executionContext.getWalkConfig().getPropertyWalkListenerRunner();
+ WalkHandler propertyWalkHandler = executionContext.getWalkConfig().getPropertyWalkHandler();
for (Map.Entry entry : this.schemas.entrySet()) {
executionContext.evaluationPathAddLast(entry.getKey());
try {
- walkSchema(executionContext, entry, node, rootNode, instanceLocation, shouldValidateSchema, propertyWalkListenerRunner);
+ walkSchema(executionContext, entry, node, rootNode, instanceLocation, shouldValidateSchema, propertyWalkHandler);
} finally {
executionContext.evaluationPathRemoveLast();
}
@@ -163,11 +163,11 @@ private static JsonNode getDefaultNode(Schema schema, ExecutionContext execution
}
private void walkSchema(ExecutionContext executionContext, Map.Entry entry, JsonNode node,
- JsonNode rootNode, NodePath instanceLocation, boolean shouldValidateSchema, WalkListenerRunner propertyWalkListenerRunner) {
+ JsonNode rootNode, NodePath instanceLocation, boolean shouldValidateSchema, WalkHandler propertyWalkHandler) {
Schema propertySchema = entry.getValue();
JsonNode propertyNode = (node == null ? null : node.get(entry.getKey()));
NodePath path = instanceLocation.append(entry.getKey());
- boolean executeWalk = propertyWalkListenerRunner.runPreWalkListeners(executionContext,
+ boolean executeWalk = propertyWalkHandler.preWalk(executionContext,
KeywordType.PROPERTIES.getValue(), propertyNode, rootNode, path,
propertySchema, this);
if (propertyNode == null && node != null) {
@@ -178,7 +178,7 @@ private void walkSchema(ExecutionContext executionContext, Map.Entry itemWalkListeners;
- public ItemWalkListenerRunner(List itemWalkListeners) {
+ public ItemWalkHandler(List itemWalkListeners) {
this.itemWalkListeners = itemWalkListeners;
}
@Override
- public boolean runPreWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public boolean preWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator) {
WalkEvent walkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode, instanceLocation,
schema, validator);
@@ -47,7 +47,7 @@ public boolean runPreWalkListeners(ExecutionContext executionContext, String key
}
@Override
- public void runPostWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public void postWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator, List errors) {
WalkEvent walkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode, instanceLocation,
schema, validator);
@@ -71,8 +71,8 @@ public Builder itemWalkListeners(Consumer> itemWalkListeners)
return this;
}
- public ItemWalkListenerRunner build() {
- return new ItemWalkListenerRunner(itemWalkListeners);
+ public ItemWalkHandler build() {
+ return new ItemWalkHandler(itemWalkListeners);
}
}
diff --git a/src/main/java/com/networknt/schema/walk/KeywordWalkListenerRunner.java b/src/main/java/com/networknt/schema/walk/KeywordWalkHandler.java
similarity index 87%
rename from src/main/java/com/networknt/schema/walk/KeywordWalkListenerRunner.java
rename to src/main/java/com/networknt/schema/walk/KeywordWalkHandler.java
index 9a22e2340..ac0af1897 100644
--- a/src/main/java/com/networknt/schema/walk/KeywordWalkListenerRunner.java
+++ b/src/main/java/com/networknt/schema/walk/KeywordWalkHandler.java
@@ -31,20 +31,20 @@
import com.networknt.schema.path.NodePath;
/**
- * A {@link WalkListenerRunner} for walking keywords.
+ * A {@link WalkHandler} for walking keywords.
*/
-public class KeywordWalkListenerRunner extends AbstractWalkListenerRunner {
+public class KeywordWalkHandler extends AbstractWalkHandler {
private final List allKeywordWalkListeners;
private final Map> keywordWalkListenersMap;
- public KeywordWalkListenerRunner(List allKeywordWalkListeners,
+ public KeywordWalkHandler(List allKeywordWalkListeners,
Map> keywordWalkListenersMap) {
this.allKeywordWalkListeners = allKeywordWalkListeners;
this.keywordWalkListenersMap = keywordWalkListenersMap;
}
@Override
- public boolean runPreWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public boolean preWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator) {
boolean continueRunningListenersAndWalk = true;
WalkEvent keywordWalkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode,
@@ -60,7 +60,7 @@ public boolean runPreWalkListeners(ExecutionContext executionContext, String key
}
@Override
- public void runPostWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public void postWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator,
List errors) {
WalkEvent keywordWalkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode,
@@ -99,8 +99,8 @@ public Builder keywordWalkListeners(Consumer>> ke
return this;
}
- public KeywordWalkListenerRunner build() {
- return new KeywordWalkListenerRunner(allKeywordWalkListeners, keywordWalkListeners);
+ public KeywordWalkHandler build() {
+ return new KeywordWalkHandler(allKeywordWalkListeners, keywordWalkListeners);
}
}
}
diff --git a/src/main/java/com/networknt/schema/walk/PropertyWalkListenerRunner.java b/src/main/java/com/networknt/schema/walk/PropertyWalkHandler.java
similarity index 81%
rename from src/main/java/com/networknt/schema/walk/PropertyWalkListenerRunner.java
rename to src/main/java/com/networknt/schema/walk/PropertyWalkHandler.java
index d10fb10bb..889ddd493 100644
--- a/src/main/java/com/networknt/schema/walk/PropertyWalkListenerRunner.java
+++ b/src/main/java/com/networknt/schema/walk/PropertyWalkHandler.java
@@ -28,18 +28,18 @@
import java.util.function.Consumer;
/**
- * A {@link WalkListenerRunner} for walking properties.
+ * A {@link WalkHandler} for walking properties.
*/
-public class PropertyWalkListenerRunner extends AbstractWalkListenerRunner {
+public class PropertyWalkHandler extends AbstractWalkHandler {
private final List propertyWalkListeners;
- public PropertyWalkListenerRunner(List propertyWalkListeners) {
+ public PropertyWalkHandler(List propertyWalkListeners) {
this.propertyWalkListeners = propertyWalkListeners;
}
@Override
- public boolean runPreWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public boolean preWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator) {
WalkEvent walkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode, instanceLocation,
schema, validator);
@@ -47,7 +47,7 @@ public boolean runPreWalkListeners(ExecutionContext executionContext, String key
}
@Override
- public void runPostWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public void postWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator,
List errors) {
WalkEvent walkEvent = constructWalkEvent(executionContext, keyword, instanceNode, rootNode, instanceLocation,
@@ -72,8 +72,8 @@ public Builder propertyWalkListeners(Consumer> propertyWalkLi
return this;
}
- public PropertyWalkListenerRunner build() {
- return new PropertyWalkListenerRunner(propertyWalkListeners);
+ public PropertyWalkHandler build() {
+ return new PropertyWalkHandler(propertyWalkListeners);
}
}
}
diff --git a/src/main/java/com/networknt/schema/walk/WalkConfig.java b/src/main/java/com/networknt/schema/walk/WalkConfig.java
index d008abad9..813ac0b9b 100644
--- a/src/main/java/com/networknt/schema/walk/WalkConfig.java
+++ b/src/main/java/com/networknt/schema/walk/WalkConfig.java
@@ -17,6 +17,7 @@
package com.networknt.schema.walk;
import java.util.List;
+import java.util.function.Consumer;
import com.fasterxml.jackson.databind.JsonNode;
import com.networknt.schema.Error;
@@ -38,27 +39,27 @@ public static WalkConfig getInstance() {
}
/**
- * {@link WalkListenerRunner} that performs no operations but indicates that it
+ * {@link WalkHandler} that performs no operations but indicates that it
* should walk.
*/
- public static class NoOpWalkListenerRunner implements WalkListenerRunner {
+ public static class NoOpWalkHandler implements WalkHandler {
private static class Holder {
- private static final NoOpWalkListenerRunner INSTANCE = new NoOpWalkListenerRunner();
+ private static final NoOpWalkHandler INSTANCE = new NoOpWalkHandler();
}
- public static NoOpWalkListenerRunner getInstance() {
+ public static NoOpWalkHandler getInstance() {
return Holder.INSTANCE;
}
@Override
- public boolean runPreWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public boolean preWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator) {
// Always walk
return true;
}
@Override
- public void runPostWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
+ public void postWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator,
List errors) {
}
@@ -70,19 +71,19 @@ public void runPostWalkListeners(ExecutionContext executionContext, String keywo
*/
private final ApplyDefaultsStrategy applyDefaultsStrategy;
- private final WalkListenerRunner itemWalkListenerRunner;
+ private final WalkHandler itemWalkHandler;
- private final WalkListenerRunner keywordWalkListenerRunner;
+ private final WalkHandler keywordWalkHandler;
- private final WalkListenerRunner propertyWalkListenerRunner;
+ private final WalkHandler propertyWalkHandler;
- WalkConfig(ApplyDefaultsStrategy applyDefaultsStrategy, WalkListenerRunner itemWalkListenerRunner,
- WalkListenerRunner keywordWalkListenerRunner, WalkListenerRunner propertyWalkListenerRunner) {
+ WalkConfig(ApplyDefaultsStrategy applyDefaultsStrategy, WalkHandler itemWalkHandler,
+ WalkHandler keywordWalkHandler, WalkHandler propertyWalkHandler) {
super();
this.applyDefaultsStrategy = applyDefaultsStrategy;
- this.itemWalkListenerRunner = itemWalkListenerRunner;
- this.keywordWalkListenerRunner = keywordWalkListenerRunner;
- this.propertyWalkListenerRunner = propertyWalkListenerRunner;
+ this.itemWalkHandler = itemWalkHandler;
+ this.keywordWalkHandler = keywordWalkHandler;
+ this.propertyWalkHandler = propertyWalkHandler;
}
/**
@@ -95,31 +96,31 @@ public ApplyDefaultsStrategy getApplyDefaultsStrategy() {
}
/**
- * Gets the property walk listener runner.
+ * Gets the property walk handler.
*
- * @return the property walk listener runner
+ * @return the property walk handler
*/
- public WalkListenerRunner getPropertyWalkListenerRunner() {
- return this.propertyWalkListenerRunner;
+ public WalkHandler getPropertyWalkHandler() {
+ return this.propertyWalkHandler;
}
/**
- * Gets the item walk listener runner.
+ * Gets the item walk handler.
*
- * @return the item walk listener runner
+ * @return the item walk handler
*/
- public WalkListenerRunner getItemWalkListenerRunner() {
- return this.itemWalkListenerRunner;
+ public WalkHandler getItemWalkHandler() {
+ return this.itemWalkHandler;
}
/**
- * Gets the keyword walk listener runner.
+ * Gets the keyword walk handler.
*
- * @return the keyword walk listener runner
+ * @return the keyword walk handler
*/
- public WalkListenerRunner getKeywordWalkListenerRunner() {
- return this.keywordWalkListenerRunner;
+ public WalkHandler getKeywordWalkHandler() {
+ return this.keywordWalkHandler;
}
/**
@@ -140,9 +141,9 @@ public static Builder builder() {
public static Builder builder(WalkConfig config) {
Builder builder = new Builder();
builder.applyDefaultsStrategy = config.applyDefaultsStrategy;
- builder.itemWalkListenerRunner = config.itemWalkListenerRunner;
- builder.keywordWalkListenerRunner = config.keywordWalkListenerRunner;
- builder.propertyWalkListenerRunner = config.propertyWalkListenerRunner;
+ builder.itemWalkHandler = config.itemWalkHandler;
+ builder.keywordWalkHandler = config.keywordWalkHandler;
+ builder.propertyWalkHandler = config.propertyWalkHandler;
return builder;
}
@@ -151,9 +152,9 @@ public static Builder builder(WalkConfig config) {
*/
public static class Builder {
private ApplyDefaultsStrategy applyDefaultsStrategy = null;
- private WalkListenerRunner itemWalkListenerRunner = null;
- private WalkListenerRunner keywordWalkListenerRunner = null;
- private WalkListenerRunner propertyWalkListenerRunner = null;
+ private WalkHandler itemWalkHandler = null;
+ private WalkHandler keywordWalkHandler = null;
+ private WalkHandler propertyWalkHandler = null;
/**
* Sets the strategy the walker uses to sets nodes to the default value.
@@ -168,18 +169,24 @@ public Builder applyDefaultsStrategy(ApplyDefaultsStrategy applyDefaultsStrategy
return this;
}
- public Builder itemWalkListenerRunner(WalkListenerRunner itemWalkListenerRunner) {
- this.itemWalkListenerRunner = itemWalkListenerRunner;
+ public Builder applyDefaultsStrategy(Consumer customizer) {
+ ApplyDefaultsStrategy.Builder builder = ApplyDefaultsStrategy.builder(applyDefaultsStrategy);
+ customizer.accept(builder);
+ return applyDefaultsStrategy(builder.build());
+ }
+
+ public Builder itemWalkHandler(WalkHandler itemWalkHandler) {
+ this.itemWalkHandler = itemWalkHandler;
return this;
}
- public Builder keywordWalkListenerRunner(WalkListenerRunner keywordWalkListenerRunner) {
- this.keywordWalkListenerRunner = keywordWalkListenerRunner;
+ public Builder keywordWalkHandler(WalkHandler keywordWalkHandler) {
+ this.keywordWalkHandler = keywordWalkHandler;
return this;
}
- public Builder propertyWalkListenerRunner(WalkListenerRunner propertyWalkListenerRunner) {
- this.propertyWalkListenerRunner = propertyWalkListenerRunner;
+ public Builder propertyWalkHandler(WalkHandler propertyWalkHandler) {
+ this.propertyWalkHandler = propertyWalkHandler;
return this;
}
@@ -187,11 +194,11 @@ public WalkConfig build() {
return new WalkConfig(
applyDefaultsStrategy != null ? applyDefaultsStrategy
: ApplyDefaultsStrategy.EMPTY_APPLY_DEFAULTS_STRATEGY,
- itemWalkListenerRunner != null ? itemWalkListenerRunner : NoOpWalkListenerRunner.getInstance(),
- keywordWalkListenerRunner != null ? keywordWalkListenerRunner
- : NoOpWalkListenerRunner.getInstance(),
- propertyWalkListenerRunner != null ? propertyWalkListenerRunner
- : NoOpWalkListenerRunner.getInstance());
+ itemWalkHandler != null ? itemWalkHandler : NoOpWalkHandler.getInstance(),
+ keywordWalkHandler != null ? keywordWalkHandler
+ : NoOpWalkHandler.getInstance(),
+ propertyWalkHandler != null ? propertyWalkHandler
+ : NoOpWalkHandler.getInstance());
}
}
}
diff --git a/src/main/java/com/networknt/schema/walk/WalkEvent.java b/src/main/java/com/networknt/schema/walk/WalkEvent.java
index cdce63b28..6f5a5b38f 100644
--- a/src/main/java/com/networknt/schema/walk/WalkEvent.java
+++ b/src/main/java/com/networknt/schema/walk/WalkEvent.java
@@ -99,7 +99,7 @@ public T getValidator() {
@Override
public String toString() {
return "WalkEvent [schemaLocation="
- + getSchema().getSchemaLocation() + ", instanceLocation=" + instanceLocation + "]";
+ + getSchema().getSchemaLocation() + ", instanceLocation=" + instanceLocation + ", evaluationPath=" + evaluationPath + "]";
}
static class WalkEventBuilder {
diff --git a/src/main/java/com/networknt/schema/walk/WalkHandler.java b/src/main/java/com/networknt/schema/walk/WalkHandler.java
new file mode 100644
index 000000000..67ee2525e
--- /dev/null
+++ b/src/main/java/com/networknt/schema/walk/WalkHandler.java
@@ -0,0 +1,23 @@
+package com.networknt.schema.walk;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.networknt.schema.ExecutionContext;
+import com.networknt.schema.Schema;
+import com.networknt.schema.keyword.KeywordValidator;
+import com.networknt.schema.path.NodePath;
+import com.networknt.schema.Error;
+
+import java.util.List;
+
+/**
+ * Walk handler that is called before and after visiting.
+ */
+public interface WalkHandler {
+
+ boolean preWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode, JsonNode rootNode,
+ NodePath instanceLocation, Schema schema, KeywordValidator validator);
+
+ void postWalk(ExecutionContext executionContext, String keyword, JsonNode instanceNode, JsonNode rootNode,
+ NodePath instanceLocation, Schema schema, KeywordValidator validator, List errors);
+
+}
diff --git a/src/main/java/com/networknt/schema/walk/WalkListenerRunner.java b/src/main/java/com/networknt/schema/walk/WalkListenerRunner.java
deleted file mode 100644
index 66f2a6ad3..000000000
--- a/src/main/java/com/networknt/schema/walk/WalkListenerRunner.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.networknt.schema.walk;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Schema;
-import com.networknt.schema.keyword.KeywordValidator;
-import com.networknt.schema.path.NodePath;
-import com.networknt.schema.Error;
-
-import java.util.List;
-
-public interface WalkListenerRunner {
-
- boolean runPreWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
- JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator);
-
- void runPostWalkListeners(ExecutionContext executionContext, String keyword, JsonNode instanceNode,
- JsonNode rootNode, NodePath instanceLocation, Schema schema, KeywordValidator validator, List errors);
-
-}
diff --git a/src/test/java/com/networknt/schema/IfValidatorTest.java b/src/test/java/com/networknt/schema/IfValidatorTest.java
index c36b231d5..9f761e735 100644
--- a/src/test/java/com/networknt/schema/IfValidatorTest.java
+++ b/src/test/java/com/networknt/schema/IfValidatorTest.java
@@ -27,7 +27,7 @@
import com.networknt.schema.keyword.KeywordType;
import com.networknt.schema.path.NodePath;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -50,7 +50,7 @@ void walkValidateThen() {
+ " \"type\": \"number\"\r\n"
+ " }\r\n"
+ "}";
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.TYPE.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -69,7 +69,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
@@ -95,7 +95,7 @@ void walkValidateElse() {
+ " \"type\": \"number\"\r\n"
+ " }\r\n"
+ "}";
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.TYPE.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -114,7 +114,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
@@ -141,7 +141,7 @@ void walkValidateNull() {
+ " \"type\": \"number\"\r\n"
+ " }\r\n"
+ "}";
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.TYPE.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -160,7 +160,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
@@ -185,7 +185,7 @@ void walkNoValidate() {
+ " \"type\": \"number\"\r\n"
+ " }\r\n"
+ "}";
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.TYPE.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -204,7 +204,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
diff --git a/src/test/java/com/networknt/schema/Issue451Test.java b/src/test/java/com/networknt/schema/Issue451Test.java
index 229bfc478..ee4e093c1 100644
--- a/src/test/java/com/networknt/schema/Issue451Test.java
+++ b/src/test/java/com/networknt/schema/Issue451Test.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.PropertyWalkListenerRunner;
+import com.networknt.schema.walk.PropertyWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -58,8 +58,8 @@ private void walk(JsonNode data, boolean shouldValidate) {
InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
Schema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
- WalkConfig walkConfig = WalkConfig.builder().propertyWalkListenerRunner(
- PropertyWalkListenerRunner.builder().propertyWalkListener(new CountingWalker()).build()).build();
+ WalkConfig walkConfig = WalkConfig.builder().propertyWalkHandler(
+ PropertyWalkHandler.builder().propertyWalkListener(new CountingWalker()).build()).build();
CollectorContext collectorContext = schema.walk(data, shouldValidate, executionContext -> executionContext.setWalkConfig(walkConfig)).getCollectorContext();
Map collector = (Map) collectorContext.get(COLLECTOR_ID);
diff --git a/src/test/java/com/networknt/schema/Issue461Test.java b/src/test/java/com/networknt/schema/Issue461Test.java
index 72cbee461..7c28a00ad 100644
--- a/src/test/java/com/networknt/schema/Issue461Test.java
+++ b/src/test/java/com/networknt/schema/Issue461Test.java
@@ -5,7 +5,7 @@
import com.networknt.schema.keyword.KeywordType;
import com.networknt.schema.serialization.JsonMapperFactory;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -25,11 +25,11 @@ protected Schema getJsonSchemaFromStreamContentV7(SchemaLocation schemaUri) {
@Test
void shouldWalkWithValidation() throws IOException {
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.PROPERTIES.getValue(), new Walker())
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
Schema schema = getJsonSchemaFromStreamContentV7(SchemaLocation.of("resource:/draft-07/schema#"));
diff --git a/src/test/java/com/networknt/schema/Issue467Test.java b/src/test/java/com/networknt/schema/Issue467Test.java
index 59259cda0..df9b6dc39 100644
--- a/src/test/java/com/networknt/schema/Issue467Test.java
+++ b/src/test/java/com/networknt/schema/Issue467Test.java
@@ -34,8 +34,8 @@
import com.networknt.schema.keyword.KeywordType;
import com.networknt.schema.path.NodePath;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
-import com.networknt.schema.walk.PropertyWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
+import com.networknt.schema.walk.PropertyWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -49,7 +49,7 @@ class Issue467Test {
void shouldWalkKeywordWithValidation() throws URISyntaxException, IOException {
InputStream schemaInputStream = Issue467Test.class.getResourceAsStream(schemaPath);
final Set properties = new LinkedHashSet<>();
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.PROPERTIES.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -63,7 +63,7 @@ public void onWalkEnd(WalkEvent walkEvent, List set) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7);
Schema schema = factory.getSchema(schemaInputStream);
@@ -78,7 +78,7 @@ public void onWalkEnd(WalkEvent walkEvent, List set) {
void shouldWalkPropertiesWithValidation() throws URISyntaxException, IOException {
InputStream schemaInputStream = Issue467Test.class.getResourceAsStream(schemaPath);
final Set properties = new LinkedHashSet<>();
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -92,7 +92,7 @@ public void onWalkEnd(WalkEvent walkEvent, List set) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7);
Schema schema = factory.getSchema(schemaInputStream);
diff --git a/src/test/java/com/networknt/schema/Issue724Test.java b/src/test/java/com/networknt/schema/Issue724Test.java
index 13486210a..26bc62504 100644
--- a/src/test/java/com/networknt/schema/Issue724Test.java
+++ b/src/test/java/com/networknt/schema/Issue724Test.java
@@ -13,7 +13,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -23,7 +23,7 @@ class Issue724Test {
@Test
void test() throws JsonProcessingException {
StringCollector stringCollector = new StringCollector();
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder().keywordWalkListener(stringCollector).build();
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder().keywordWalkListener(stringCollector).build();
String schema =
"{\n"
@@ -51,7 +51,7 @@ void test() throws JsonProcessingException {
+ " \"billing_address\" : \"my_billing_address\"\n"
+ "}\n";
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
Schema jsonSchema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schema);
jsonSchema.walk(new ObjectMapper().readTree(data), /* shouldValidateSchema= */ false, executionContext -> executionContext.setWalkConfig(walkConfig));
diff --git a/src/test/java/com/networknt/schema/ItemsLegacyValidatorTest.java b/src/test/java/com/networknt/schema/ItemsLegacyValidatorTest.java
index 4c90f6ddb..10af40ea9 100644
--- a/src/test/java/com/networknt/schema/ItemsLegacyValidatorTest.java
+++ b/src/test/java/com/networknt/schema/ItemsLegacyValidatorTest.java
@@ -30,7 +30,7 @@
import com.networknt.schema.path.NodePath;
import com.networknt.schema.serialization.JsonMapperFactory;
import com.networknt.schema.walk.ApplyDefaultsStrategy;
-import com.networknt.schema.walk.ItemWalkListenerRunner;
+import com.networknt.schema.walk.ItemWalkHandler;
import com.networknt.schema.walk.WalkListener;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
@@ -124,7 +124,7 @@ void walk() {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -141,7 +141,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner).build();
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09);
Schema schema = factory.getSchema(schemaData);
Result result = schema.walk("[\"the\",\"quick\",\"brown\"]", InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -162,7 +162,7 @@ void walkNull() {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -179,7 +179,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner).build();
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09);
Schema schema = factory.getSchema(schemaData);
Result result = schema.walk(null, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -206,7 +206,7 @@ void walkNullTupleItemsAdditional() {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -223,7 +223,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner).build();
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09);
Schema schema = factory.getSchema(schemaData);
Result result = schema.walk(null, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -258,7 +258,7 @@ void walkTupleItemsAdditional() throws JsonProcessingException {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -275,7 +275,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner)
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09);
Schema schema = factory.getSchema(schemaData);
@@ -316,7 +316,7 @@ void walkTupleItemsAdditionalDefaults() throws JsonProcessingException {
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -331,7 +331,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner)
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler)
.applyDefaultsStrategy(new ApplyDefaultsStrategy(true, true, true)).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09);
Schema schema = factory.getSchema(schemaData);
diff --git a/src/test/java/com/networknt/schema/ItemsValidatorTest.java b/src/test/java/com/networknt/schema/ItemsValidatorTest.java
index 75d1bed58..c241895fb 100644
--- a/src/test/java/com/networknt/schema/ItemsValidatorTest.java
+++ b/src/test/java/com/networknt/schema/ItemsValidatorTest.java
@@ -26,7 +26,7 @@
import org.junit.jupiter.api.Test;
import com.networknt.schema.path.NodePath;
-import com.networknt.schema.walk.ItemWalkListenerRunner;
+import com.networknt.schema.walk.ItemWalkHandler;
import com.networknt.schema.walk.WalkListener;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
@@ -68,7 +68,7 @@ void walkNull() {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(new WalkListener() {
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
return WalkFlow.CONTINUE;
@@ -85,7 +85,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
}
}).build();
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
@@ -110,7 +110,7 @@ void walkNullPrefixItems() {
+ " \"type\": \"string\"\r\n"
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(new WalkListener() {
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
return WalkFlow.CONTINUE;
@@ -127,7 +127,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
}
}).build();
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
.build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
diff --git a/src/test/java/com/networknt/schema/JsonWalkApplyDefaultsTest.java b/src/test/java/com/networknt/schema/JsonWalkApplyDefaultsTest.java
index 12d67548b..e3c4d81da 100644
--- a/src/test/java/com/networknt/schema/JsonWalkApplyDefaultsTest.java
+++ b/src/test/java/com/networknt/schema/JsonWalkApplyDefaultsTest.java
@@ -100,7 +100,7 @@ void testApplyDefaults0(String method) throws IOException {
case "walkWithNoDefaults": {
// same empty strategy, but tests for NullPointerException
WalkConfig walkConfig = WalkConfig.builder()
- .applyDefaultsStrategy(null).build();
+ .applyDefaultsStrategy((ApplyDefaultsStrategy)null).build();
Schema jsonSchema = createSchema();
errors = jsonSchema.walk(inputNode, true, executionContext -> executionContext.setWalkConfig(walkConfig)).getErrors();
break;
diff --git a/src/test/java/com/networknt/schema/JsonWalkTest.java b/src/test/java/com/networknt/schema/JsonWalkTest.java
index 27ff74ca8..772810f35 100644
--- a/src/test/java/com/networknt/schema/JsonWalkTest.java
+++ b/src/test/java/com/networknt/schema/JsonWalkTest.java
@@ -12,7 +12,7 @@
import com.networknt.schema.path.NodePath;
import com.networknt.schema.keyword.KeywordType;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -49,24 +49,24 @@ void setup() {
private void setupSchema() {
final Dialect dialect = getDialect();
// Create Schema.
- KeywordWalkListenerRunner.Builder keywordWalkListenerRunnerBuilder = KeywordWalkListenerRunner.builder();
+ KeywordWalkHandler.Builder keywordWalkHandlerBuilder = KeywordWalkHandler.builder();
- keywordWalkListenerRunnerBuilder.keywordWalkListener(new AllKeywordListener());
- keywordWalkListenerRunnerBuilder.keywordWalkListener(KeywordType.REF.getValue(), new RefKeywordListener());
- keywordWalkListenerRunnerBuilder.keywordWalkListener(KeywordType.PROPERTIES.getValue(),
+ keywordWalkHandlerBuilder.keywordWalkListener(new AllKeywordListener());
+ keywordWalkHandlerBuilder.keywordWalkListener(KeywordType.REF.getValue(), new RefKeywordListener());
+ keywordWalkHandlerBuilder.keywordWalkListener(KeywordType.PROPERTIES.getValue(),
new PropertiesKeywordListener());
SchemaRegistry schemaFactory = SchemaRegistry.withDialect(dialect);
this.jsonSchema = schemaFactory.getSchema(getSchema());
- this.walkConfig = WalkConfig.builder().keywordWalkListenerRunner(keywordWalkListenerRunnerBuilder.build()).build();
+ this.walkConfig = WalkConfig.builder().keywordWalkHandler(keywordWalkHandlerBuilder.build()).build();
// Create another Schema.
- KeywordWalkListenerRunner.Builder keywordWalkListenerRunner1Builder = KeywordWalkListenerRunner.builder();
- keywordWalkListenerRunner1Builder.keywordWalkListener(KeywordType.REF.getValue(), new RefKeywordListener());
- keywordWalkListenerRunner1Builder.keywordWalkListener(KeywordType.PROPERTIES.getValue(),
+ KeywordWalkHandler.Builder keywordWalkHandler1Builder = KeywordWalkHandler.builder();
+ keywordWalkHandler1Builder.keywordWalkListener(KeywordType.REF.getValue(), new RefKeywordListener());
+ keywordWalkHandler1Builder.keywordWalkListener(KeywordType.PROPERTIES.getValue(),
new PropertiesKeywordListener());
schemaFactory = SchemaRegistry.withDialect(dialect);
this.jsonSchema1 = schemaFactory.getSchema(getSchema());
- this.walkConfig1 = WalkConfig.builder().keywordWalkListenerRunner(keywordWalkListenerRunner1Builder.build()).build();
+ this.walkConfig1 = WalkConfig.builder().keywordWalkHandler(keywordWalkHandler1Builder.build()).build();
}
private Dialect getDialect() {
diff --git a/src/test/java/com/networknt/schema/LocaleTest.java b/src/test/java/com/networknt/schema/LocaleTest.java
index c28cf5c1c..863ea0ed7 100644
--- a/src/test/java/com/networknt/schema/LocaleTest.java
+++ b/src/test/java/com/networknt/schema/LocaleTest.java
@@ -52,19 +52,17 @@ void executionContextLocale() throws JsonMappingException, JsonProcessingExcepti
SchemaRegistryConfig config = SchemaRegistryConfig.builder().build();
Schema jsonSchema = getSchema(config);
- Locale locale = Locales.findSupported("it;q=0.9,fr;q=1.0"); // fr
- ExecutionContext executionContext = jsonSchema.createExecutionContext();
- assertEquals(config.getLocale(), executionContext.getExecutionConfig().getLocale());
- executionContext.executionConfig(executionConfig -> executionConfig.locale(locale));
- List messages = jsonSchema.validate(executionContext, rootNode, OutputFormat.DEFAULT);
+ List messages = jsonSchema.validate(rootNode, executionContext -> {
+ Locale locale = Locales.findSupported("it;q=0.9,fr;q=1.0"); // fr
+ executionContext.executionConfig(executionConfig -> executionConfig.locale(locale));
+ });
assertEquals(1, messages.size());
assertEquals("/foo: integer trouvé, string attendu", messages.iterator().next().toString());
-
- Locale locale2 = Locales.findSupported("it;q=1.0,fr;q=0.9"); // it
- executionContext = jsonSchema.createExecutionContext();
- assertEquals(config.getLocale(), executionContext.getExecutionConfig().getLocale());
- executionContext.executionConfig(executionConfig -> executionConfig.locale(locale2));
- messages = jsonSchema.validate(executionContext, rootNode, OutputFormat.DEFAULT);
+
+ messages = jsonSchema.validate(rootNode, executionContext -> {
+ Locale locale = Locales.findSupported("it;q=1.0,fr;q=0.9"); // it
+ executionContext.executionConfig(executionConfig -> executionConfig.locale(locale));
+ });
assertEquals(1, messages.size());
assertEquals("/foo: integer trovato, string previsto", messages.iterator().next().toString());
}
diff --git a/src/test/java/com/networknt/schema/MessageTest.java b/src/test/java/com/networknt/schema/MessageTest.java
index 7a9f42629..5a5e5da1a 100644
--- a/src/test/java/com/networknt/schema/MessageTest.java
+++ b/src/test/java/com/networknt/schema/MessageTest.java
@@ -71,14 +71,15 @@ public KeywordValidator newValidator(SchemaLocation schemaLocation,
@Test
void message() {
- Dialect dialect = Dialect.builder(Dialects.getDraft202012().getId(), Dialects.getDraft202012())
- .keyword(new EqualsKeyword()).build();
- SchemaRegistry factory = SchemaRegistry.withDialect(dialect);
+ Dialect dialect = Dialect.builder(Dialects.getDraft202012())
+ .keyword(new EqualsKeyword())
+ .build();
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(dialect);
String schemaData = "{\r\n"
+ " \"type\": \"string\",\r\n"
+ " \"equals\": \"helloworld\"\r\n"
+ "}";
- Schema schema = factory.getSchema(schemaData);
+ Schema schema = schemaRegistry.getSchema(schemaData);
List messages = schema.validate("\"helloworlda\"", InputFormat.JSON);
assertEquals(1, messages.size());
assertEquals(": must be equal to 'helloworld'", messages.iterator().next().toString());
diff --git a/src/test/java/com/networknt/schema/MetaSchemaValidationTest.java b/src/test/java/com/networknt/schema/MetaSchemaValidationTest.java
index f7443d6c0..6768a04f5 100644
--- a/src/test/java/com/networknt/schema/MetaSchemaValidationTest.java
+++ b/src/test/java/com/networknt/schema/MetaSchemaValidationTest.java
@@ -39,10 +39,9 @@ class MetaSchemaValidationTest {
void oas31() throws IOException {
try (InputStream input = MetaSchemaValidationTest.class.getResourceAsStream("/schema/oas/3.1/petstore.json")) {
JsonNode inputData = JsonMapperFactory.getInstance().readTree(input);
- SchemaRegistryConfig config = SchemaRegistryConfig.builder().build();
Schema schema = SchemaRegistry
.withDefaultDialect(SpecificationVersion.DRAFT_2020_12,
- builder -> builder.schemaRegistryConfig(config).schemaIdResolvers(schemaIdResolvers -> schemaIdResolvers
+ builder -> builder.schemaIdResolvers(schemaIdResolvers -> schemaIdResolvers
.mapPrefix("https://spec.openapis.org/oas/3.1", "classpath:oas/3.1")))
.getSchema(SchemaLocation.of("https://spec.openapis.org/oas/3.1/schema-base/2022-10-07"));
List messages = schema.validate(inputData);
diff --git a/src/test/java/com/networknt/schema/PrefixItemsValidatorTest.java b/src/test/java/com/networknt/schema/PrefixItemsValidatorTest.java
index dc1281286..eb9754e20 100644
--- a/src/test/java/com/networknt/schema/PrefixItemsValidatorTest.java
+++ b/src/test/java/com/networknt/schema/PrefixItemsValidatorTest.java
@@ -10,7 +10,7 @@
import com.networknt.schema.path.NodePath;
import com.networknt.schema.serialization.JsonMapperFactory;
import com.networknt.schema.walk.ApplyDefaultsStrategy;
-import com.networknt.schema.walk.ItemWalkListenerRunner;
+import com.networknt.schema.walk.ItemWalkHandler;
import com.networknt.schema.walk.WalkListener;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
@@ -133,7 +133,7 @@ void walkNull() {
+ " }\n"
+ " ]\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(new WalkListener() {
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
return WalkFlow.CONTINUE;
@@ -149,7 +149,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
items.add(walkEvent);
}
}).build();
- WalkConfig walkConfig = WalkConfig.builder().itemWalkListenerRunner(itemWalkListenerRunner).build();
+ WalkConfig walkConfig = WalkConfig.builder().itemWalkHandler(itemWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
@@ -190,7 +190,7 @@ void walkDefaults() throws JsonProcessingException {
+ " ]\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder()
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder()
.itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -206,7 +206,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
}
}).build();
WalkConfig walkConfig = WalkConfig.builder().applyDefaultsStrategy(new ApplyDefaultsStrategy(true, true, true))
- .itemWalkListenerRunner(itemWalkListenerRunner).build();
+ .itemWalkHandler(itemWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12);
Schema schema = factory.getSchema(schemaData);
diff --git a/src/test/java/com/networknt/schema/QuickStartTest.java b/src/test/java/com/networknt/schema/QuickStartTest.java
index 6b10c883d..3315ce297 100644
--- a/src/test/java/com/networknt/schema/QuickStartTest.java
+++ b/src/test/java/com/networknt/schema/QuickStartTest.java
@@ -1,7 +1,10 @@
package com.networknt.schema;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -9,10 +12,14 @@
import org.junit.jupiter.api.Test;
+import com.fasterxml.jackson.core.JsonLocation;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.output.OutputUnit;
+import com.networknt.schema.regex.JoniRegularExpressionFactory;
import com.networknt.schema.serialization.JsonMapperFactory;
+import com.networknt.schema.utils.JsonNodes;
/**
* Quick start test.
@@ -84,6 +91,150 @@ void addressExample() {
assertEquals("required", errors.get(0).getKeyword());
}
+ @Test
+ void readme() {
+ /*
+ * The SchemaRegistryConfig can be optionally used to configure certain aspects
+ * of how the validation is performed.
+ *
+ * By default the JDK regular expression implementation which is not ECMA 262
+ * compliant is used. The GraalJSRegularExpressionFactory.getInstance() offers
+ * the best compliance followed by JoniRegularExpressionFactory.getInstance()
+ * but both require additional optional dependencies.
+ */
+ SchemaRegistryConfig schemaRegistryConfig = SchemaRegistryConfig.builder()
+ .regularExpressionFactory(JoniRegularExpressionFactory.getInstance()).build();
+
+ /*
+ * This creates a schema registry that supports all the standard dialects for
+ * cross-dialect validation and will use Draft 2020-12 as the default if $schema
+ * is not specified in the schema data. If $schema is specified in the schema
+ * data then that schema dialect will be used instead and this version is
+ * ignored.
+ */
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12,
+ builder -> builder.schemaRegistryConfig(schemaRegistryConfig)
+ /*
+ * This creates a mapping from $id which starts with
+ * https://www.example.org/schema to the retrieval IRI classpath:schema.
+ */
+ .schemaIdResolvers(schemaIdResolvers -> schemaIdResolvers
+ .mapPrefix("https://www.example.com/schema", "classpath:schema")));
+
+ /*
+ * Due to the mapping the schema will be retrieved from the classpath at
+ * classpath:schema/example-main.json. If the schema data does not specify an
+ * $id the absolute IRI of the schema location will be used as the $id. If the
+ * schema data does not specify a dialect using $schema the default dialect
+ * specified when creating the schema registry.
+ */
+ Schema schema = schemaRegistry.getSchema(SchemaLocation.of("https://www.example.com/schema/example-main.json"));
+ String input = "{\r\n"
+ + " \"main\": {\r\n"
+ + " \"common\": {\r\n"
+ + " \"field\": \"invalidfield\"\r\n"
+ + " }\r\n"
+ + " }\r\n"
+ + "}";
+
+ List errors = schema.validate(input, InputFormat.JSON, executionContext -> {
+ /*
+ * By default since Draft 2019-09 the format keyword only generates annotations
+ * and not assertions.
+ */
+ executionContext.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true));
+ });
+ assertEquals(2, errors.size());
+ }
+
+ @Test
+ void readmeMetaSchema() {
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft202012());
+ /*
+ * Due to the mapping the meta-schema for the dialect will be retrieved from the
+ * classpath at classpath:draft/2020-12/schema.
+ */
+ Schema schema = schemaRegistry.getSchema(SchemaLocation.of(Dialects.getDraft202012().getId()));
+ String input = "{\r\n"
+ + " \"type\": \"object\",\r\n"
+ + " \"properties\": {\r\n"
+ + " \"key\": {\r\n"
+ + " \"title\" : \"My key\",\r\n"
+ + " \"type\": \"invalidtype\"\r\n"
+ + " }\r\n"
+ + " }\r\n"
+ + "}";
+ List errors = schema.validate(input, InputFormat.JSON, executionContext -> {
+ /*
+ * By default since Draft 2019-09 the format keyword only generates annotations
+ * and not assertions.
+ */
+ executionContext.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true));
+ });
+ assertEquals(2, errors.size());
+ }
+
+ @Test
+ void location() {
+ String schemaData = "{\r\n"
+ + " \"$id\": \"https://schema/myschema\",\r\n"
+ + " \"properties\": {\r\n"
+ + " \"startDate\": {\r\n"
+ + " \"format\": \"date\",\r\n"
+ + " \"minLength\": 6\r\n"
+ + " }\r\n"
+ + " }\r\n"
+ + "}";
+ String inputData = "{\r\n"
+ + " \"startDate\": \"1\"\r\n"
+ + "}";
+
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft202012(),
+ builder -> builder.nodeReader(nodeReader -> nodeReader.locationAware()));
+
+ Schema schema = schemaRegistry.getSchema(schemaData, InputFormat.JSON);
+ List errors = schema.validate(inputData, InputFormat.JSON, executionContext -> {
+ executionContext.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true));
+ });
+ Error format = errors.get(0);
+ JsonLocation formatInstanceNodeTokenLocation = JsonNodes.tokenStreamLocationOf(format.getInstanceNode());
+ JsonLocation formatSchemaNodeTokenLocation = JsonNodes.tokenStreamLocationOf(format.getSchemaNode());
+ Error minLength = errors.get(1);
+ JsonLocation minLengthInstanceNodeTokenLocation = JsonNodes.tokenStreamLocationOf(minLength.getInstanceNode());
+ JsonLocation minLengthSchemaNodeTokenLocation = JsonNodes.tokenStreamLocationOf(minLength.getSchemaNode());
+
+ assertEquals("format", format.getKeyword());
+ assertEquals("date", format.getSchemaNode().asText());
+ assertEquals(5, formatSchemaNodeTokenLocation.getLineNr());
+ assertEquals(17, formatSchemaNodeTokenLocation.getColumnNr());
+ assertEquals("1", format.getInstanceNode().asText());
+ assertEquals(2, formatInstanceNodeTokenLocation.getLineNr());
+ assertEquals(16, formatInstanceNodeTokenLocation.getColumnNr());
+ assertEquals("minLength", minLength.getKeyword());
+ assertEquals("6", minLength.getSchemaNode().asText());
+ assertEquals(6, minLengthSchemaNodeTokenLocation.getLineNr());
+ assertEquals(20, minLengthSchemaNodeTokenLocation.getColumnNr());
+ assertEquals("1", minLength.getInstanceNode().asText());
+ assertEquals(2, minLengthInstanceNodeTokenLocation.getLineNr());
+ assertEquals(16, minLengthInstanceNodeTokenLocation.getColumnNr());
+ assertEquals(16, minLengthInstanceNodeTokenLocation.getColumnNr());
+ }
+
+ @Test
+ void annotation() {
+ String inputData = "{ \"hello\": \"world\"}";
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft201909());
+ Schema schema = schemaRegistry.getSchema(SchemaLocation.of("classpath:schema/example-ref.json"));
+
+ OutputUnit outputUnit = schema.validate(inputData, InputFormat.JSON, OutputFormat.HIERARCHICAL, executionContext -> {
+ executionContext.executionConfig(executionConfig -> executionConfig
+ .annotationCollectionEnabled(true)
+ .annotationCollectionFilter(keyword -> true)
+ .formatAssertionsEnabled(true));
+ });
+ assertNotNull(outputUnit);
+ }
+
@Test
void schemaFromSchemaLocationMapping() {
SchemaRegistry schemaRegistry = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12,
@@ -193,4 +344,33 @@ void schemaFromJsonNode() throws JsonProcessingException {
.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true)));
assertEquals(1, errors.size());
}
+
+ @Test
+ void defaults() throws IOException {
+ String schemaData = "{\r\n"
+ + " \"$schema\": \"http://json-schema.org/draft-04/schema#\",\r\n"
+ + " \"title\": \"Schema with default values \",\r\n"
+ + " \"type\": \"object\",\r\n"
+ + " \"properties\": {\r\n"
+ + " \"intValue\": {\r\n"
+ + " \"type\": \"integer\",\r\n"
+ + " \"default\": 15, \r\n"
+ + " \"minimum\": 20\r\n"
+ + " }\r\n"
+ + " },\r\n"
+ + " \"required\": [\"intValue\"]\r\n"
+ + "}";
+
+ String inputData = "{}";
+
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft4());
+ Schema schema = schemaRegistry.getSchema(schemaData);
+
+ JsonNode inputNode = JsonMapperFactory.getInstance().readTree(inputData);
+ Result result = schema.walk(inputNode, true, executionContext -> executionContext.walkConfig(
+ walkConfig -> walkConfig.applyDefaultsStrategy(applyDefaultsStrategy -> applyDefaultsStrategy
+ .applyArrayDefaults(true).applyPropertyDefaults(true).applyPropertyDefaultsIfNull(true))));
+ assertFalse(result.getErrors().isEmpty());
+ assertEquals("{\"intValue\":15}", inputNode.toString());
+ }
}
diff --git a/src/test/java/com/networknt/schema/SharedConfigTest.java b/src/test/java/com/networknt/schema/SharedConfigTest.java
index edd62b88d..ea4002a7b 100644
--- a/src/test/java/com/networknt/schema/SharedConfigTest.java
+++ b/src/test/java/com/networknt/schema/SharedConfigTest.java
@@ -7,7 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.schema.walk.WalkListener;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -34,9 +34,9 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
void shouldCallAllKeywordListenerOnWalkStart() throws Exception {
AllKeywordListener allKeywordListener = new AllKeywordListener();
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(allKeywordListener).build();
- WalkConfig walkConfig = WalkConfig.builder().keywordWalkListenerRunner(keywordWalkListenerRunner).build();
+ WalkConfig walkConfig = WalkConfig.builder().keywordWalkHandler(keywordWalkHandler).build();
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7);
diff --git a/src/test/java/com/networknt/schema/keyword/PropertiesValidatorTest.java b/src/test/java/com/networknt/schema/keyword/PropertiesValidatorTest.java
index 6cbbfc600..6fe6bdcd6 100644
--- a/src/test/java/com/networknt/schema/keyword/PropertiesValidatorTest.java
+++ b/src/test/java/com/networknt/schema/keyword/PropertiesValidatorTest.java
@@ -10,8 +10,8 @@
import com.networknt.schema.SpecificationVersion;
import com.networknt.schema.dialect.Dialects;
import com.networknt.schema.walk.ApplyDefaultsStrategy;
-import com.networknt.schema.walk.KeywordWalkListenerRunner;
-import com.networknt.schema.walk.PropertyWalkListenerRunner;
+import com.networknt.schema.walk.KeywordWalkHandler;
+import com.networknt.schema.walk.PropertyWalkHandler;
import com.networknt.schema.walk.WalkConfig;
import com.networknt.schema.walk.WalkEvent;
import com.networknt.schema.walk.WalkFlow;
@@ -66,7 +66,7 @@ void evaluationPath() {
@Test
void evaluationPathWalk() {
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -77,7 +77,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
}
}).build();
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -109,8 +109,8 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
Schema schema = schemaRegistry.getSchema(schemaData, InputFormat.JSON);
Result result = schema.walk(instanceData, InputFormat.JSON, true,
executionContext -> executionContext
- .walkConfig(walkConfig -> walkConfig.propertyWalkListenerRunner(propertyWalkListenerRunner)
- .keywordWalkListenerRunner(keywordWalkListenerRunner)));
+ .walkConfig(walkConfig -> walkConfig.propertyWalkHandler(propertyWalkHandler)
+ .keywordWalkHandler(keywordWalkHandler)));
List errors = result.getErrors();
assertEquals(2, errors.size());
assertEquals("/properties/productId/minimum", errors.get(0).getEvaluationPath().toString());
diff --git a/src/test/java/com/networknt/schema/regex/RegularExpressionTest.java b/src/test/java/com/networknt/schema/regex/RegularExpressionTest.java
new file mode 100644
index 000000000..54bc3ae38
--- /dev/null
+++ b/src/test/java/com/networknt/schema/regex/RegularExpressionTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.networknt.schema.regex;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.networknt.schema.Error;
+import com.networknt.schema.InputFormat;
+import com.networknt.schema.Schema;
+import com.networknt.schema.SchemaRegistry;
+import com.networknt.schema.SchemaRegistryConfig;
+import com.networknt.schema.dialect.Dialects;
+
+/**
+ * RegularExpressionTest.
+ */
+public class RegularExpressionTest {
+ @Test
+ public void testInvalidRegexValidatorECMA262() throws Exception {
+ SchemaRegistryConfig schemaRegistryConfig = SchemaRegistryConfig.builder()
+ .regularExpressionFactory(GraalJSRegularExpressionFactory.getInstance()).build();
+ SchemaRegistry schemaRegistry = SchemaRegistry.withDialect(Dialects.getDraft202012(),
+ builder -> builder.schemaRegistryConfig(schemaRegistryConfig));
+ Schema schema = schemaRegistry.getSchema("{\r\n"
+ + " \"format\": \"regex\"\r\n"
+ + "}");
+ List errors = schema.validate("\"\\\\a\"", InputFormat.JSON, executionContext -> {
+ executionContext.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true));
+ });
+ assertFalse(errors.isEmpty());
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/com/networknt/schema/walk/WalkListenerTest.java b/src/test/java/com/networknt/schema/walk/WalkListenerTest.java
index dc8a82e69..efc693ccd 100644
--- a/src/test/java/com/networknt/schema/walk/WalkListenerTest.java
+++ b/src/test/java/com/networknt/schema/walk/WalkListenerTest.java
@@ -43,7 +43,6 @@
import com.networknt.schema.keyword.ItemsLegacyValidator;
import com.networknt.schema.keyword.ItemsValidator;
import com.networknt.schema.keyword.PropertiesValidator;
-import com.networknt.schema.path.NodePath;
import com.networknt.schema.keyword.KeywordType;
import com.networknt.schema.serialization.JsonMapperFactory;
import com.networknt.schema.utils.JsonNodes;
@@ -84,14 +83,12 @@ void keywordListener() {
+ " }\r\n"
+ "}";
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.PROPERTIES.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
- @SuppressWarnings("unchecked")
- List propertyKeywords = (List) walkEvent.getExecutionContext()
+ List propertyKeywords = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
.computeIfAbsent("propertyKeywords", key -> new ArrayList<>());
propertyKeywords.add(walkEvent);
return WalkFlow.CONTINUE;
@@ -115,27 +112,23 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
+ " }\r\n"
+ " ]\r\n"
+ "}";
- WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
- .build();
- Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
+ Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext
+ .walkConfig(walkConfig -> walkConfig.keywordWalkHandler(keywordWalkHandler)));
assertTrue(result.getErrors().isEmpty());
- @SuppressWarnings("unchecked")
- List propertyKeywords = (List) result.getExecutionContext().getCollectorContext().get("propertyKeywords");
+ List propertyKeywords = result.getCollectorContext().get("propertyKeywords");
assertEquals(3, propertyKeywords.size());
assertEquals("properties", propertyKeywords.get(0).getValidator().getKeyword());
assertEquals("", propertyKeywords.get(0).getInstanceLocation().toString());
- //assertEquals("/properties", propertyKeywords.get(0).getEvaluationPath()
- // .append(propertyKeywords.get(0).getKeyword()).toString());
+ assertEquals("/properties",
+ propertyKeywords.get(0).getEvaluationPath().append(propertyKeywords.get(0).getKeyword()).toString());
assertEquals("/tags/0", propertyKeywords.get(1).getInstanceLocation().toString());
assertEquals("image", propertyKeywords.get(1).getInstanceNode().get("name").asText());
- //assertEquals("/properties/tags/items/$ref/properties",
- // propertyKeywords.get(1).getValidator().getEvaluationPath().toString());
- //assertEquals("/properties/tags/items/$ref/properties", propertyKeywords.get(1).getEvaluationPath()
- // .append(propertyKeywords.get(1).getKeyword()).toString());
+ assertEquals("/properties/tags/items/$ref", propertyKeywords.get(1).getEvaluationPath().toString());
+ assertEquals("/properties/tags/items/$ref/properties",
+ propertyKeywords.get(1).getEvaluationPath().append(propertyKeywords.get(1).getKeyword()).toString());
assertEquals("/tags/1", propertyKeywords.get(2).getInstanceLocation().toString());
- //assertEquals("/properties/tags/items/$ref/properties", propertyKeywords.get(2).getEvaluationPath()
- // .append(propertyKeywords.get(2).getKeyword()).toString());
+ assertEquals("/properties/tags/items/$ref/properties",
+ propertyKeywords.get(2).getEvaluationPath().append(propertyKeywords.get(2).getKeyword()).toString());
assertEquals("link", propertyKeywords.get(2).getInstanceNode().get("name").asText());
}
@@ -167,14 +160,12 @@ void propertyListener() {
+ " }\r\n"
+ "}";
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
- @SuppressWarnings("unchecked")
- List properties = (List) walkEvent.getExecutionContext()
+ List properties = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
.computeIfAbsent("properties", key -> new ArrayList<>());
properties.add(walkEvent);
return WalkFlow.CONTINUE;
@@ -199,7 +190,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
+ " ]\r\n"
+ "}";
WalkConfig walkConfig = WalkConfig.builder()
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
assertTrue(result.getErrors().isEmpty());
@@ -257,13 +248,11 @@ void itemsListener() {
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(new WalkListener() {
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
- @SuppressWarnings("unchecked")
- List items = (List) walkEvent.getExecutionContext()
+ List items = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
.computeIfAbsent("items", key -> new ArrayList<>());
items.add(walkEvent);
return WalkFlow.CONTINUE;
@@ -287,7 +276,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
+ " ]\r\n"
+ "}";
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
.build();
Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -334,13 +323,11 @@ void items202012Listener() {
+ " }\r\n"
+ "}";
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(new WalkListener() {
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
- @SuppressWarnings("unchecked")
- List items = (List) walkEvent.getExecutionContext()
+ List items = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
.computeIfAbsent("items", key -> new ArrayList<>());
items.add(walkEvent);
return WalkFlow.CONTINUE;
@@ -364,13 +351,12 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
+ " ]\r\n"
+ "}";
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
.build();
Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
assertTrue(result.getErrors().isEmpty());
- @SuppressWarnings("unchecked")
- List items = (List) result.getExecutionContext().getCollectorContext().get("items");
+ List items = result.getExecutionContext().getCollectorContext().get("items");
assertEquals(2, items.size());
assertEquals("items", items.get(0).getValidator().getKeyword());
assertInstanceOf(ItemsValidator.class, items.get(0).getValidator());
@@ -384,14 +370,12 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
@Test
void draft201909() {
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.PROPERTIES.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
- @SuppressWarnings("unchecked")
- List propertyKeywords = (List) walkEvent.getExecutionContext()
+ List propertyKeywords = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
.computeIfAbsent("propertyKeywords", key -> new ArrayList<>());
propertyKeywords.add(walkEvent);
return WalkFlow.CONTINUE;
@@ -421,7 +405,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
+ " }\r\n"
+ "}";
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
Result result = schema.walk(inputData, InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
assertTrue(result.getErrors().isEmpty());
@@ -566,8 +550,10 @@ void applyDefaults() throws JsonProcessingException {
+ " }\r\n"
+ "}";
- WalkConfig walkConfig = WalkConfig.builder()
- .applyDefaultsStrategy(new ApplyDefaultsStrategy(true, true, true)).build();
+ WalkConfig walkConfig = WalkConfig.builder()
+ .applyDefaultsStrategy(applyDefaultsStrategy -> applyDefaultsStrategy.applyArrayDefaults(true)
+ .applyPropertyDefaults(true).applyPropertyDefaultsIfNull(true))
+ .build();
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);
JsonNode inputNode = JsonMapperFactory.getInstance().readTree("{}");
Result result = schema.walk(inputNode, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -598,7 +584,7 @@ void applyDefaultsWithWalker() throws JsonProcessingException {
+ " }\r\n"
+ "}";
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -627,7 +613,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);
WalkConfig walkConfig = WalkConfig.builder()
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
JsonNode inputNode = JsonMapperFactory.getInstance().readTree("{}");
Result result = schema.walk(inputNode, true, executionContext -> executionContext.setWalkConfig(walkConfig));
@@ -658,7 +644,7 @@ void applyInvalidDefaultsWithWalker() throws JsonProcessingException {
+ " }\r\n"
+ "}";
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -688,7 +674,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);
JsonNode inputNode = JsonMapperFactory.getInstance().readTree("{}");
WalkConfig walkConfig = WalkConfig.builder()
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
Result result = schema.walk(inputNode, true, executionContext -> executionContext.setWalkConfig(walkConfig));
assertEquals("{\"s\":1,\"ref\":\"REF\"}", inputNode.toString());
@@ -721,7 +707,7 @@ void missingRequired() throws JsonProcessingException {
+ " }\r\n"
+ "}";
Map missingSchemaNode = new LinkedHashMap<>();
- KeywordWalkListenerRunner keywordWalkListenerRunner = KeywordWalkListenerRunner.builder()
+ KeywordWalkHandler keywordWalkHandler = KeywordWalkHandler.builder()
.keywordWalkListener(KeywordType.PROPERTIES.getValue(), new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -756,7 +742,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .keywordWalkListenerRunner(keywordWalkListenerRunner)
+ .keywordWalkHandler(keywordWalkHandler)
.build();
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);
@@ -796,7 +782,7 @@ void generateDataWithWalker() throws JsonProcessingException {
+ " }\r\n"
+ "}";
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder()
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder()
.propertyWalkListener(new WalkListener() {
@Override
public WalkFlow onWalkStart(WalkEvent walkEvent) {
@@ -815,7 +801,7 @@ public WalkFlow onWalkStart(WalkEvent walkEvent) {
String faker = fakerNode.asText();
String fakeData = generators.get(faker).get();
JsonNode fakeDataNode = JsonNodeFactory.instance.textNode(fakeData);
- ObjectNode parentNode = (ObjectNode) JsonNodes.get(walkEvent.getRootNode(),
+ ObjectNode parentNode = JsonNodes.get(walkEvent.getRootNode(),
walkEvent.getInstanceLocation().getParent());
parentNode.set(walkEvent.getInstanceLocation().getName(-1), fakeDataNode);
}
@@ -829,7 +815,7 @@ public void onWalkEnd(WalkEvent walkEvent, List errors) {
})
.build();
WalkConfig walkConfig = WalkConfig.builder()
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);
@@ -871,25 +857,22 @@ public WalkFlow onWalkStart(WalkEvent walkEvent) {
@Override
public void onWalkEnd(WalkEvent walkEvent, List errors) {
- @SuppressWarnings("unchecked")
- List items = (List) walkEvent.getExecutionContext()
+ List items = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
- .computeIfAbsent("items", key -> new ArrayList());
+ .computeIfAbsent("items", key -> new ArrayList<>());
items.add(walkEvent);
}
};
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(listener).build();
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder().propertyWalkListener(listener).build();
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(listener).build();
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder().propertyWalkListener(listener).build();
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2019_09).getSchema(schemaData);
Result result = schema.walk(null, true, executionContext -> executionContext.setWalkConfig(walkConfig));
- @SuppressWarnings("unchecked")
- List items = (List) result.getExecutionContext().getCollectorContext().get("items");
+ List items = result.getExecutionContext().getCollectorContext().get("items");
assertEquals(4, items.size());
assertEquals("/name", items.get(0).getInstanceLocation().toString());
assertEquals("properties", items.get(0).getKeyword());
@@ -937,19 +920,17 @@ public WalkFlow onWalkStart(WalkEvent walkEvent) {
@Override
public void onWalkEnd(WalkEvent walkEvent, List errors) {
- @SuppressWarnings("unchecked")
- List items = (List) walkEvent.getExecutionContext()
+ List items = walkEvent.getExecutionContext()
.getCollectorContext()
- .getData()
- .computeIfAbsent("items", key -> new ArrayList());
+ .computeIfAbsent("items", key -> new ArrayList<>());
items.add(walkEvent);
}
};
- ItemWalkListenerRunner itemWalkListenerRunner = ItemWalkListenerRunner.builder().itemWalkListener(listener).build();
- PropertyWalkListenerRunner propertyWalkListenerRunner = PropertyWalkListenerRunner.builder().propertyWalkListener(listener).build();
+ ItemWalkHandler itemWalkHandler = ItemWalkHandler.builder().itemWalkListener(listener).build();
+ PropertyWalkHandler propertyWalkHandler = PropertyWalkHandler.builder().propertyWalkListener(listener).build();
WalkConfig walkConfig = WalkConfig.builder()
- .itemWalkListenerRunner(itemWalkListenerRunner)
- .propertyWalkListenerRunner(propertyWalkListenerRunner)
+ .itemWalkHandler(itemWalkHandler)
+ .propertyWalkHandler(propertyWalkHandler)
.build();
Schema schema = SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_2020_12).getSchema(schemaData);