Merge branch '2.9' into 2.10

Author: cowtowncoder

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/YearDeserializer.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 
 import java.io.IOException;
 import java.time.DateTimeException;
@@ -31,22 +32,24 @@
  * @author Nick Williams
  * @since 2.2
  */
-public class YearDeserializer extends JSR310DeserializerBase<Year>
+public class YearDeserializer extends JSR310DateTimeDeserializerBase<Year>
 {
     private static final long serialVersionUID = 1L;
 
     public static final YearDeserializer INSTANCE = new YearDeserializer();
 
-    private final DateTimeFormatter _formatter;
-
     private YearDeserializer()
     {
         this(null);
     }
 
     public YearDeserializer(DateTimeFormatter formatter) {
-        super(Year.class);
-        _formatter = formatter;
+        super(Year.class, formatter);
+    }
+
+    @Override
+    protected JsonDeserializer<Year> withDateFormat(DateTimeFormatter dtf) {
+        return new YearDeserializer(dtf);
     }
 
     @Override

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
+
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/YearDeserTest.java

@@ -19,6 +19,7 @@
 import java.time.Year;
 import java.time.temporal.Temporal;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.MockObjectConfiguration;
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
@@ -30,29 +31,57 @@
 
 public class YearDeserTest extends ModuleTestBase
 {
+    static class FormattedYear {
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "'Y'yyyy")
+        public Year value;
+
+        protected FormattedYear() {}
+        public FormattedYear(Year year) {
+            value = year;
+        }
+    }
+
     private final ObjectMapper MAPPER = newMapper();
 
     @Test
-    public void testDeserialization01() throws Exception
+    public void testDefaultDeserialization() throws Exception
     {
         Year value = MAPPER.readValue("1986", Year.class);
         assertEquals("The value is not correct.", Year.of(1986), value);
-    }
-
-    @Test
-    public void testDeserialization02() throws Exception
-    {
-        Year value = MAPPER.readValue("2013", Year.class);
+        value = MAPPER.readValue("2013", Year.class);
         assertEquals("The value is not correct.", Year.of(2013), value);
     }
 
     @Test
-    public void testDeserializationWithTypeInfo01() throws Exception
+    public void testDeserializationWithTypeInfo() throws Exception
     {
         ObjectMapper mapper = newMapper()
                 .addMixIn(Temporal.class, MockObjectConfiguration.class);
         Temporal value = mapper.readValue("[\"" + Year.class.getName() + "\",2005]", Temporal.class);
         assertTrue("The value should be a Year.", value instanceof Year);
         assertEquals("The value is not correct.", Year.of(2005), value);
     }
+
+    @Test
+    public void testWithCustomFormat() throws Exception
+    {
+        FormattedYear input = new FormattedYear(Year.of(2018));
+        String json = MAPPER.writeValueAsString(input);
+        assertEquals("{\"value\":\"Y2018\"}", json);
+        FormattedYear result = MAPPER.readValue(json, FormattedYear.class);
+        assertEquals(input.value, result.value);
+    }
+
+    @Test
+    public void testWithFormatViaConfigOverride() throws Exception
+    {
+        ObjectMapper mapper = newMapper();
+        mapper.configOverride(Year.class)
+                .setFormat(JsonFormat.Value.forPattern("'X'yyyy"));
+        Year input = Year.of(2018);
+        String json = mapper.writeValueAsString(input);
+        assertEquals("\"X2018\"", json);
+        Year result = mapper.readValue(json, Year.class);
+        assertEquals(input, result);
+    }
 }

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/failing/YearDeser78Test.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 FasterXML.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package com.fasterxml.jackson.datatype.jsr310.failing;
+
+import java.time.Year;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class YearDeser78Test extends ModuleTestBase
+{
+    // [module-java8#78]
+    final static class ObjectTest {
+        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "'Y'yyyy")
+        public Year value;
+
+        protected ObjectTest() { }
+        public ObjectTest(Year y) {
+            value = y;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newMapper();
+
+    // [module-java8#78]
+    @Test
+    public void testWithCustomFormat() throws Exception
+    {
+        ObjectTest input = new ObjectTest(Year.of(2018));
+        String json = MAPPER.writeValueAsString(input);
+        assertEquals("{\"value\":\"Y2018\"}", json);
+        ObjectTest result = MAPPER.readValue(json, ObjectTest.class);
+        assertEquals(input, result);
+    }
+}

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ser/YearSerTest.java

@@ -32,22 +32,16 @@ public class YearSerTest extends ModuleTestBase
     private final ObjectMapper MAPPER = newMapper();
 
     @Test
-    public void testSerialization01() throws Exception
-    {
-        Year year = Year.of(1986);
-        String value = MAPPER.writeValueAsString(year);
-        assertEquals("The value is not correct.", "1986", value);
-    }
-
-    @Test
-    public void testSerialization02() throws Exception
+    public void testDefaultSerialization() throws Exception
     {
+        assertEquals("The value is not correct.", "1986",
+                MAPPER.writeValueAsString(Year.of(1986)));
         assertEquals("The value is not correct.", "2013",
                 MAPPER.writeValueAsString(Year.of(2013)));
     }
 
     @Test
-    public void testSerializationWithTypeInfo01() throws Exception
+    public void testSerializationWithTypeInfo() throws Exception
     {
         ObjectMapper mapper = newMapper()
                 .addMixIn(Temporal.class, MockObjectConfiguration.class);

release-notes/CREDITS-2.x

@@ -41,3 +41,8 @@ Kezhu Wang (kezhuw@github)
   #75: Use `SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS` for configuring
     `Duration` serialization
    (2.10.0)
+
+Adrian Palanques (devdevx@github)
+  #78: Year deserialization ignores `@JsonFormat` pattern
+   (2.9.7)
+

release-notes/VERSION-2.x

@@ -16,6 +16,9 @@ Modules:
 
 2.9.7 (not yet released)
 
+#78: Year deserialization ignores `@JsonFormat` pattern
+ (reported, fixed by Adrian P)
+
 2.9.6 (12-Jun-2018)
 
 #65: Use `DeserializationContext.handleWeirdXxxValue()` for datetime deserializers