Merge branch '2.9' into 2.10

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -800,21 +800,26 @@ Reinhard Prechtl (dnno@github)
 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)
 
 Thibaut Robert (trobert@github)
   * Requested #2059: Remove `final` modifier for `TypeFactory`
-  (2.10.0)
+   (2.10.0)
 
 Christopher Smith (chrylis@github)
   * Suggested #2115: Support naive deserialization of `Serializable` values as "untyped",
     same as `java.lang.Object`		     
-  (2.10.0)
+   (2.10.0)
 
 Édouard Mercier (edouardmercier@github)
   * Requested #2116: Make NumberSerializers.Base public and its inherited classes not final
+   (2.9.6)

release-notes/VERSION-2.x

@@ -19,6 +19,8 @@ Project: jackson-databind
 #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

src/main/java/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java

@@ -62,9 +62,8 @@ protected DateTimeSerializerBase(Class<T> type,
     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;

src/test/java/com/fasterxml/jackson/databind/ser/jdk/SqlDateSerializationTest.java

@@ -94,4 +94,14 @@ public void testPatternWithSqlDate() throws Exception
         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")));
+    }
 }