Rename JsonNodePath to NodePath

Author: justin-tay

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

@@ -48,20 +48,20 @@
 public class Error {
     private final String keyword;
     @JsonSerialize(using = ToStringSerializer.class)
-    private final JsonNodePath evaluationPath;
+    private final NodePath evaluationPath;
     @JsonSerialize(using = ToStringSerializer.class)
     private final SchemaLocation schemaLocation;
     @JsonSerialize(using = ToStringSerializer.class)
-    private final JsonNodePath instanceLocation;
+    private final NodePath instanceLocation;
     private final Object[] arguments;
     private final String messageKey;
     private final Supplier<String> messageSupplier;
     private final Map<String, Object> details;
     private final JsonNode instanceNode;
     private final JsonNode schemaNode;
 
-    Error(String keyword, JsonNodePath evaluationPath, SchemaLocation schemaLocation,
-            JsonNodePath instanceLocation, Object[] arguments, Map<String, Object> details,
+    Error(String keyword, NodePath evaluationPath, SchemaLocation schemaLocation,
+            NodePath instanceLocation, Object[] arguments, Map<String, Object> details,
             String messageKey, Supplier<String> messageSupplier, JsonNode instanceNode, JsonNode schemaNode) {
         super();
         this.keyword = keyword;
@@ -82,7 +82,7 @@ public class Error {
      * 
      * @return The path to the input json
      */
-    public JsonNodePath getInstanceLocation() {
+    public NodePath getInstanceLocation() {
         return instanceLocation;
     }
 
@@ -93,7 +93,7 @@ public JsonNodePath getInstanceLocation() {
      * 
      * @return the evaluation path
      */
-    public JsonNodePath getEvaluationPath() {
+    public NodePath getEvaluationPath() {
         return evaluationPath;
     }
 
@@ -261,9 +261,9 @@ public static abstract class BuilderSupport<S> {
         public abstract S self();
 
         protected String keyword;
-        protected JsonNodePath evaluationPath;
+        protected NodePath evaluationPath;
         protected SchemaLocation schemaLocation;
-        protected JsonNodePath instanceLocation;
+        protected NodePath instanceLocation;
         protected Object[] arguments;
         protected Map<String, Object> details;
         protected MessageFormat format;
@@ -303,7 +303,7 @@ public S index(Integer index) {
          * @param instanceLocation the instance location
          * @return the builder
          */
-        public S instanceLocation(JsonNodePath instanceLocation) {
+        public S instanceLocation(NodePath instanceLocation) {
             this.instanceLocation = instanceLocation;
             return self();
         }
@@ -330,7 +330,7 @@ public S schemaLocation(SchemaLocation schemaLocation) {
          * @param evaluationPath the evaluation path
          * @return the builder
          */
-        public S evaluationPath(JsonNodePath evaluationPath) {
+        public S evaluationPath(NodePath evaluationPath) {
             this.evaluationPath = evaluationPath;
             return self();
         }
@@ -420,15 +420,15 @@ protected String getKeyword() {
             return keyword;
         }
 
-        protected JsonNodePath getEvaluationPath() {
+        protected NodePath getEvaluationPath() {
             return evaluationPath;
         }
 
         protected SchemaLocation getSchemaLocation() {
             return schemaLocation;
         }
 
-        protected JsonNodePath getInstanceLocation() {
+        protected NodePath getInstanceLocation() {
             return instanceLocation;
         }
 

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

@@ -191,14 +191,14 @@ public DiscriminatorContext getCurrentDiscriminatorContext() {
         return null; // this is the case when we get on a schema that has a discriminator, but it's not used in anyOf
     }
 
-    public void enterDiscriminatorContext(final DiscriminatorContext ctx, @SuppressWarnings("unused") JsonNodePath instanceLocation) {
+    public void enterDiscriminatorContext(final DiscriminatorContext ctx, @SuppressWarnings("unused") NodePath instanceLocation) {
         if (this.discriminatorContexts == null) {
             this.discriminatorContexts = new Stack<>();
         }
         this.discriminatorContexts.push(ctx);
     }
 
-    public void leaveDiscriminatorContextImmediately(@SuppressWarnings("unused") JsonNodePath instanceLocation) {
+    public void leaveDiscriminatorContextImmediately(@SuppressWarnings("unused") NodePath instanceLocation) {
         this.discriminatorContexts.pop();
     }
 

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

@@ -121,7 +121,7 @@ default boolean matches(ExecutionContext executionContext, SchemaContext schemaC
      * @return true if matches
      */
     default boolean matches(ExecutionContext executionContext, SchemaContext schemaContext, JsonNode node,
-            JsonNode rootNode, JsonNodePath instanceLocation, boolean assertionsEnabled, FormatValidator formatValidator) {
+            JsonNode rootNode, NodePath instanceLocation, boolean assertionsEnabled, FormatValidator formatValidator) {
         return matches(executionContext, schemaContext, node);
     }
 
@@ -140,7 +140,7 @@ default boolean matches(ExecutionContext executionContext, SchemaContext schemaC
      * @param formatValidator the format validator
      */
     default void validate(ExecutionContext executionContext, SchemaContext schemaContext,
-            JsonNode node, JsonNode rootNode, JsonNodePath instanceLocation, boolean assertionsEnabled,
+            JsonNode node, JsonNode rootNode, NodePath instanceLocation, boolean assertionsEnabled,
             Supplier<MessageSourceError.Builder> message,
             FormatValidator formatValidator) {
         if (assertionsEnabled) {

src/main/java/com/networknt/schema/JsonNodePath.java renamed to src/main/java/com/networknt/schema/NodePath.java

@@ -20,31 +20,31 @@
 /**
  * Represents a path to a JSON node.
  */
-public class JsonNodePath implements Comparable<JsonNodePath> {
+public class NodePath implements Comparable<NodePath> {
     private final PathType type;
-    private final JsonNodePath parent;
+    private final NodePath parent;
 
     private final String pathSegment;
     private final int pathSegmentIndex;
 
     private volatile String value = null; // computed lazily
     private int hash = 0; // computed lazily
 
-    public JsonNodePath(PathType type) {
+    public NodePath(PathType type) {
         this.type = type;
         this.parent = null;
         this.pathSegment = null;
         this.pathSegmentIndex = -1;
     }
 
-    private JsonNodePath(JsonNodePath parent, String pathSegment) {
+    private NodePath(NodePath parent, String pathSegment) {
         this.parent = parent;
         this.type = parent.type;
         this.pathSegment = pathSegment;
         this.pathSegmentIndex = -1;
     }
 
-    private JsonNodePath(JsonNodePath parent, int pathSegmentIndex) {
+    private NodePath(NodePath parent, int pathSegmentIndex) {
         this.parent = parent;
         this.type = parent.type;
         this.pathSegment = null;
@@ -56,7 +56,7 @@ private JsonNodePath(JsonNodePath parent, int pathSegmentIndex) {
      *
      * @return the parent
      */
-    public JsonNodePath getParent() {
+    public NodePath getParent() {
         return this.parent;
     }
 
@@ -66,8 +66,8 @@ public JsonNodePath getParent() {
      * @param token the child token
      * @return the path
      */
-    public JsonNodePath append(String token) {
-        return new JsonNodePath(this, token);
+    public NodePath append(String token) {
+        return new NodePath(this, token);
     }
 
     /**
@@ -76,8 +76,8 @@ public JsonNodePath append(String token) {
      * @param index the index
      * @return the path
      */
-    public JsonNodePath append(int index) {
-        return new JsonNodePath(this, index);
+    public NodePath append(int index) {
+        return new NodePath(this, index);
     }
 
     /**
@@ -133,7 +133,7 @@ public Object getElement(int index) {
         if (count < 0) {
             throw new IllegalArgumentException("");
         }
-        JsonNodePath current = this;
+        NodePath current = this;
         for (int x = 0; x < count; x++) {
             current = current.parent;
         }
@@ -157,7 +157,7 @@ public int getNameCount() {
      * @param other the other path
      * @return true if the path starts with the other path
      */
-    public boolean startsWith(JsonNodePath other) {
+    public boolean startsWith(NodePath other) {
         int count = getNameCount();
         int otherCount = other.getNameCount();
 
@@ -166,7 +166,7 @@ public boolean startsWith(JsonNodePath other) {
         } else if (otherCount == count) {
             return this.equals(other);
         } else {
-            JsonNodePath compare = this;
+            NodePath compare = this;
             int x = count - otherCount;
             while (x > 0) {
                 compare = compare.getParent();
@@ -189,7 +189,7 @@ public boolean contains(String segment) {
         if (result) {
             return true;
         }
-        JsonNodePath path = this.getParent();
+        NodePath path = this.getParent();
         while (path != null) {
             if (segment.equals(path.pathSegment)) {
                 return true;
@@ -232,13 +232,13 @@ public boolean equals(Object obj) {
             return false;
         if (getClass() != obj.getClass())
             return false;
-        JsonNodePath other = (JsonNodePath) obj;
+        NodePath other = (NodePath) obj;
         return Objects.equals(pathSegment, other.pathSegment) && pathSegmentIndex == other.pathSegmentIndex
                 && type == other.type && Objects.equals(parent, other.parent);
     }
 
     @Override
-    public int compareTo(JsonNodePath other) {
+    public int compareTo(NodePath other) {
         if (this.parent != null && other.parent == null) {
             return 1;
         } else if (this.parent == null && other.parent != null) {