Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit 682fd2fb764e · 2024-10-23T21:24:03.000-07:00
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -213,7 +213,7 @@ public void testCopyWith() throws Exception {
         JsonNode readResult = copiedMapper.readTree(json);
         // validate functionality
         assertEquals("Black", readResult.get("color").asText());
-        assertEquals(true, readResult.get("free").asBoolean());
+        assertTrue(readResult.get("free").asBoolean());
         assertEquals(204, readResult.get("pages").asInt());
         String readResultAsString = _unifyLFs("{\n  \"color\" : \"Black\",\n  \"free\" : \"true\",\n  \"pages\" : \"204.04\"\n}");
         assertEquals(readResultAsString, _unifyLFs(mapper.writeValueAsString(readResult)));
diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/CoerceToBooleanTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/CoerceToBooleanTest.java
@@ -195,14 +195,14 @@ public void testIntToBooleanCoercionSuccessPojo() throws Exception
         final ObjectReader r = DEFAULT_MAPPER.readerFor(BooleanPOJO.class);
 
         p = r.readValue(DOC_WITH_0);
-        assertEquals(false, p.value);
+        assertFalse(p.value);
         p = r.readValue(utf8Bytes(DOC_WITH_0));
-        assertEquals(false, p.value);
+        assertFalse(p.value);
 
         p = r.readValue(DOC_WITH_1);
-        assertEquals(true, p.value);
+        assertTrue(p.value);
         p = r.readValue(utf8Bytes(DOC_WITH_1));
-        assertEquals(true, p.value);
+        assertTrue(p.value);
     }
 
     @Test
@@ -221,12 +221,12 @@ public void testIntToBooleanCoercionSuccessRoot() throws Exception
 
         ab = atomicR.readValue(" 0");
         ab = atomicR.readValue(utf8Bytes(" 0"));
-        assertEquals(false, ab.get());
+        assertFalse(ab.get());
 
         ab = atomicR.readValue(" 111");
-        assertEquals(true, ab.get());
+        assertTrue(ab.get());
         ab = atomicR.readValue(utf8Bytes(" 111"));
-        assertEquals(true, ab.get());
+        assertTrue(ab.get());
     }
 
     // Test for verifying that Long values are coerced to boolean correctly as well
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderWithUnwrappedTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderWithUnwrappedTest.java
@@ -12,6 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
 
@@ -232,7 +233,7 @@ public void testWithUnwrappedAndCreatorSingleParameterAtBeginning() throws Excep
         assertEquals("John", person.getName().getFirst());
         assertEquals("Doe", person.getName().getLast());
         assertEquals(30, person.getAge());
-        assertEquals(true, person.isAlive());
+        assertTrue(person.isAlive());
     }
 
     @Test
@@ -246,7 +247,7 @@ public void testWithUnwrappedAndCreatorSingleParameterInMiddle() throws Exceptio
         assertEquals("John", person.getName().getFirst());
         assertEquals("Doe", person.getName().getLast());
         assertEquals(30, person.getAge());
-        assertEquals(true, person.isAlive());
+        assertTrue(person.isAlive());
     }
 
     @Test
@@ -260,7 +261,7 @@ public void testWithUnwrappedAndCreatorSingleParameterAtEnd() throws Exception {
         assertEquals("John", person.getName().getFirst());
         assertEquals("Doe", person.getName().getLast());
         assertEquals(30, person.getAge());
-        assertEquals(true, person.isAlive());
+        assertTrue(person.isAlive());
     }
 
     @Test
@@ -274,7 +275,7 @@ public void testWithUnwrappedAndCreatorMultipleParametersAtBeginning() throws Ex
         assertEquals("John", animal.getName().getFirst());
         assertEquals("Doe", animal.getName().getLast());
         assertEquals(30, animal.getAge());
-        assertEquals(true, animal.isAlive());
+        assertTrue(animal.isAlive());
     }
 
     @Test
@@ -288,7 +289,7 @@ public void testWithUnwrappedAndCreatorMultipleParametersInMiddle() throws Excep
         assertEquals("John", animal.getName().getFirst());
         assertEquals("Doe", animal.getName().getLast());
         assertEquals(30, animal.getAge());
-        assertEquals(true, animal.isAlive());
+        assertTrue(animal.isAlive());
     }
 
     @Test
@@ -302,7 +303,7 @@ public void testWithUnwrappedAndCreatorMultipleParametersAtEnd() throws Exceptio
         assertEquals("John", animal.getName().getFirst());
         assertEquals("Doe", animal.getName().getLast());
         assertEquals(30, animal.getAge());
-        assertEquals(true, animal.isAlive());
+        assertTrue(animal.isAlive());
     }
 
     @Test
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/PolymorphicPropsCreatorsTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/PolymorphicPropsCreatorsTest.java
@@ -159,7 +159,7 @@ public void testManualPolymorphicCatBasic() throws Exception
         Cat cat = (Cat) animal;
         assertEquals(18, cat.lives);
         // ok, he can't drink dairy products. Let's verify:
