Merge branch '2.6'

Conflicts:
	release-notes/CREDITS

Author: cowtowncoder

release-notes/CREDITS

@@ -52,6 +52,11 @@ Peter Royal (osi@github)
   * Reported #50: `Instant` schema representation is incorrect for timestamps serialization
    (2.6.4)
 
+Krešimir Nesek (knes1@github)
+  * Reported, contributed for #69: Serialization of Instant seems to throw exceptions
+    when @JsonFormat is used
+   (2.6.6)
+
 Devin Smith (devinrsmith@github)
   * Reported #63: Should not leak `DateTimeException`s to caller
    (2.7.3)

release-notes/VERSION

@@ -33,6 +33,8 @@ No changes since 2.7.1
 #16: Instant is serialized as String by some dataformats/libs but can't be
   deserialized (unless manually converted to float)
  (reported by Andreas L)
+#69: Serialization of Instant seems to throw exceptions when when @JsonFormat is used
+ (reported and fixed by Krešimir N)
 
 2.6.5 (19-Jan-2016)
 

src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310DateTimeDeserializerBase.java

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.datatype.jsr310.deser;
 
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
@@ -42,6 +43,11 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
                     } else {
                         df = DateTimeFormatter.ofPattern(pattern, locale);
                     }
+                    //Issue #69: For instant serializers/deserializers we need to configure the formatter with
+                    //a time zone picked up from JsonFormat annotation, otherwise serialization might not work
+                    if (format.hasTimeZone()) {
+                        df = df.withZone(format.getTimeZone().toZoneId());
+                    }
                     return withDateFormat(df);
                 }
                 // any use for TimeZone?

src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/JSR310FormattedSerializerBase.java

@@ -111,6 +111,11 @@ public JsonSerializer<?> createContextual(SerializerProvider prov,
                     } else {
                         dtf = DateTimeFormatter.ofPattern(pattern, locale);
                     }
+                    //Issue #69: For instant serializers/deserializers we need to configure the formatter with
+                    //a time zone picked up from JsonFormat annotation, otherwise serialization might not work
+                    if (format.hasTimeZone()) {
+                        dtf = dtf.withZone(format.getTimeZone().toZoneId());
+                    }
                 }
                 if (useTimestamp != _useTimestamp || dtf != _formatter) {
                     return withFormat(useTimestamp, dtf);

src/test/java/com/fasterxml/jackson/datatype/jsr310/TestInstantSerialization.java

@@ -21,6 +21,8 @@
 import static org.junit.Assert.assertTrue;
 
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
@@ -33,6 +35,7 @@
 public class TestInstantSerialization extends ModuleTestBase
 {
     private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;
+    private static final String CUSTOM_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
     private final ObjectMapper mapper = newMapper();
 
@@ -44,12 +47,29 @@ final static class Wrapper {
                  *    representation here
                  */
                 //pattern="YYYY-mm-dd",
-                shape=JsonFormat.Shape.STRING)
+                shape=JsonFormat.Shape.STRING
+        )
         public Instant value;
 
         public Wrapper() { }
         public Wrapper(Instant v) { value = v; }
     }
+
+    final static class WrapperWithCustomPattern {
+        @JsonFormat(
+                pattern = CUSTOM_PATTERN,
+                shape=JsonFormat.Shape.STRING,
+                timezone = "UTC"
+        )
+        public Instant valueInUTC;
+
+        public WrapperWithCustomPattern() { }
+        public WrapperWithCustomPattern(Instant v) {
+            valueInUTC = v;
+        }
+    }
+
+
 
     @Test
     public void testSerializationAsTimestamp01Nanoseconds() throws Exception
@@ -357,7 +377,7 @@ public void testDeserializationWithTypeInfo04() throws Exception
     }
 
     @Test
-    public void testCustomPatternWithAnnotations() throws Exception
+    public void testCustomPatternWithAnnotations01() throws Exception
     {
         final Wrapper input = new Wrapper(Instant.ofEpochMilli(0));
         String json = mapper.writeValueAsString(input);
@@ -367,6 +387,25 @@ public void testCustomPatternWithAnnotations() throws Exception
         assertEquals(input.value, result.value);
     }
 
+    // [datatype-jsr310#69]
+    @Test
+    public void testCustomPatternWithAnnotations02() throws Exception
+    {
+        //Test date is pushed one year after start of the epoch just to avoid possible issues with UTC-X TZs which could
+        //push the instant before tha start of the epoch
+        final Instant instant = ZonedDateTime.ofInstant(Instant.ofEpochMilli(0), ZoneId.of("UTC")).plusYears(1).toInstant();
+        final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CUSTOM_PATTERN);
+        final String valueInUTC = formatter.withZone(ZoneId.of("UTC")).format(instant);
+
+        final WrapperWithCustomPattern input = new WrapperWithCustomPattern(instant);
+        String json = mapper.writeValueAsString(input);
+
+        assertTrue("Instant in UTC timezone was not serialized as expected.", json.contains(aposToQuotes("'valueInUTC':'" + valueInUTC + "'")));
+
+        WrapperWithCustomPattern result = mapper.readValue(json, WrapperWithCustomPattern.class);
+        assertEquals("Instant in UTC timezone was not deserialized as expected.", input.valueInUTC, result.valueInUTC);
+    }
+
     // [datatype-jsr310#16]
     @Test
     public void testDeserializationFromStringAsNumber() throws Exception