Rename JsonLocationAware to TokenStreamLocationAware to align with v3

Author: justin-tay

src/main/java/com/networknt/schema/serialization/node/LocationJsonNodeFactory.java

@@ -32,7 +32,7 @@
 import com.fasterxml.jackson.databind.util.RawValue;
 
 /**
- * {@link JsonNodeFactory} that creates {@link JsonLocationAware} nodes.
+ * {@link JsonNodeFactory} that creates {@link TokenStreamLocationAware} nodes.
  * <p>
  * Note that this will adversely affect performance as nodes with the same value
  * can no longer be cached and reused.
@@ -57,12 +57,12 @@ public LocationJsonNodeFactory(JsonParser jsonParser) {
 
     @Override
     public BooleanNode booleanNode(boolean v) {
-        return new JsonLocationAwareBooleanNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareBooleanNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public NullNode nullNode() {
-        return new JsonLocationAwareNullNode(this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareNullNode(this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -72,7 +72,7 @@ public JsonNode missingNode() {
 
     @Override
     public NumericNode numberNode(byte v) {
-        return new JsonLocationAwareIntNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareIntNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -82,7 +82,7 @@ public ValueNode numberNode(Byte v) {
 
     @Override
     public NumericNode numberNode(short v) {
-        return new JsonLocationAwareShortNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareShortNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -92,7 +92,7 @@ public ValueNode numberNode(Short value) {
 
     @Override
     public NumericNode numberNode(int v) {
-        return new JsonLocationAwareIntNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareIntNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -102,7 +102,7 @@ public ValueNode numberNode(Integer v) {
 
     @Override
     public NumericNode numberNode(long v) {
-        return new JsonLocationAwareLongNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareLongNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -112,12 +112,12 @@ public ValueNode numberNode(Long v) {
 
     @Override
     public ValueNode numberNode(BigInteger v) {
-        return (v == null) ? nullNode() : new JsonLocationAwareBigIntegerNode(v, this.jsonParser.currentTokenLocation());
+        return (v == null) ? nullNode() : new TokenStreamLocationAwareBigIntegerNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public NumericNode numberNode(float v) {
-        return new JsonLocationAwareFloatNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareFloatNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -127,7 +127,7 @@ public ValueNode numberNode(Float v) {
 
     @Override
     public NumericNode numberNode(double v) {
-        return new JsonLocationAwareDoubleNode(v, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareDoubleNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
@@ -137,47 +137,47 @@ public ValueNode numberNode(Double v) {
 
     @Override
     public ValueNode numberNode(BigDecimal v) {
-        return (v == null) ? nullNode() : new JsonLocationAwareDecimalNode(v, this.jsonParser.currentTokenLocation());
+        return (v == null) ? nullNode() : new TokenStreamLocationAwareDecimalNode(v, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public TextNode textNode(String text) {
-        return new JsonLocationAwareTextNode(text, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareTextNode(text, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public BinaryNode binaryNode(byte[] data) {
-        return new JsonLocationAwareBinaryNode(data, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareBinaryNode(data, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public BinaryNode binaryNode(byte[] data, int offset, int length) {
-        return new JsonLocationAwareBinaryNode(data, offset, length, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareBinaryNode(data, offset, length, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public ArrayNode arrayNode() {
-        return new JsonLocationAwareArrayNode(this, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareArrayNode(this, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public ArrayNode arrayNode(int capacity) {
-        return new JsonLocationAwareArrayNode(this, capacity, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareArrayNode(this, capacity, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public ObjectNode objectNode() {
-        return new JsonLocationAwareObjectNode(this, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwareObjectNode(this, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public ValueNode pojoNode(Object pojo) {
-        return new JsonLocationAwarePOJONode(pojo, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwarePOJONode(pojo, this.jsonParser.currentTokenLocation());
     }
 
     @Override
     public ValueNode rawValueNode(RawValue value) {
-        return new JsonLocationAwarePOJONode(value, this.jsonParser.currentTokenLocation());
+        return new TokenStreamLocationAwarePOJONode(value, this.jsonParser.currentTokenLocation());
     }
 
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAware.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAware.java

@@ -20,11 +20,11 @@
 /**
  * JsonNodes that are aware of the token location will implement this interface.
  */