-        assertEquals(false, cat.likesCream);
+        assertFalse(cat.likesCream);
     }
 
     @Test
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators.java
@@ -435,7 +435,7 @@ public void testConstructorAndProps() throws Exception
             ("{ \"a\" : \"1\", \"b\": 2, \"c\" : true }", ConstructorAndPropsBean.class);
         assertEquals(1, bean.a);
         assertEquals(2, bean.b);
-        assertEquals(true, bean.c);
+        assertTrue(bean.c);
     }
 
     @Test
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/filter/NullConversionsForContentTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/filter/NullConversionsForContentTest.java
@@ -288,7 +288,7 @@ public void testNullsAsEmptyWithPrimitiveArrays() throws Exception
             NullContentAsEmpty<boolean[]> result = MAPPER.readValue(JSON,
                     new TypeReference<NullContentAsEmpty<boolean[]>>() { });
             assertEquals(1, result.values.length);
-            assertEquals(false, result.values[0]);
+            assertFalse(result.values[0]);
         }
 }
 
@@ -437,8 +437,8 @@ public void testNullsSkipWithPrimitiveArrays() throws Exception
             NullContentSkip<boolean[]> result = MAPPER.readValue(JSON,
                     new TypeReference<NullContentSkip<boolean[]>>() { });
             assertEquals(2, result.values.length);
-            assertEquals(true, result.values[0]);
-            assertEquals(true, result.values[1]);
+            assertTrue(result.values[0]);
+            assertTrue(result.values[1]);
         }
     }
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsDeserTest.java
@@ -530,7 +530,7 @@ public void testNullForPrimitivesDefault() throws IOException
                 PrimitivesBean.class);
         assertNotNull(bean);
         assertEquals(0, bean.intValue);
-        assertEquals(false, bean.booleanValue);
+        assertFalse(bean.booleanValue);
         assertEquals(0.0, bean.doubleValue);
 
         bean = MAPPER.readValue("{\"byteValue\":null, \"longValue\":null, \"floatValue\":null}",
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsonschema/TestGenerateJsonSchema.java b/src/test/java/com/fasterxml/jackson/databind/jsonschema/TestGenerateJsonSchema.java
@@ -151,37 +151,37 @@ public void testOldSchemaGeneration() throws Exception
 
         ObjectNode root = jsonSchema.getSchemaNode();
         assertEquals("object", root.get("type").asText());
-        assertEquals(false, root.path("required").booleanValue());
+        assertFalse(root.path("required").booleanValue());
         JsonNode propertiesSchema = root.get("properties");
         assertNotNull(propertiesSchema);
         JsonNode property1Schema = propertiesSchema.get("property1");
         assertNotNull(property1Schema);
         assertEquals("integer", property1Schema.get("type").asText());
-        assertEquals(false, property1Schema.path("required").booleanValue());
+        assertFalse(property1Schema.path("required").booleanValue());
         JsonNode property2Schema = propertiesSchema.get("property2");
         assertNotNull(property2Schema);
         assertEquals("string", property2Schema.get("type").asText());
-        assertEquals(false, property2Schema.path("required").booleanValue());
+        assertFalse(property2Schema.path("required").booleanValue());
         JsonNode property3Schema = propertiesSchema.get("property3");
         assertNotNull(property3Schema);
         assertEquals("array", property3Schema.get("type").asText());
-        assertEquals(false, property3Schema.path("required").booleanValue());
+        assertFalse(property3Schema.path("required").booleanValue());
         assertEquals("string", property3Schema.get("items").get("type").asText());
         JsonNode property4Schema = propertiesSchema.get("property4");
         assertNotNull(property4Schema);
         assertEquals("array", property4Schema.get("type").asText());
-        assertEquals(false, property4Schema.path("required").booleanValue());
+        assertFalse(property4Schema.path("required").booleanValue());
         assertEquals("number", property4Schema.get("items").get("type").asText());
 
         JsonNode property5Schema = propertiesSchema.get("property5");
         assertNotNull(property5Schema);
         assertEquals("string", property5Schema.get("type").asText());
-        assertEquals(true, property5Schema.path("required").booleanValue());
+        assertTrue(property5Schema.path("required").booleanValue());
 
         JsonNode property6Schema = propertiesSchema.get("property6");
         assertNotNull(property6Schema);
         assertEquals("integer", property6Schema.get("type").asText());
-        assertEquals(false, property6Schema.path("required").booleanValue());
+        assertFalse(property6Schema.path("required").booleanValue());
     }
 
     @JsonFilter("filteredBean")
