Fix #824

Author: cowtowncoder

release-notes/VERSION

@@ -65,6 +65,8 @@ Project: jackson-databind
 #812: Java 8 breaks Class-value annotation properties, wrt generics: need to work around
 #813: Add support for new property of `@JsonProperty.access` to support
   read-only/write-only use cases
+#824: Contextual `TimeZone` changes don't take effect wrt `java.util.Date`,
+  `java.util.Calendar` serialization
 - Remove old cglib compatibility tests; cause problems in Eclipse
 
 2.5.4 (not yet released)

src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

@@ -1004,14 +1004,14 @@ public final void defaultSerializeDateValue(long timestamp, JsonGenerator jgen)
      * Note: date here means "full" date, that is, date AND time, as per
      * Java convention (and not date-only values like in SQL)
      */
-    public final void defaultSerializeDateValue(Date date, JsonGenerator jgen)
+    public final void defaultSerializeDateValue(Date date, JsonGenerator gen)
         throws IOException
     {
         // [JACKSON-87]: Support both numeric timestamps and textual
         if (isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)) {
-            jgen.writeNumber(date.getTime());
+            gen.writeNumber(date.getTime());
         } else {
-            jgen.writeString(_dateFormat().format(date));
+            gen.writeString(_dateFormat().format(date));
         }
     }
 
@@ -1020,13 +1020,13 @@ public final void defaultSerializeDateValue(Date date, JsonGenerator jgen)
      * based on {@link SerializationFeature#WRITE_DATE_KEYS_AS_TIMESTAMPS}
      * value (and if using textual representation, configured date format)
      */
-    public void defaultSerializeDateKey(long timestamp, JsonGenerator jgen)
+    public void defaultSerializeDateKey(long timestamp, JsonGenerator gen)
         throws IOException
     {
         if (isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)) {
-            jgen.writeFieldName(String.valueOf(timestamp));
+            gen.writeFieldName(String.valueOf(timestamp));
         } else {
-            jgen.writeFieldName(_dateFormat().format(new Date(timestamp)));
+            gen.writeFieldName(_dateFormat().format(new Date(timestamp)));
         }
     }
 
@@ -1035,12 +1035,12 @@ public void defaultSerializeDateKey(long timestamp, JsonGenerator jgen)
      * based on {@link SerializationFeature#WRITE_DATE_KEYS_AS_TIMESTAMPS}
      * value (and if using textual representation, configured date format)
      */
-    public void defaultSerializeDateKey(Date date, JsonGenerator jgen) throws IOException
+    public void defaultSerializeDateKey(Date date, JsonGenerator gen) throws IOException
     {
         if (isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)) {
-            jgen.writeFieldName(String.valueOf(date.getTime()));
+            gen.writeFieldName(String.valueOf(date.getTime()));
         } else {
-            jgen.writeFieldName(_dateFormat().format(date));
+            gen.writeFieldName(_dateFormat().format(date));
         }
     }
 
@@ -1225,13 +1225,17 @@ protected final DateFormat _dateFormat()
         if (_dateFormat != null) {
             return _dateFormat;
         }
-        /* 24-Feb-2012, tatu: At this point, all timezone configuration
-         *    should have occured, with respect to default dateformat
-         *    and timezone configuration. But we still better clone
-         *    an instance as formatters may be stateful.
+        /* At this point, all timezone configuration should have occured, with respect
+         * to default dateformat configuration. But we still better clone
+         * an instance as formatters are stateful, not thread-safe.
          */
         DateFormat df = _config.getDateFormat();
         _dateFormat = df = (DateFormat) df.clone();
+        // 11-Jun-2015, tatu: Plus caller may have actually changed default TimeZone to use
+        TimeZone tz = getTimeZone();
+        if (tz != df.getTimeZone()) {
+            df.setTimeZone(tz);
+        }
         return df;
     }
 }

src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java

@@ -21,10 +21,10 @@
  * be freely shared and used without synchronization.
  */
 public final class BaseSettings
-    implements java.io.Serializable // since 2.1
+    implements java.io.Serializable
 {
-    // for 2.1.0:
-    private static final long serialVersionUID = 4939673998947122190L;
+    // for 2.6
+    private static final long serialVersionUID = 1L;
 
     /*
     /**********************************************************
@@ -231,9 +231,10 @@ public BaseSettings withDateFormat(DateFormat df) {
         if (_dateFormat == df) {
             return this;
         }
+        TimeZone tz = (df == null) ? _timeZone : df.getTimeZone();
         return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
                 _typeResolverBuilder, df, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
+                tz, _defaultBase64);
     }
 
     public BaseSettings withHandlerInstantiator(HandlerInstantiator hi) {

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

@@ -42,8 +42,7 @@ protected long _timestamp(Date value) {
     }
 
     @Override
-    public void serialize(Date value, JsonGenerator gen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+    public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException
     {
         if (_asTimestamp(provider)) {
             gen.writeNumber(_timestamp(value));

src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java

@@ -238,6 +238,11 @@ public static DateFormat getRFC1123Format(TimeZone tz) {
     /**********************************************************
      */
 
+    @Override // since 2.6
+    public TimeZone getTimeZone() {
+        return _timezone;
+    }
+    
     @Override
     public void setTimeZone(TimeZone tz)
     {

src/test/java/com/fasterxml/jackson/databind/ser/DateSerializationTest.java

@@ -130,7 +130,7 @@ public void testTimeZoneInBean() throws IOException
         String json = MAPPER.writeValueAsString(new TimeZoneBean("PST"));
         assertEquals("{\"tz\":\"PST\"}", json);
     }
-    
+
     // [JACKSON-648]: (re)configuring via ObjectWriter
     public void testDateUsingObjectWriter() throws IOException
     {
@@ -205,6 +205,12 @@ public void testWithTimeZoneOverride() throws Exception
         mapper.setLocale(Locale.FRANCE);
         json = mapper.writeValueAsString(new Date(0));
         assertEquals(quote("1969-12-31/16:00 PST"), json);
+
+        // Also: should be able to dynamically change timezone:
+        ObjectWriter w = mapper.writer();
+        w = w.with(TimeZone.getTimeZone("EST"));
+        json = w.writeValueAsString(new Date(0));
+        assertEquals(quote("1969-12-31/19:00 EST"), json);
     }
 }