Minor refactoring, test improvements

Author: cowtowncoder

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

@@ -84,10 +84,7 @@ protected ObjectNode _withObject(JsonPointer origPtr,
             }
             // Ok no; must replace if allowed to
             if (!_withObjectMayReplace(n, overwriteMode)) {
-                return _reportWrongNodeType(
-                        "Cannot replace `JsonNode` of type `%s` for property \"%s\" in JSON Pointer \"%s\" (mode %s)",
-                        n.getClass().getName(), currentPtr.getMatchingProperty(),
-                        origPtr, overwriteMode);
+                _withObjectVerifyReplace(origPtr, currentPtr, overwriteMode, preferIndex, n);
             }
         }
         // Either way; must replace or add a new property

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

@@ -148,6 +148,19 @@ protected ObjectNode _withObject(JsonPointer origPtr,
         return null;
     }
 
+    protected void _withObjectVerifyReplace(JsonPointer origPtr,
+            JsonPointer currentPtr,
+            OverwriteMode overwriteMode, boolean preferIndex,
+            JsonNode toReplace)
+    {
+        if (!_withObjectMayReplace(toReplace, overwriteMode)) {
+            _reportWrongNodeType(
+"Cannot replace `JsonNode` of type `%s` for property \"%s\" in JSON Pointer \"%s\" (mode `OverwriteMode.%s`)",
+                toReplace.getClass().getName(), currentPtr.getMatchingProperty(),
+                origPtr, overwriteMode);
+        }
+    }
+
     protected boolean _withObjectMayReplace(JsonNode node, OverwriteMode overwriteMode) {
         switch (overwriteMode) {
         case NONE:

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

@@ -80,12 +80,7 @@ protected ObjectNode _withObject(JsonPointer origPtr,
                 return found;
             }
             // Ok no; must replace if allowed to
-            if (!_withObjectMayReplace(n, overwriteMode)) {
-                return _reportWrongNodeType(
-"Cannot replace `JsonNode` of type `%s` for property \"%s\" in JSON Pointer \"%s\" (mode `OverwriteMode.%s`)",
-                        n.getClass().getName(), currentPtr.getMatchingProperty(),
-                        origPtr, overwriteMode);
-            }
+            _withObjectVerifyReplace(origPtr, currentPtr, overwriteMode, preferIndex, n);
         }
         // Either way; must replace or add a new property
         return _withObjectAddTailProperty(currentPtr, preferIndex);

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

@@ -7,14 +7,14 @@
 // for [databuind#1980] implementation
 public class WithPathTest extends BaseMapTest
 {
+    private final ObjectMapper MAPPER = sharedMapper();
+
     /*
     /**********************************************************************
-    /* Test methods
+    /* Test methods, withObject()
     /**********************************************************************
      */
 
-    private final ObjectMapper MAPPER = sharedMapper();
-
     public void testValidWithObjectTrivial() throws Exception
     {
         ObjectNode root = MAPPER.createObjectNode();
@@ -77,13 +77,7 @@ public void testObjectPathWithReplace() throws Exception
         root.put("a", 13);
 
         // First, without replacement (default) get exception
-        try {
-            root.withObject(abPath);
-            fail("Should not pass");
-        } catch (UnsupportedOperationException e) {
-            verifyException(e, "Cannot replace `JsonNode` of type ");
-            verifyException(e, "(mode `OverwriteMode.NULLS`)");
-        }
+        _verifyReplaceFail(root, abPath, null);
 
         // Except fine via nulls (by default)
         root.putNull("a");
@@ -93,13 +87,7 @@ public void testObjectPathWithReplace() throws Exception
 
         // but not if prevented
         root = (ObjectNode) MAPPER.readTree(a2q("{'a':null}"));
-        try {
-            root.withObject(abPath, OverwriteMode.NONE, true);
-            fail("Should not pass");
-        } catch (UnsupportedOperationException e) {
-            verifyException(e, "Cannot replace `JsonNode` of type ");
-            verifyException(e, "(mode `OverwriteMode.NONE`)");
-        }
+        _verifyReplaceFail(root, abPath, OverwriteMode.NONE);
     }
 
     public void testValidWithObjectWithArray() throws Exception
@@ -115,10 +103,46 @@ public void testValidWithObjectWithArray() throws Exception
         // But also verify we can match
         ObjectNode match2 = root.withObject(JsonPointer.compile("/arr/2"));
         assertSame(match, match2);
-        match.put("value2", true);
+        match2.put("value2", true);
         assertEquals(a2q("{'arr':[null,null,{'value':42,'value2':true}]}"),
                 root.toString());
 
-        // And even more! `null`s can be replaced
+        // And even more! `null`s can be replaced by default
+        ObjectNode match3 = root.withObject(JsonPointer.compile("/arr/0"));
+        assertEquals("{}", match3.toString());
+        match3.put("value", "bar");
+        assertEquals(a2q("{'arr':[{'value':'bar'},null,{'value':42,'value2':true}]}"),
+                root.toString());
+
+        // But not if prevented
+        _verifyReplaceFail(root, "/arr/1", OverwriteMode.NONE);
+
+    }
+
+    private void _verifyReplaceFail(JsonNode doc, String ptrExpr, OverwriteMode mode) {
+        _verifyReplaceFail(doc, JsonPointer.compile(ptrExpr), mode);
+    }
+
+    private void _verifyReplaceFail(JsonNode doc, JsonPointer ptr, OverwriteMode mode) {
+        try {
+            if (mode == null) {
+                // default is "NULLS":
+                mode = OverwriteMode.NULLS;
+                doc.withObject(ptr);
+            } else {
+                doc.withObject(ptr, mode, true);
+            }
+            fail("Should not pass");
+        } catch (UnsupportedOperationException e) {
+            verifyException(e, "Cannot replace `JsonNode` of type ");
+            verifyException(e, "(mode `OverwriteMode."+mode.name()+"`)");
+        }
     }
+
+    /*
+    /**********************************************************************
+    /* Test methods, withArray()
+    /**********************************************************************
+     */
+
 }