Fix #2339

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -879,3 +879,5 @@ Manuel Hegner (manuel-hegner@github)
 Victor Noël (victornoel@github)
   * Reported #2338: Suboptimal return type for `JsonNode.withArray()`
    (2.10.0)
+  * Reported #2339: Suboptimal return type for `ObjectNode.set()`
+   (2.10.0)

release-notes/VERSION-2.x

@@ -46,6 +46,8 @@ Project: jackson-databind
  (suggested by Manuel H)
 #2338: Suboptimal return type for `JsonNode.withArray()`
  (reported by Victor N)
+2339: Suboptimal return type for `ObjectNode.set()`
+ (reported by Victor N)
 
 2.9.9 (16-May-2019)
 

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

@@ -358,6 +358,8 @@ public void serializeWithType(JsonGenerator g, SerializerProvider provider,
      *<p>
      * NOTE: added to replace those uses of {@link #put(String, JsonNode)}
      * where chaining with 'this' is desired.
+     *<p>
+     * NOTE: co-variant return type since 2.10
      *
      * @param value to set field to; if null, will be converted
      *   to a {@link NullNode} first  (to remove field entry, call
@@ -367,26 +369,30 @@ public void serializeWithType(JsonGenerator g, SerializerProvider provider,
      *
      * @since 2.1
      */
-    public JsonNode set(String fieldName, JsonNode value)
+    @SuppressWarnings("unchecked")
+    public <T extends JsonNode> T set(String fieldName, JsonNode value)
     {
         if (value == null) {
             value = nullNode();
         }
         _children.put(fieldName, value);
-        return this;
+        return (T) this;
     }
 
     /**
      * Method for adding given properties to this object node, overriding
      * any existing values for those properties.
+     *<p>
+     * NOTE: co-variant return type since 2.10
      * 
      * @param properties Properties to add
      * 
      * @return This node after adding/replacing property values (to allow chaining)
      *
      * @since 2.1
      */
-    public JsonNode setAll(Map<String,? extends JsonNode> properties)
+    @SuppressWarnings("unchecked")
+    public <T extends JsonNode> T setAll(Map<String,? extends JsonNode> properties)
     {
         for (Map.Entry<String,? extends JsonNode> en : properties.entrySet()) {
             JsonNode n = en.getValue();
@@ -395,25 +401,28 @@ public JsonNode setAll(Map<String,? extends JsonNode> properties)
             }
             _children.put(en.getKey(), n);
         }
-        return this;
+        return (T) this;
     }
 
     /**
      * Method for adding all properties of the given Object, overriding
      * any existing values for those properties.
+     *<p>
+     * NOTE: co-variant return type since 2.10
      * 
      * @param other Object of which properties to add to this object
      *
      * @return This node after addition (to allow chaining)
      *
      * @since 2.1
      */
-    public JsonNode setAll(ObjectNode other)
+    @SuppressWarnings("unchecked")
+    public <T extends JsonNode> T setAll(ObjectNode other)
     {
         _children.putAll(other._children);
-        return this;
+        return (T) this;
     }
-    
+
     /**
      * Method for replacing value of specific property with passed
      * value, and returning value (or null if none).
@@ -437,31 +446,37 @@ public JsonNode replace(String fieldName, JsonNode value)
     /**
      * Method for removing field entry from this ObjectNode, and
      * returning instance after removal.
+     *<p>
+     * NOTE: co-variant return type since 2.10
      * 
      * @return This node after removing entry (if any)
      * 
      * @since 2.1
      */
-    public JsonNode without(String fieldName)
+    @SuppressWarnings("unchecked")
+    public <T extends JsonNode> T without(String fieldName)
     {
         _children.remove(fieldName);
-        return this;
+        return (T) this;
     }
 
     /**
      * Method for removing specified field properties out of
      * this ObjectNode.
+     *<p>
+     * NOTE: co-variant return type since 2.10
      * 
      * @param fieldNames Names of fields to remove
      * 
      * @return This node after removing entries
      * 
      * @since 2.1
      */
-    public ObjectNode without(Collection<String> fieldNames)
+    @SuppressWarnings("unchecked")
+    public <T extends JsonNode> T without(Collection<String> fieldNames)
     {
         _children.keySet().removeAll(fieldNames);
-        return this;
+        return (T) this;
     }
 
     /*
@@ -490,7 +505,7 @@ public JsonNode put(String fieldName, JsonNode value)
         }
         return _children.put(fieldName, value);
     }
-    
+
     /**
      * Method for removing field entry from this ObjectNode.
      * Will return value of the field, if such field existed;