Fix #78

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;
@@ -13,7 +14,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.format.DateTimeParseException;

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,6 +31,16 @@
 
 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
@@ -50,4 +61,27 @@ public void testDeserializationWithTypeInfo() throws Exception
         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);
+    }
 }

release-notes/CREDITS-2.x

@@ -36,3 +36,7 @@ Sonny Gill (sonnygill@github)
   #67: `ParameterNamesModule` does not deserialize with a single parameter
     constructor when using `SnakeCase` `PropertyNamingStrategy`
    (2.9.6)
+
+Adrian Palanques (devdevx@github)
+  #78: Year deserialization ignores `@JsonFormat` pattern
+   (2.9.7)

release-notes/VERSION-2.x

@@ -10,6 +10,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