Fix #3535

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -45,6 +45,7 @@ Project: jackson-databind
   from parser nor use real defaults
 #3530: Change LRUMap to just evict one entry when maxEntries reached
  (contributed by @pjfanning)
+#3535: Replace `JsonNode.with()` with `JsonNode.withObject()`
 
 2.13.4 (not yet released)
 

src/main/java/com/fasterxml/jackson/databind/JsonNode.java

@@ -1084,23 +1084,27 @@ public final List<JsonNode> findParents(String fieldName)
      * If the node method is called on is not Object node,
      * or if property exists and has value that is not Object node,
      * {@link UnsupportedOperationException} is thrown
-     *<p>
-     * NOTE: since 2.10 has had co-variant return type
      */
-    public <T extends JsonNode> T with(String propertyName) {
+    public <T extends JsonNode> T withObject(String propertyName) {
         throw new UnsupportedOperationException("JsonNode not of type ObjectNode (but "
                 +getClass().getName()+"), cannot call with() on it");
     }
 
+    /**
+     * @deprecated Since 2.14 use {@code withObject} instead
+     */
+    @Deprecated // since 2.14
+    public final <T extends JsonNode> T with(String propertyName) {
+        return withObject(propertyName);
+    }
+
     /**
      * Method that can be called on Object nodes, to access a property
      * that has <code>Array</code> value; or if no such property exists, to create,
      * add and return such Array node.
      * If the node method is called on is not Object node,
      * or if property exists and has value that is not Array node,
      * {@link UnsupportedOperationException} is thrown
-     *<p>
-     * NOTE: since 2.10 has had co-variant return type
      */
     public <T extends JsonNode> T withArray(String propertyName) {
         throw new UnsupportedOperationException("JsonNode not of type ObjectNode (but "

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

@@ -150,7 +150,7 @@ public Iterator<Map.Entry<String, JsonNode>> fields() {
 
     @SuppressWarnings("unchecked")
     @Override
-    public ObjectNode with(String propertyName) {
+    public ObjectNode withObject(String propertyName) {
         JsonNode n = _children.get(propertyName);
         if (n != null) {
             if (n instanceof ObjectNode) {

src/test/java/com/fasterxml/jackson/databind/node/NodeJDKSerializationTest.java

@@ -25,7 +25,7 @@ public void testObjectNodeSerialization() throws Exception
         root.put("answer", 42);
         ArrayNode arr = root.withArray("matrix");
         arr.add(1).add(12345678901L).add(true).add("...");
-        ObjectNode misc = root.with("misc");
+        ObjectNode misc = root.withObject("misc");
         misc.put("value", 0.25);
 
         testNodeRoundtrip(root);

src/test/java/com/fasterxml/jackson/databind/node/ObjectNodeTest.java

@@ -303,7 +303,7 @@ public void testValidWith() throws Exception
     {
         ObjectNode root = MAPPER.createObjectNode();
         assertEquals("{}", MAPPER.writeValueAsString(root));
-        JsonNode child = root.with("prop");
+        JsonNode child = root.withObject("prop");
         assertTrue(child instanceof ObjectNode);
         assertEquals("{\"prop\":{}}", MAPPER.writeValueAsString(root));
     }
@@ -321,7 +321,7 @@ public void testInvalidWith() throws Exception
     {
         JsonNode root = MAPPER.createArrayNode();
         try { // should not work for non-ObjectNode nodes:
-            root.with("prop");
+            root.withObject("prop");
             fail("Expected exception");
         } catch (UnsupportedOperationException e) {
             verifyException(e, "not of type ObjectNode");
@@ -330,7 +330,7 @@ public void testInvalidWith() throws Exception
         ObjectNode root2 = MAPPER.createObjectNode();
         root2.put("prop", 13);
         try { // should not work for non-ObjectNode nodes:
-            root2.with("prop");
+            root2.withObject("prop");
             fail("Expected exception");
         } catch (UnsupportedOperationException e) {
             verifyException(e, "has value that is not");