Fix #249

Author: cowtowncoder

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

@@ -45,7 +45,7 @@ public class YearMonthDeserializer extends JSR310DateTimeDeserializerBase<YearMo
      */
     public YearMonthDeserializer() // public since 2.12
     {
-        this(DateTimeFormatter.ofPattern("uuuu-MM"));
+        this(DateTimeFormatter.ofPattern("u-MM"));
     }
 
     public YearMonthDeserializer(DateTimeFormatter formatter)

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

@@ -1,31 +1,33 @@
 package com.fasterxml.jackson.datatype.jsr310.deser;
 
+import java.io.IOException;
+import java.time.Month;
+import java.time.YearMonth;
+import java.time.format.DateTimeParseException;
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
 
 import org.junit.Test;
 
-import java.io.IOException;
-import java.time.Month;
-import java.time.YearMonth;
-import java.time.format.DateTimeParseException;
-import java.util.Map;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 public class YearMonthDeserTest extends ModuleTestBase
 {
-    private final ObjectReader READER = newMapper().readerFor(YearMonth.class);
+    private final ObjectMapper MAPPER = newMapper();
+    private final ObjectReader READER = MAPPER.readerFor(YearMonth.class);
     private final TypeReference<Map<String, YearMonth>> MAP_TYPE_REF = new TypeReference<Map<String, YearMonth>>() { };
 
     @Test
@@ -35,52 +37,63 @@ public void testDeserializationAsString01() throws Exception
     }
 
     @Test
-    public void testBadDeserializationAsString01() throws Throwable
+    public void testBadDeserializationAsString01() throws Exception
     {
         expectFailure("'notayearmonth'");
     }
 
     @Test
-    public void testDeserializationAsArrayDisabled() throws Throwable
+    public void testDeserializationAsArrayDisabled() throws Exception
     {
-    	try {
-    		read("['2000-01']");
-    	    fail("expected JsonMappingException");
+        try {
+    		    read("['2000-01']");
+    		    fail("expected JsonMappingException");
         } catch (JsonMappingException e) {
            // OK
         } catch (IOException e) {
             throw e;
         }
-
     }
 
     @Test
-    public void testDeserializationAsEmptyArrayDisabled() throws Throwable
+    public void testDeserializationAsEmptyArrayDisabled() throws Exception
     {
-    	// works even without the feature enabled
-    	assertNull(read("[]"));
+        // works even without the feature enabled
+        assertNull(read("[]"));
     }
 
     @Test
-    public void testDeserializationAsArrayEnabled() throws Throwable
+    public void testDeserializationAsArrayEnabled() throws Exception
     {
-    	String json="['2000-01']";
-    	YearMonth value= newMapper()
-    			.configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
-    			.readerFor(YearMonth.class).readValue(a2q(json));
-    	notNull(value);
+        String json="['2000-01']";
+        YearMonth value= newMapper()
+                .configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
+                .readerFor(YearMonth.class).readValue(a2q(json));
+        notNull(value);
         expect(YearMonth.of(2000, Month.JANUARY), value);
     }
 
     @Test
-    public void testDeserializationAsEmptyArrayEnabled() throws Throwable
+    public void testDeserializationAsEmptyArrayEnabled() throws Exception
+    {
+        String json="[]";
+        YearMonth value = newMapper()
+                .configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
+                .configure(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT, true)
+                .readerFor(YearMonth.class).readValue(a2q(json));
+        assertNull(value);
+    }
+
+    // [modules-java8#249
+    @Test
+    public void testYearAbove10k() throws Exception
     {
-    	String json="[]";
-    	YearMonth value= newMapper()
-    			.configure(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS, true)
-    			.configure(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT, true)
-    			.readerFor(YearMonth.class).readValue(a2q(json));
-    	assertNull(value);
+        YearMonth input = YearMonth.of(10000, 1);
+        String json = MAPPER.writer()
+                .without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .writeValueAsString(input);
+        YearMonth result = READER.readValue(json);
+        expect(input, result);
     }
 
     /*
@@ -126,7 +139,7 @@ public void testStrictDeserializeFromEmptyString() throws Exception {
         objectReader.readValue(valueFromEmptyStr);
     }
 
-    private void expectFailure(String json) throws Throwable {
+    private void expectFailure(String json) throws Exception {
         try {
             read(json);
             fail("expected DateTimeParseException");
@@ -135,20 +148,20 @@ private void expectFailure(String json) throws Throwable {
                 throw e;
             }
             if (!(e.getCause() instanceof DateTimeParseException)) {
-                throw e.getCause();
+                throw (Exception) e.getCause();
             }
         } catch (IOException e) {
             throw e;
         }
     }
 
-    private void expectSuccess(Object exp, String json) throws IOException {
+    private void expectSuccess(Object exp, String json) throws Exception {
         final YearMonth value = read(json);
         notNull(value);
         expect(exp, value);
     }
 
-    private YearMonth read(final String json) throws IOException {
+    private YearMonth read(final String json) throws Exception {
         return READER.readValue(a2q(json));
     }
 

release-notes/VERSION-2.x

@@ -19,6 +19,8 @@ Modules:
  (contributed by (Maciej D)
 #242: Fix InstantSerializer ignoring the JsonFormat shape
  (contributed by KaseiFR@github)
+#249: `YearMonthDeserializer` fails for year > 9999
+ (reported by bent-lorentzen@github)
 #251: Allow `Optional` deserialization for "absent" value as Java `null`
  (like other Reference types), not "empty"