Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit 09ec797ff46b · 2025-07-26T11:20:08.000-07:00
diff --git a/datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalTest.java b/datatypes/src/test/java/com/fasterxml/jackson/datatype/jdk8/OptionalTest.java
@@ -284,12 +284,10 @@ public void testTypeResolution() throws Exception
     }
 
     // [modules-java8#372]
-    public void testIssue372() throws Exception
+    public void testIssue372Deser() throws Exception
     {
         JsonNode input = MAPPER.getNodeFactory().textNode("abc");
-        //JavaType type = MAPPER.getTypeFactory().constructType(Optional.class);
         JavaType type = TypeFactory.defaultInstance().constructType(Optional.class);
-        //JavaType type = MAPPER.constructType(Optional.class);
         Optional<?> value = MAPPER.readValue(MAPPER.treeAsTokens(input), type);
         assertEquals(Optional.of("abc"), value);
     }

Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,10 @@ public void testTypeResolution() throws Exception`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`// [modules-java8#372]`
`287`		`- public void testIssue372() throws Exception`
	`287`	`+ public void testIssue372Deser() throws Exception`
`288`	`288`	`{`
`289`	`289`	`JsonNode input = MAPPER.getNodeFactory().textNode("abc");`
`290`		`- //JavaType type = MAPPER.getTypeFactory().constructType(Optional.class);`
`291`	`290`	`JavaType type = TypeFactory.defaultInstance().constructType(Optional.class);`
`292`		`- //JavaType type = MAPPER.constructType(Optional.class);`
`293`	`291`	`Optional<?> value = MAPPER.readValue(MAPPER.treeAsTokens(input), type);`
`294`	`292`	`assertEquals(Optional.of("abc"), value);`
`295`	`293`	`}`