Clean up as prep for #4997

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/node/ObjectNode.java

@@ -618,8 +618,7 @@ public <T extends JsonNode> T set(String propertyName, JsonNode value)
         if (value == null) {
             value = nullNode();
         }
-        _children.put(propertyName, value);
-        return (T) this;
+        return (T) _put(propertyName, value);
     }
 
     /**
@@ -961,8 +960,7 @@ public ObjectNode putRawValue(String propertyName, RawValue raw) {
      */
     public ObjectNode putNull(String propertyName)
     {
-        _children.put(propertyName, nullNode());
-        return this;
+        return _put(propertyName, nullNode());
     }
 
     /**
@@ -980,8 +978,8 @@ public ObjectNode put(String propertyName, short v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Short v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Short v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v.shortValue()));
     }
 
@@ -994,8 +992,8 @@ public ObjectNode put(String fieldName, Short v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, int v) {
-        return _put(fieldName, numberNode(v));
+    public ObjectNode put(String propertyName, int v) {
+        return _put(propertyName, numberNode(v));
     }
 
     /**
@@ -1004,8 +1002,8 @@ public ObjectNode put(String fieldName, int v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Integer v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Integer v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v.intValue()));
     }
 
@@ -1018,8 +1016,8 @@ public ObjectNode put(String fieldName, Integer v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, long v) {
-        return _put(fieldName, numberNode(v));
+    public ObjectNode put(String propertyName, long v) {
+        return _put(propertyName, numberNode(v));
     }
 
     /**
@@ -1034,8 +1032,8 @@ public ObjectNode put(String fieldName, long v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Long v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Long v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v.longValue()));
     }
 
@@ -1044,8 +1042,8 @@ public ObjectNode put(String fieldName, Long v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, float v) {
-        return _put(fieldName, numberNode(v));
+    public ObjectNode put(String propertyName, float v) {
+        return _put(propertyName, numberNode(v));
     }
 
     /**
@@ -1054,8 +1052,8 @@ public ObjectNode put(String fieldName, float v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Float v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Float v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v.floatValue()));
     }
 
@@ -1064,8 +1062,8 @@ public ObjectNode put(String fieldName, Float v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, double v) {
-        return _put(fieldName, numberNode(v));
+    public ObjectNode put(String propertyName, double v) {
+        return _put(propertyName, numberNode(v));
     }
 
     /**
@@ -1074,8 +1072,8 @@ public ObjectNode put(String fieldName, double v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Double v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Double v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v.doubleValue()));
     }
 
@@ -1084,8 +1082,8 @@ public ObjectNode put(String fieldName, Double v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, BigDecimal v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, BigDecimal v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v));
     }
 
@@ -1096,8 +1094,8 @@ public ObjectNode put(String fieldName, BigDecimal v) {
      *
      * @since 2.9
      */
-    public ObjectNode put(String fieldName, BigInteger v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, BigInteger v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : numberNode(v));
     }
 
@@ -1106,8 +1104,8 @@ public ObjectNode put(String fieldName, BigInteger v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, String v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, String v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : textNode(v));
     }
 
@@ -1116,8 +1114,8 @@ public ObjectNode put(String fieldName, String v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, boolean v) {
-        return _put(fieldName, booleanNode(v));
+    public ObjectNode put(String propertyName, boolean v) {
+        return _put(propertyName, booleanNode(v));
     }
 
     /**
@@ -1126,8 +1124,8 @@ public ObjectNode put(String fieldName, boolean v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, Boolean v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, Boolean v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : booleanNode(v.booleanValue()));
     }
 
@@ -1136,8 +1134,8 @@ public ObjectNode put(String fieldName, Boolean v) {
      *
      * @return This node (to allow chaining)
      */
-    public ObjectNode put(String fieldName, byte[] v) {
-        return _put(fieldName, (v == null) ? nullNode()
+    public ObjectNode put(String propertyName, byte[] v) {
+        return _put(propertyName, (v == null) ? nullNode()
                 : binaryNode(v));
     }
 
@@ -1178,9 +1176,9 @@ public int hashCode()
     /**********************************************************
      */
 
-    protected ObjectNode _put(String fieldName, JsonNode value)
+    protected ObjectNode _put(String propertyName, JsonNode value)
     {
-        _children.put(fieldName, value);
+        _children.put(propertyName, value);
         return this;
     }
 }