fix FasterXML#87

joxerTMD · Jun 30, 2016 · 3fca305 · 3fca305
1 parent 9d24e74
commit 3fca305
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 1 deletion.
diff --git a/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/DateFormatSetup.java b/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/DateFormatSetup.java
@@ -16,6 +16,8 @@ public class DateFormatSetup extends BaseFormatSetup {
 
     private TimeZone _timeZone;
 
+    private Boolean adjustToContextTZOverride;
+
     public DateFormatSetup() {
 
     }
@@ -39,4 +41,12 @@ public TimeZone getTimeZone() {
     public void setTimeZone(TimeZone timeZone) {
         this._timeZone = timeZone;
     }
+
+    public Boolean getAdjustToContextTZOverride() {
+        return adjustToContextTZOverride;
+    }
+
+    public void setAdjustToContextTZOverride(Boolean adjustToContextTZOverride) {
+        this.adjustToContextTZOverride = adjustToContextTZOverride;
+    }
 }
diff --git a/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java b/src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java
@@ -26,6 +26,8 @@ public class JacksonJodaDateFormat extends JacksonJodaFormatBase
     protected transient DateTimeZone _jodaTimezone;
 
     protected final boolean _explicitTimezone;
+
+    protected final Boolean _adjustToContextTZOverride;
 
     public JacksonJodaDateFormat(DateTimeFormatter defaultFormatter)
     {
@@ -34,6 +36,7 @@ public JacksonJodaDateFormat(DateTimeFormatter defaultFormatter)
         DateTimeZone tz = defaultFormatter.getZone();
         _jdkTimezone = (tz == null) ? null : tz.toTimeZone();
         _explicitTimezone = false;
+        _adjustToContextTZOverride = null;
     }
 
     public JacksonJodaDateFormat(JacksonJodaDateFormat base, Boolean useTimestamp)
@@ -42,6 +45,7 @@ public JacksonJodaDateFormat(JacksonJodaDateFormat base, Boolean useTimestamp)
         _formatter = base._formatter;
         _jdkTimezone = base._jdkTimezone;
         _explicitTimezone = base._explicitTimezone;
+        _adjustToContextTZOverride = base._adjustToContextTZOverride;
     }
 
     public JacksonJodaDateFormat(JacksonJodaDateFormat base,
@@ -51,6 +55,7 @@ public JacksonJodaDateFormat(JacksonJodaDateFormat base,
         _formatter = formatter;
         _jdkTimezone = base._jdkTimezone;
         _explicitTimezone = base._explicitTimezone;
+        _adjustToContextTZOverride = base._adjustToContextTZOverride;
     }
 
     public JacksonJodaDateFormat(JacksonJodaDateFormat base, TimeZone jdkTimezone)
@@ -59,6 +64,7 @@ public JacksonJodaDateFormat(JacksonJodaDateFormat base, TimeZone jdkTimezone)
         _formatter = base._formatter.withZone(DateTimeZone.forTimeZone(jdkTimezone));
         _jdkTimezone = jdkTimezone;
         _explicitTimezone = true;
+        _adjustToContextTZOverride = base._adjustToContextTZOverride;
     }
 
     public JacksonJodaDateFormat(JacksonJodaDateFormat base, Locale locale)
@@ -67,6 +73,7 @@ public JacksonJodaDateFormat(JacksonJodaDateFormat base, Locale locale)
         _formatter = base._formatter.withLocale(locale);
         _jdkTimezone = base._jdkTimezone;
         _explicitTimezone = base._explicitTimezone;
+        _adjustToContextTZOverride = base._adjustToContextTZOverride;
     }
 
     public JacksonJodaDateFormat(DateFormatSetup setup)
@@ -86,6 +93,7 @@ public JacksonJodaDateFormat(DateFormatSetup setup)
             _jdkTimezone = setup.getTimeZone();
             _explicitTimezone = true;
         }
+        _adjustToContextTZOverride = setup.getAdjustToContextTZOverride();
     }
 
     @Override
@@ -95,6 +103,7 @@ protected DateFormatSetup getSetup() {
         if (_explicitTimezone) {
             setup.setTimeZone(_jdkTimezone);
         }
+        setup.setAdjustToContextTZOverride(_adjustToContextTZOverride);
         return setup;
     }
 
@@ -152,6 +161,16 @@ public JacksonJodaDateFormat withLocale(Locale locale) {
         return new JacksonJodaDateFormat(setup);
     }
 
