Fix #4992: rename JsonNodeFactory.textNode() as stringNode()

Author: cowtowncoder

release-notes/VERSION

@@ -98,6 +98,8 @@ Versions: 3.x (for earlier see VERSION-2.x)
   `JsonNode.xxxStringYyy()` [JSTEP-3]
 #4891: Change 3.0 to use `module-info.java` directly for build (instead of via Moditect)
 #4956: Rename `JsonNode.isContainerNode()` as `isContainerNode()`
+#4992: Add `JsonNodeFactory.stringNode()` as replacement for
+ `JsonNodeFactory.textNode()` [JSTEP-3]
 - Remove `MappingJsonFactory`
 - Add context parameter for `TypeSerializer` contextualization (`forProperty()`)
 - Default for `JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES` changed to `false` for 3.0

src/main/java/tools/jackson/databind/ObjectMapper.java

@@ -859,7 +859,7 @@ public JsonNode booleanNode(boolean b) {
 
     @Override
     public JsonNode stringNode(String text) {
-        return _deserializationConfig.getNodeFactory().textNode(text);
+        return _deserializationConfig.getNodeFactory().stringNode(text);
     }
 
     @Override

src/main/java/tools/jackson/databind/ObjectReader.java

@@ -993,7 +993,7 @@ public JsonNode booleanNode(boolean b) {
 
     @Override
     public JsonNode stringNode(String text) {
-        return _config.getNodeFactory().textNode(text);
+        return _config.getNodeFactory().stringNode(text);
     }
 
     @Override

src/main/java/tools/jackson/databind/deser/jackson/BaseNodeDeserializer.java

@@ -262,7 +262,7 @@ protected final JsonNode updateObject(JsonParser p, DeserializationContext ctxt,
                             stack, nodeFactory.arrayNode());
                     break;
                 case JsonTokenId.ID_STRING:
-                    value = nodeFactory.textNode(p.getString());
+                    value = nodeFactory.stringNode(p.getString());
                     break;
                 case JsonTokenId.ID_NUMBER_INT:
                     value = _fromInt(p, ctxt, nodeFactory);
@@ -345,7 +345,7 @@ protected final ContainerNode<?> _deserializeContainerNoRecursion(JsonParser p,
                         }
                         continue outer_loop;
                         case JsonTokenId.ID_STRING:
-                            value = nodeFactory.textNode(p.getString());
+                            value = nodeFactory.stringNode(p.getString());
                             break;
                         case JsonTokenId.ID_NUMBER_INT:
                             value = _fromInt(p, intCoercionFeats, nodeFactory);
@@ -400,7 +400,7 @@ protected final ContainerNode<?> _deserializeContainerNoRecursion(JsonParser p,
                         case JsonTokenId.ID_END_ARRAY:
                             break arrayLoop;
                         case JsonTokenId.ID_STRING:
-                            currArray.add(nodeFactory.textNode(p.getString()));
+                            currArray.add(nodeFactory.stringNode(p.getString()));
                             continue arrayLoop;
                         case JsonTokenId.ID_NUMBER_INT:
                             currArray.add(_fromInt(p, intCoercionFeats, nodeFactory));
@@ -440,7 +440,7 @@ protected final JsonNode _deserializeAnyScalar(JsonParser p, DeserializationCont
             case JsonTokenId.ID_END_OBJECT:
                 return nodeF.objectNode();
             case JsonTokenId.ID_STRING:
-                return nodeF.textNode(p.getString());
+                return nodeF.stringNode(p.getString());
             case JsonTokenId.ID_NUMBER_INT:
                 return _fromInt(p, ctxt, nodeF);
             case JsonTokenId.ID_NUMBER_FLOAT:

src/main/java/tools/jackson/databind/node/ArrayNode.java

@@ -712,7 +712,7 @@ public ArrayNode add(BigInteger v) {
      * @return This array node, to allow chaining
      */
     public ArrayNode add(String v) {
-        return _add((v == null) ? nullNode() : textNode(v));
+        return _add((v == null) ? nullNode() : stringNode(v));
     }
 
     /**
@@ -933,7 +933,7 @@ public ArrayNode insert(int index, BigInteger v) {
      * @return This array node, to allow chaining
      */
     public ArrayNode insert(int index, String v) {
-        return _insert(index, (v == null) ? nullNode() : textNode(v));
+        return _insert(index, (v == null) ? nullNode() : stringNode(v));
     }
 
     /**
@@ -1104,7 +1104,7 @@ public ArrayNode set(int index, BigInteger v) {
      * @return This node (to allow chaining)
      */
     public ArrayNode set(int index, String v) {
-        return _set(index, (v == null) ? nullNode() : textNode(v));
+        return _set(index, (v == null) ? nullNode() : stringNode(v));
     }
 
     /**

src/main/java/tools/jackson/databind/node/ContainerNode.java

@@ -151,7 +151,7 @@ public final NumericNode numberNode(long v) {
     public final ValueNode numberNode(Double v) { return _nodeFactory.numberNode(v); }
 
     @Override
-    public final StringNode textNode(String text) { return _nodeFactory.textNode(text); }
+    public final StringNode stringNode(String text) { return _nodeFactory.stringNode(text); }
 
     @Override
     public final BinaryNode binaryNode(byte[] data) { return _nodeFactory.binaryNode(data); }

src/main/java/tools/jackson/databind/node/JsonNodeCreator.java

@@ -45,7 +45,13 @@ public interface JsonNodeCreator
 
     // Textual nodes
 
-    public ValueNode textNode(String text);
+    public ValueNode stringNode(String text);
+
+    /**
+     * @deprecated since 3.0 Use {@link #stringNode(String)} instead
+     */
+    @Deprecated // since 3.0
+    public default ValueNode textNode(String text) { return stringNode(text); }
 
     // Other value (non-structured) nodes
 

src/main/java/tools/jackson/databind/node/JsonNodeFactory.java

@@ -241,7 +241,7 @@ public ValueNode numberNode(BigDecimal v)
      * String value
      */
     @Override
-    public StringNode textNode(String text) { return StringNode.valueOf(text); }
+    public StringNode stringNode(String text) { return StringNode.valueOf(text); }
 
     /**
      * Factory method for constructing a node that represents given

src/main/java/tools/jackson/databind/node/ObjectNode.java

@@ -966,7 +966,7 @@ public ObjectNode put(String propertyName, BigInteger v) {
      */
     public ObjectNode put(String propertyName, String v) {
         return _put(propertyName, (v == null) ? nullNode()
-                : textNode(v));
+                : stringNode(v));
     }
 
     /**

src/main/java/tools/jackson/databind/node/TreeBuildingGenerator.java

@@ -615,7 +615,7 @@ public TreeWriteContext createChildObjectContext(Object currValue)
         @Override
         public void writeNumber(ValueNode v) { _node = v; }
         @Override
-        public void writeString(String v) { _node = _nodeFactory.textNode(v); }
+        public void writeString(String v) { _node = _nodeFactory.stringNode(v); }
 
         @Override
         public void writePOJO(Object value) { _node = _nodeFactory.pojoNode(value); }

src/test/java/tools/jackson/databind/node/ArrayNodeTest.java

@@ -117,7 +117,7 @@ public void testDirectCreation2() throws Exception
         JsonNodeFactory f = MAPPER.getNodeFactory();
         ArrayList<JsonNode> list = new ArrayList<>();
         list.add(f.booleanNode(true));
-        list.add(f.textNode("foo"));
+        list.add(f.stringNode("foo"));
         ArrayNode n = new ArrayNode(f, list);
         assertEquals(2, n.size());
         assertTrue(n.get(0).isBoolean());

src/test/java/tools/jackson/databind/node/NodeJDKSerializationTest.java

@@ -84,7 +84,7 @@ public void testScalarSerialization() throws Exception
     {
         testNodeRoundtrip(MAPPER.getNodeFactory().nullNode());
 
-        testNodeRoundtrip(MAPPER.getNodeFactory().textNode("Foobar"));
+        testNodeRoundtrip(MAPPER.getNodeFactory().stringNode("Foobar"));
 
         testNodeRoundtrip(MAPPER.getNodeFactory().booleanNode(true));
         testNodeRoundtrip(MAPPER.getNodeFactory().booleanNode(false));

src/test/java/tools/jackson/databind/node/ObjectNodeTest.java

@@ -202,7 +202,7 @@ public void testBasicsPutSet()
         final JsonNodeFactory f = JsonNodeFactory.instance;
         ObjectNode root = f.objectNode();
         JsonNode old;
-        old = root.putIfAbsent("key", f.textNode("foobar"));
+        old = root.putIfAbsent("key", f.stringNode("foobar"));
         assertNull(old);
         assertEquals(1, root.size());
         old = root.putIfAbsent("key", f.numberNode(3));
@@ -528,7 +528,7 @@ public void testPropertiesTraversal() throws Exception
     {
         // Nothing to traverse for other types
         assertEquals("", _toString(MAPPER.createArrayNode()));
-        assertEquals("", _toString(MAPPER.getNodeFactory().textNode("foo")));
+        assertEquals("", _toString(MAPPER.getNodeFactory().stringNode("foo")));
 
         // But yes for ObjectNode:
         JsonNode n = MAPPER.readTree(a2q(
@@ -543,7 +543,7 @@ public void testStreamMethods()
         ObjectMapper mapper = objectMapper();
         ObjectNode obj = mapper.createObjectNode();
         JsonNode n1 = obj.numberNode(42);
-        JsonNode n2 = obj.textNode("foo");
+        JsonNode n2 = obj.stringNode("foo");
 
         obj.set("a", n1);
         obj.set("b", n2);