Fix #2064
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
index eea9aa5..03ca396 100644
--- a/release-notes/CREDITS-2.x
+++ b/release-notes/CREDITS-2.x
@@ -800,9 +800,13 @@
Chetan Narsude (243826@github)
* Reported #2038: JDK Serializing and using Deserialized `ObjectMapper` loses linkage
back from `JsonParser.getCodec()`
- (2.9.6)
+ (2.9.6)
Petar Tahchiev (ptahchiev@github)
* Reported #2060: `UnwrappingBeanPropertyWriter` incorrectly assumes the found
serializer is of type `UnwrappingBeanSerializer`
- (2.9.6)
+ (2.9.6)
+
+Brandon Krieger (bkrieger@github)
+ * Reported #2064: Cannot set custom format for `SqlDateSerializer` globally
+ (2.9.7)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index c53f223..7b2bf67 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -9,6 +9,8 @@
#2060: `UnwrappingBeanPropertyWriter` incorrectly assumes the found serializer is
of type `UnwrappingBeanSerializer`
(reported by Petar T)
+#2064: Cannot set custom format for `SqlDateSerializer` globally
+ (reported by Brandon K)
#2079: NPE when visiting StaticListSerializerBase
(reported by WorldSEnder@github)
#2082: `FactoryBasedEnumDeserializer` should be cachable
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java
index 5b5d5d0..572d23e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java
@@ -62,9 +62,8 @@
public JsonSerializer<?> createContextual(SerializerProvider serializers,
BeanProperty property) throws JsonMappingException
{
- if (property == null) {
- return this;
- }
+ // Note! Should not skip if `property` null since that'd skip check
+ // for config overrides, in case of root value
JsonFormat.Value format = findFormatOverrides(serializers, property, handledType());
if (format == null) {
return this;
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/SqlDateSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/SqlDateSerializationTest.java
index 2ae4ff8..3f8dbba 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/jdk/SqlDateSerializationTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/jdk/SqlDateSerializationTest.java
@@ -94,4 +94,14 @@
assertEquals(aposToQuotes("{'dateOfBirth':'1980.04.14'}"),
mapper.writeValueAsString(i));
}
+
+ // [databind#2064]
+ public void testSqlDateConfigOverride() throws Exception
+ {
+ ObjectMapper mapper = newObjectMapper();
+ mapper.configOverride(java.sql.Date.class)
+ .setFormat(JsonFormat.Value.forPattern("yyyy+MM+dd"));
+ assertEquals("\"1980+04+14\"",
+ mapper.writeValueAsString(java.sql.Date.valueOf("1980-04-14")));
+ }
}
diff --git a/src/test/java/com/fasterxml/jackson/failing/NodeContext2049Test.java b/src/test/java/com/fasterxml/jackson/failing/NodeContext2049Test.java
index ab198d4..f60b9f3 100644
--- a/src/test/java/com/fasterxml/jackson/failing/NodeContext2049Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/NodeContext2049Test.java
@@ -134,7 +134,7 @@
private ObjectMapper objectMapper;
{
objectMapper = new ObjectMapper();
- objectMapper.registerModule(new Module() {
+ objectMapper.registerModule(new com.fasterxml.jackson.databind.Module() {
@Override
public String getModuleName() {
return "parentSetting";