+    public JacksonJodaDateFormat withAdjustToContextTZOverride(Boolean adjustToContextTZOverride) {
+        if ((adjustToContextTZOverride == null) ||
+                (_adjustToContextTZOverride != null && _adjustToContextTZOverride.equals(adjustToContextTZOverride))) {
+            return this;
+        }
+        DateFormatSetup setup = getSetup();
+        setup.setAdjustToContextTZOverride(adjustToContextTZOverride);
+        return new JacksonJodaDateFormat(setup);
+    }
+
     /*
     /**********************************************************
     /* Accessors
@@ -224,7 +243,7 @@ public DateTimeFormatter createParser(DeserializationContext ctxt)
             }
         }
         if (!_explicitTimezone) {
-            if (ctxt.isEnabled(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)) {
+            if (isAdjustDatesToContextTimeZone(ctxt)) {
                 TimeZone tz = ctxt.getTimeZone();
                 if (tz != null && !tz.equals(_jdkTimezone)) {
                     formatter = formatter.withZone(DateTimeZone.forTimeZone(tz));
@@ -236,6 +255,11 @@ public DateTimeFormatter createParser(DeserializationContext ctxt)
         return formatter;
     }
 
+    private boolean isAdjustDatesToContextTimeZone(DeserializationContext ctxt) {
+      return _adjustToContextTZOverride != null ? _adjustToContextTZOverride :
+              ctxt.isEnabled(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
+    }
+
     /**
      * Differentiate if TimeZone is specified by caller 
      * @return true if TimeZone is specified by caller; false otherwise.

diff --git a/src/main/java/com/fasterxml/jackson/datatype/joda/deser/JodaDateDeserializerBase.java b/src/main/java/com/fasterxml/jackson/datatype/joda/deser/JodaDateDeserializerBase.java
@@ -56,6 +56,8 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
             format = format.withFormat(ann.getPattern().trim());
             format = format.withLocale(ann.getLocale());
             format = format.withTimeZone(ann.getTimeZone());
+            format = format.withAdjustToContextTZOverride(
+                    ann.getFeature(JsonFormat.Feature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE));
             if (format != _format) {
                 return withFormat(format);
             }

diff --git a/src/test/java/com/fasterxml/jackson/datatype/joda/deser/MiscDeserializationTest.java b/src/test/java/com/fasterxml/jackson/datatype/joda/deser/MiscDeserializationTest.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.joda.time.*;
 import org.joda.time.chrono.ISOChronology;
 
@@ -100,6 +101,37 @@ public void testDeserReadableDateTimeWithTimeZoneFromData() throws IOException {
         assertEquals(DateTimeZone.forOffsetHours(-5), date.getZone());
     }
 
+    static class ReadableDateTimeWithContextTZOverride {
+        @JsonFormat(with = JsonFormat.Feature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
+        public ReadableDateTime time;
+    }
+
+    public void testDeserReadableDateTimeWithContextTZOverride() throws IOException {
+        ObjectMapper mapper = jodaMapper();
+        mapper.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
+        mapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+        ReadableDateTimeWithContextTZOverride date = mapper.readValue("{ \"time\" : \"2016-06-20T08:59:00.000+0300\"}",
+                ReadableDateTimeWithContextTZOverride.class);
+        DateTime expected = new DateTime(2016, 6, 20, 5, 59, DateTimeZone.forID("UTC"));
+        assertEquals(expected, date.time);
+    }
+
+    static class ReadableDateTimeWithoutContextTZOverride {
+
+        @JsonFormat(without = JsonFormat.Feature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
+        public ReadableDateTime time;
+    }
+
+    public void testDeserReadableDateTimeWithoutContextTZOverride() throws IOException {
+        ObjectMapper mapper = jodaMapper();
+        mapper.enable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
+        mapper.setTimeZone(TimeZone.getTimeZone("UTC"));
+        ReadableDateTimeWithoutContextTZOverride date = mapper.readValue("{ \"time\" : \"2016-06-20T08:59:00.000+0300\"}",
+                ReadableDateTimeWithoutContextTZOverride.class);
+        DateTime expected = new DateTime(2016, 6, 20, 8, 59, DateTimeZone.forOffsetHours(3));
+        assertEquals(expected, date.time);
+    }
+
     public void testDeserReadableInstant() throws IOException {
         ReadableInstant date = MAPPER.readValue(quote("1972-12-28T12:00:01.000+0000"), ReadableInstant.class);
         assertNotNull(date);