Merge branch '3.0' into 3.x

cowtowncoder · cowtowncoder · commit b4c10c981113 · 2025-11-19T16:25:09.000-08:00
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -92,3 +92,8 @@ Rob Winch (@rwinch)
  * Reported, contributed fix for #5354: jackson-databind 3.0.0 renders `callbacks`
    property from Spring CGLIB Proxy
   [3.0.1]
+
+Joost Koehoorn (@JoostK)
+ * Reported, contributed fix for #5401: Regression with `@JsonCreator` that returns
+   `null` for empty strings
+  [3.0.3]
diff --git a/src/test/java/tools/jackson/databind/deser/creators/JsonCreatorReturningNullTest.java b/src/test/java/tools/jackson/databind/deser/creators/JsonCreatorReturningNullTest.java
@@ -14,7 +14,7 @@
 
 // [databind#4938] Allow JsonCreator factory method to return `null`
 // [databind#5401] Do not replace null from JsonCreator factory method
-public class JsonCreatorReturningNull4938Test
+public class JsonCreatorReturningNullTest
     extends DatabindTestUtil
 {
     // [databind#4938]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	// [databind#4938] Allow JsonCreator factory method to return `null`
`16`	`16`	`// [databind#5401] Do not replace null from JsonCreator factory method`
`17`		`-public class JsonCreatorReturningNull4938Test`
	`17`	`+public class JsonCreatorReturningNullTest`
`18`	`18`	`extends DatabindTestUtil`
`19`	`19`	`{`
`20`	`20`	`// [databind#4938]`