Allow users of the api to pass in a custom formatter to the YearSerializer/Deserializer.

Author: iainCFX

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

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.time.Year;
+import java.time.format.DateTimeFormatter;
 
 /**
  * Deserializer for Java 8 temporal {@link Year}s.
@@ -31,17 +32,25 @@
 public class YearDeserializer extends JSR310DeserializerBase<Year>
 {
     private static final long serialVersionUID = 1L;
-
+    private DateTimeFormatter formatter;
     public static final YearDeserializer INSTANCE = new YearDeserializer();
 
     private YearDeserializer()
     {
         super(Year.class);
     }
 
+    public YearDeserializer(DateTimeFormatter formatter) {
+        super(Year.class);
+        this.formatter = formatter;
+    }
+
     @Override
     public Year deserialize(JsonParser parser, DeserializationContext context) throws IOException
     {
-        return Year.of(parser.getValueAsInt());
+        if (formatter == null) {
+            return Year.of(parser.getValueAsInt());
+        }
+        return Year.parse(parser.getValueAsString(), formatter);
     }
 }

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

@@ -41,17 +41,20 @@ public class YearSerializer extends JSR310FormattedSerializerBase<Year>
     public static final YearSerializer INSTANCE = new YearSerializer();
 
     protected YearSerializer() {
-        super(Year.class);
+        this(null);
     }
 
-    protected YearSerializer(YearSerializer base,
-            Boolean useTimestamp, DateTimeFormatter dtf) {
-        super(base, useTimestamp, dtf);
+    public YearSerializer(DateTimeFormatter formatter) {
+        super(Year.class, formatter);
+    }
+
+    protected YearSerializer(YearSerializer base, Boolean useTimestamp, DateTimeFormatter formatter) {
+        super(base, useTimestamp, formatter);
     }
 
     @Override
-    protected YearSerializer withFormat(Boolean useTimestamp, DateTimeFormatter dtf) {
-        return new YearSerializer(this, useTimestamp, dtf);
+    protected YearSerializer withFormat(Boolean useTimestamp, DateTimeFormatter formatter) {
+        return new YearSerializer(this, useTimestamp, formatter);
     }
 
     @Override

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

@@ -0,0 +1,59 @@
+package com.fasterxml.jackson.datatype.jsr310;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.internal.matchers.StringContains.containsString;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.YearDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.YearSerializer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.time.Year;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collection;
+
+@RunWith(Parameterized.class)
+public class TestYearSerializationWithCustomFormatter {
+    private final DateTimeFormatter formatter;
+
+    public TestYearSerializationWithCustomFormatter(DateTimeFormatter formatter) {
+        this.formatter = formatter;
+    }
+
+    @Test
+    public void testSerialization() throws Exception {
+        Year year = Year.now();
+        String expected = "\"" + year.format(formatter) + "\"";
+        assertThat(serializeWith(year, formatter), equalTo(expected));
+    }
+
+    private String serializeWith(Year dateTime, DateTimeFormatter formatter) throws Exception {
+        ObjectMapper mapper = new ObjectMapper().registerModule(new SimpleModule().addSerializer(new YearSerializer(formatter)));
+        return mapper.writeValueAsString(dateTime);
+    }
+
+    @Test
+    public void testDeserialization() throws Exception {
+        Year dateTime = Year.now();
+        assertThat(deserializeWith(dateTime.format(formatter), formatter), equalTo(dateTime));
+    }
+
+    private Year deserializeWith(String json, DateTimeFormatter formatter) throws Exception {
+        ObjectMapper mapper = new ObjectMapper().registerModule(new SimpleModule().addDeserializer(Year.class, new YearDeserializer(formatter)));
+        return mapper.readValue("\"" + json + "\"", Year.class);
+    }
+
+    @Parameters
+    public static Collection<Object[]> customFormatters() {
+        Collection<Object[]> formatters = new ArrayList<>();
+        formatters.add(new Object[]{DateTimeFormatter.ofPattern("yyyy")});
+        formatters.add(new Object[]{DateTimeFormatter.ofPattern("yy")});
+        return formatters;
+    }
+}