-public interface JsonLocationAware {
+public interface TokenStreamLocationAware {
     /**
      * Gets the token location.
      *
      * @return the token location
      */
-    JsonLocation tokenLocation();
+    JsonLocation tokenStreamLocation();
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareArrayNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareArrayNode.java

@@ -23,32 +23,32 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 
 /**
- * {@link ArrayNode} that is {@link JsonLocationAware}.
+ * {@link ArrayNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareArrayNode extends ArrayNode implements JsonLocationAware {
+public class TokenStreamLocationAwareArrayNode extends ArrayNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareArrayNode(JsonNodeFactory nf, int capacity, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareArrayNode(JsonNodeFactory nf, int capacity, JsonLocation tokenStreamLocation) {
         super(nf, capacity);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
-    public JsonLocationAwareArrayNode(JsonNodeFactory nf, List<JsonNode> children, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareArrayNode(JsonNodeFactory nf, List<JsonNode> children, JsonLocation tokenStreamLocation) {
         super(nf, children);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
-    public JsonLocationAwareArrayNode(JsonNodeFactory nf, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareArrayNode(JsonNodeFactory nf, JsonLocation tokenStreamLocation) {
         super(nf);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareBigIntegerNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareBigIntegerNode.java

@@ -21,22 +21,22 @@
 import com.fasterxml.jackson.databind.node.BigIntegerNode;
 
 /**
- * {@link BigIntegerNode} that is {@link JsonLocationAware}.
+ * {@link BigIntegerNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareBigIntegerNode extends BigIntegerNode implements JsonLocationAware {
+public class TokenStreamLocationAwareBigIntegerNode extends BigIntegerNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareBigIntegerNode(BigInteger v, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareBigIntegerNode(BigInteger v, JsonLocation tokenStreamLocation) {
         super(v);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareBinaryNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareBinaryNode.java

@@ -19,28 +19,28 @@
 import com.fasterxml.jackson.databind.node.BinaryNode;
 
 /**
- * {@link BinaryNode} that is {@link JsonLocationAware}.
+ * {@link BinaryNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareBinaryNode extends BinaryNode implements JsonLocationAware {
+public class TokenStreamLocationAwareBinaryNode extends BinaryNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareBinaryNode(byte[] data, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareBinaryNode(byte[] data, JsonLocation tokenStreamLocation) {
         super(data);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
-    public JsonLocationAwareBinaryNode(byte[] data, int offset, int length, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareBinaryNode(byte[] data, int offset, int length, JsonLocation tokenStreamLocation) {
         super(data, offset, length);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareBooleanNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareBooleanNode.java

@@ -19,22 +19,22 @@
 import com.fasterxml.jackson.databind.node.BooleanNode;
 
 /**
- * {@link BooleanNode} that is {@link JsonLocationAware}.
+ * {@link BooleanNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareBooleanNode extends BooleanNode implements JsonLocationAware {
+public class TokenStreamLocationAwareBooleanNode extends BooleanNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareBooleanNode(boolean v, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareBooleanNode(boolean v, JsonLocation tokenStreamLocation) {
         super(v);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareDecimalNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareDecimalNode.java

@@ -21,22 +21,22 @@
 import com.fasterxml.jackson.databind.node.DecimalNode;
 
 /**
- * {@link DecimalNode} that is {@link JsonLocationAware}.
+ * {@link DecimalNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareDecimalNode extends DecimalNode implements JsonLocationAware {
+public class TokenStreamLocationAwareDecimalNode extends DecimalNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareDecimalNode(BigDecimal v, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareDecimalNode(BigDecimal v, JsonLocation tokenStreamLocation) {
         super(v);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareDoubleNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareDoubleNode.java

@@ -19,22 +19,22 @@
 import com.fasterxml.jackson.databind.node.DoubleNode;
 
 /**
- * {@link DoubleNode} that is {@link JsonLocationAware}.
+ * {@link DoubleNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareDoubleNode extends DoubleNode implements JsonLocationAware {
+public class TokenStreamLocationAwareDoubleNode extends DoubleNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareDoubleNode(double v, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareDoubleNode(double v, JsonLocation tokenStreamLocation) {
         super(v);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }

src/main/java/com/networknt/schema/serialization/node/JsonLocationAwareFloatNode.java renamed to src/main/java/com/networknt/schema/serialization/node/TokenStreamLocationAwareFloatNode.java

@@ -19,22 +19,22 @@
 import com.fasterxml.jackson.databind.node.FloatNode;
 
 /**
- * {@link FloatNode} that is {@link JsonLocationAware}.
+ * {@link FloatNode} that is {@link TokenStreamLocationAware}.
  */
-public class JsonLocationAwareFloatNode extends FloatNode implements JsonLocationAware {
+public class TokenStreamLocationAwareFloatNode extends FloatNode implements TokenStreamLocationAware {
     /**
      * 
      */
     private static final long serialVersionUID = 1L;
-    private final JsonLocation tokenLocation;
+    private final JsonLocation tokenStreamLocation;
 
-    public JsonLocationAwareFloatNode(float v, JsonLocation tokenLocation) {
+    public TokenStreamLocationAwareFloatNode(float v, JsonLocation tokenStreamLocation) {
         super(v);
-        this.tokenLocation = tokenLocation;
+        this.tokenStreamLocation = tokenStreamLocation;
     }
 
     @Override
-    public JsonLocation tokenLocation() {
-        return this.tokenLocation;
+    public JsonLocation tokenStreamLocation() {
+        return this.tokenStreamLocation;
     }
 }