diff --git a/src/test/java/com/fasterxml/jackson/databind/node/JsonNodeConversionsTest.java b/src/test/java/com/fasterxml/jackson/databind/node/JsonNodeConversionsTest.java
@@ -141,18 +141,18 @@ public void testAsInt() throws Exception
     @Test
     public void testAsBoolean() throws Exception
     {
-        assertEquals(false, BooleanNode.FALSE.asBoolean());
-        assertEquals(true, BooleanNode.TRUE.asBoolean());
-        assertEquals(false, IntNode.valueOf(0).asBoolean());
-        assertEquals(true, IntNode.valueOf(1).asBoolean());
-        assertEquals(false, LongNode.valueOf(0).asBoolean());
-        assertEquals(true, LongNode.valueOf(-34L).asBoolean());
-        assertEquals(true, new TextNode("true").asBoolean());
-        assertEquals(false, new TextNode("false").asBoolean());
-        assertEquals(false, new TextNode("barf").asBoolean());
-        assertEquals(true, new TextNode("barf").asBoolean(true));
-
-        assertEquals(true, new POJONode(Boolean.TRUE).asBoolean());
+        assertFalse(BooleanNode.FALSE.asBoolean());
+        assertTrue(BooleanNode.TRUE.asBoolean());
+        assertFalse(IntNode.valueOf(0).asBoolean());
+        assertTrue(IntNode.valueOf(1).asBoolean());
+        assertFalse(LongNode.valueOf(0).asBoolean());
+        assertTrue(LongNode.valueOf(-34L).asBoolean());
+        assertTrue(new TextNode("true").asBoolean());
+        assertFalse(new TextNode("false").asBoolean());
+        assertFalse(new TextNode("barf").asBoolean());
+        assertTrue(new TextNode("barf").asBoolean(true));
+
+        assertTrue(new POJONode(Boolean.TRUE).asBoolean());
     }
 
     // Deserializer to trigger the problem described in [JACKSON-554]
diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/FormatFeatureAcceptSingleTest.java b/src/test/java/com/fasterxml/jackson/databind/struct/FormatFeatureAcceptSingleTest.java
@@ -15,7 +15,9 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FormatFeatureAcceptSingleTest extends DatabindTestUtil
 {
@@ -213,7 +215,7 @@ public void testSingleBooleanArrayRead() throws Exception {
         BooleanArrayWrapper result = MAPPER.readValue(json, BooleanArrayWrapper.class);
         assertNotNull(result.values);
         assertEquals(1, result.values.length);
-        assertEquals(true, result.values[0]);
+        assertTrue(result.values[0]);
     }
 
     @Test
diff --git a/src/test/java/com/fasterxml/jackson/databind/struct/SingleValueAsArrayTest.java b/src/test/java/com/fasterxml/jackson/databind/struct/SingleValueAsArrayTest.java
@@ -14,7 +14,9 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SingleValueAsArrayTest extends DatabindTestUtil
 {
@@ -105,6 +107,6 @@ public void testPrimitives() throws Exception {
 
         boolean[] b = MAPPER.readValue("true", boolean[].class);
         assertEquals(1, d.length);
-        assertEquals(true, b[0]);
+        assertTrue(b[0]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public void testManualPolymorphicCatBasic() throws Exception`
`159`	`159`	`Cat cat = (Cat) animal;`
`160`	`160`	`assertEquals(18, cat.lives);`
`161`	`161`	`// ok, he can't drink dairy products. Let's verify:`
`162`		`- assertEquals(false, cat.likesCream);`
	`162`	`+ assertFalse(cat.likesCream);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ public void testConstructorAndProps() throws Exception`
`435`	`435`	`("{ \"a\" : \"1\", \"b\": 2, \"c\" : true }", ConstructorAndPropsBean.class);`
`436`	`436`	`assertEquals(1, bean.a);`
`437`	`437`	`assertEquals(2, bean.b);`
`438`		`- assertEquals(true, bean.c);`
	`438`	`+ assertTrue(bean.c);`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public void testNullsAsEmptyWithPrimitiveArrays() throws Exception`
`288`	`288`	`NullContentAsEmpty<boolean[]> result = MAPPER.readValue(JSON,`
`289`	`289`	`new TypeReference<NullContentAsEmpty<boolean[]>>() { });`
`290`	`290`	`assertEquals(1, result.values.length);`
`291`		`- assertEquals(false, result.values[0]);`
	`291`	`+ assertFalse(result.values[0]);`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
`@@ -437,8 +437,8 @@ public void testNullsSkipWithPrimitiveArrays() throws Exception`
`437`	`437`	`NullContentSkip<boolean[]> result = MAPPER.readValue(JSON,`
`438`	`438`	`new TypeReference<NullContentSkip<boolean[]>>() { });`
`439`	`439`	`assertEquals(2, result.values.length);`
`440`		`- assertEquals(true, result.values[0]);`
`441`		`- assertEquals(true, result.values[1]);`
	`440`	`+ assertTrue(result.values[0]);`
	`441`	`+ assertTrue(result.values[1]);`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`