Fix #4956

FasterXML · Feb 7, 2025 · 4ac1ee9 · 4ac1ee9
1 parent b72dd81
commit 4ac1ee9
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -97,6 +97,7 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #4879: Rename `TextNode` as `StringNode`; `JsonNode.xxxTextYyy()` (mostly) as
   `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()`
 - Remove `MappingJsonFactory`
 - Add context parameter for `TypeSerializer` contextualization (`forProperty()`)
 - Default for `JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES` changed to `false` for 3.0
diff --git a/src/main/java/tools/jackson/databind/JsonNode.java b/src/main/java/tools/jackson/databind/JsonNode.java
@@ -140,7 +140,7 @@ public final boolean isValueNode()
     }
 
     @Override
-    public boolean isContainerNode() {
+    public boolean isContainer() {
         return false;
     }
 

diff --git a/src/main/java/tools/jackson/databind/node/BaseJsonNode.java b/src/main/java/tools/jackson/databind/node/BaseJsonNode.java
@@ -180,7 +180,7 @@ protected boolean _withXxxMayReplace(JsonNode node, OverwriteMode overwriteMode)
         case NULLS:
             return node.isNull();
         case SCALARS:
-            return !node.isContainerNode();
+            return !node.isContainer();
         default:
         case ALL:
             return true;

diff --git a/src/main/java/tools/jackson/databind/node/ContainerNode.java b/src/main/java/tools/jackson/databind/node/ContainerNode.java
@@ -32,7 +32,7 @@ protected ContainerNode(JsonNodeFactory nc) {
     protected ContainerNode() { _nodeFactory = null; } // only for JDK ser
 
     @Override
-    public boolean isContainerNode() {
+    public boolean isContainer() {
         return true;
     }
 

diff --git a/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeyDeserializer4444Test.java b/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeyDeserializer4444Test.java
@@ -1,6 +1,5 @@
 package tools.jackson.databind.deser.jdk;
 
-import java.io.IOException;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/tools/jackson/databind/misc/TestBlocking.java b/src/test/java/tools/jackson/databind/misc/TestBlocking.java
@@ -1,7 +1,5 @@
 package tools.jackson.databind.misc;
 
-import java.io.IOException;
-
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.*;

diff --git a/src/test/java/tools/jackson/databind/node/ArrayNodeTest.java b/src/test/java/tools/jackson/databind/node/ArrayNodeTest.java
@@ -35,7 +35,7 @@ public void testDirectCreation() throws Exception
         assertFalse(n.canConvertToExactIntegral());
         assertTrue(n.isArray());
         assertFalse(n.isObject());
-        assertTrue(n.isContainerNode());
+        assertTrue(n.isContainer());
 
         assertStandardEquals(n);
         assertFalse(n.values().iterator().hasNext());

diff --git a/src/test/java/tools/jackson/databind/node/MissingNodeTest.java b/src/test/java/tools/jackson/databind/node/MissingNodeTest.java
@@ -45,7 +45,7 @@ public void testMissingViaMapper() throws Exception
         String JSON = "[ { }, [ ] ]";
         JsonNode result = objectMapper().readTree(new StringReader(JSON));
 
-        assertTrue(result.isContainerNode());
+        assertTrue(result.isContainer());
         assertTrue(result.isArray());
         assertEquals(2, result.size());
 
@@ -58,7 +58,7 @@ public void testMissingViaMapper() throws Exception
         Iterator<JsonNode> it = result.iterator();
 
         JsonNode onode = it.next();
-        assertTrue(onode.isContainerNode());
+        assertTrue(onode.isContainer());
         assertTrue(onode.isObject());
         assertEquals(0, onode.size());
         assertFalse(onode.isMissingNode()); // real node
@@ -83,7 +83,7 @@ public void testMissingViaMapper() throws Exception
         // and same for the array node
 
         JsonNode anode = it.next();
-        assertTrue(anode.isContainerNode());
+        assertTrue(anode.isContainer());
         assertTrue(anode.isArray());
         assertFalse(anode.isMissingNode()); // real node
         assertEquals(0, anode.size());

diff --git a/src/test/java/tools/jackson/databind/node/NullNodeTest.java b/src/test/java/tools/jackson/databind/node/NullNodeTest.java
@@ -33,7 +33,7 @@ public void testBasicsWithNullNode() throws Exception
         NullNode n = NullNode.instance;
 
         // basic properties
-        assertFalse(n.isContainerNode());
+        assertFalse(n.isContainer());
         assertFalse(n.isBigDecimal());
         assertFalse(n.isBigInteger());
         assertFalse(n.isBinary());

diff --git a/src/test/java/tools/jackson/databind/node/ObjectNodeTest.java b/src/test/java/tools/jackson/databind/node/ObjectNodeTest.java
@@ -80,7 +80,7 @@ public void testSimpleObject() throws Exception
 
         // basic properties first:
         assertFalse(root.isValueNode());
-        assertTrue(root.isContainerNode());
+        assertTrue(root.isContainer());
         assertFalse(root.isArray());
         assertTrue(root.isObject());
         assertEquals(2, root.size());