Merged #19; Add serializers and deserializers for MonthDay and YearMonth

Conflicts:
	src/main/java/com/fasterxml/jackson/datatype/joda/JodaModule.java
	src/test/java/com/fasterxml/jackson/datatype/joda/JodaDeserializationTest.java

Author: cowtowncoder

release-notes/VERSION

@@ -1,6 +1,8 @@
 Project: jackson-datatype-joda
 Version: 2.3.1 (xx-Dec-2013)
 
+#19: Add serializers and deserializers for MonthDay and YearMonth
+ (contributed by ncjones@github)
 #23: Package as a bundle (was accidentally not, just bare jar)
  (suggested by Łukasz D)
 #25: Add `KeyDeserializer` for `DateTime`

src/main/java/com/fasterxml/jackson/datatype/joda/JodaModule.java

@@ -2,9 +2,9 @@
 
 import org.joda.time.*;
 
+import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
 import com.fasterxml.jackson.datatype.joda.deser.*;
 import com.fasterxml.jackson.datatype.joda.ser.*;
 
@@ -27,17 +27,22 @@ public JodaModule()
         addDeserializer(ReadableDateTime.class, DateTimeDeserializer.forType(ReadableDateTime.class));
         addDeserializer(ReadableInstant.class, DateTimeDeserializer.forType(ReadableInstant.class));
         addDeserializer(Interval.class, new IntervalDeserializer());
+        addDeserializer(MonthDay.class, new MonthDayDeserializer());
+        addDeserializer(YearMonth.class, new YearMonthDeserializer());
 
         // then serializers:
+        final JsonSerializer<Object> stringSer = ToStringSerializer.instance;
         addSerializer(DateMidnight.class, new DateMidnightSerializer());
         addSerializer(DateTime.class, new DateTimeSerializer());
         addSerializer(Duration.class, new DurationSerializer());
         addSerializer(Instant.class, new InstantSerializer());
         addSerializer(LocalDateTime.class, new LocalDateTimeSerializer());
         addSerializer(LocalDate.class, new LocalDateSerializer());
         addSerializer(LocalTime.class, new LocalTimeSerializer());
-        addSerializer(Period.class, ToStringSerializer.instance);
+        addSerializer(Period.class, stringSer);
         addSerializer(Interval.class, new IntervalSerializer());
+        addSerializer(MonthDay.class, stringSer);
+        addSerializer(YearMonth.class, stringSer);
 
         // then key deserializers - only one included for DateTime here.
         addKeyDeserializer(DateTime.class, new DateTimeKeyDeserializer());
@@ -46,7 +51,7 @@ public JodaModule()
     @Override
     public int hashCode()
     {
-        return JodaModule.class.hashCode();
+        return getClass().hashCode();
     }
 
     @Override

src/main/java/com/fasterxml/jackson/datatype/joda/deser/MonthDayDeserializer.java

@@ -0,0 +1,42 @@
+package com.fasterxml.jackson.datatype.joda.deser;
+
+import java.io.IOException;
+
+import org.joda.time.MonthDay;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+
+/**
+ * A Jackson deserializer for Joda MonthDay objects.
+ * <p>
+ * Expects a string value compatible with MonthDay's parse operation.
+ */
+public class MonthDayDeserializer extends JodaDeserializerBase<MonthDay>
+{
+
+    private static final long serialVersionUID = -2360834248497553111L;
+
+    public MonthDayDeserializer()
+    {
+        super(MonthDay.class);
+    }
+
+    @Override
+    public MonthDay deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException
+    {
+        JsonToken t = jp.getCurrentToken();
+        if (t == JsonToken.VALUE_STRING)
+        {
+            String str = jp.getText().trim();
+            if (str.isEmpty())
+            {
+                return null;
+            }
+            return MonthDay.parse(str);
+        }
+        throw ctxt.wrongTokenException(jp, JsonToken.VALUE_STRING, "expected JSON String");
+    }
+
+}

src/main/java/com/fasterxml/jackson/datatype/joda/deser/YearMonthDeserializer.java

@@ -0,0 +1,42 @@
+package com.fasterxml.jackson.datatype.joda.deser;
+
+import java.io.IOException;
+
+import org.joda.time.YearMonth;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+
+/**
+ * A Jackson deserializer for Joda YearMonth objects.
+ * <p>
+ * Expects a string value compatible with YearMonth's parse operation.
+ */
+public class YearMonthDeserializer extends JodaDeserializerBase<YearMonth>
+{
+
+    private static final long serialVersionUID = -3830851040664795250L;
+
+    public YearMonthDeserializer()
+    {
+        super(YearMonth.class);
+    }
+
+    @Override
+    public YearMonth deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException
+    {
+        JsonToken t = jp.getCurrentToken();
+        if (t == JsonToken.VALUE_STRING)
+        {
+            String str = jp.getText().trim();
+            if (str.isEmpty())
+            {
+                return null;
+            }
+            return YearMonth.parse(str);
+        }
+        throw ctxt.wrongTokenException(jp, JsonToken.VALUE_STRING, "expected JSON String");
+    }
+
+}

src/test/java/com/fasterxml/jackson/datatype/joda/JodaDeserializationTest.java

@@ -397,4 +397,54 @@ public void testDateTimeKeyDeserialize() throws IOException {
         assertTrue(map.containsKey(DateTime.parse("1970-01-01T00:00:00.000Z")));
     }
 
+    public void testDeserMonthDay() throws Exception
+    {
+        String monthDayString = new MonthDay(7, 23).toString();
+        MonthDay monthDay = MAPPER.readValue(quote(monthDayString), MonthDay.class);
+        assertEquals(new MonthDay(7, 23), monthDay);
+    }
+
+    public void testDeserMonthDayFromEmptyString() throws Exception
+    {
+        MonthDay monthDay = MAPPER.readValue(quote(""), MonthDay.class);
+        assertNull(monthDay);
+    }
+
+    public void testDeserMonthDayFailsForUnexpectedType() throws IOException
+    {
+        try
+        {
+            MAPPER.readValue("{\"month\":8}", MonthDay.class);
+            fail();
+        } catch (JsonMappingException e)
+        {
+            assertTrue(e.getMessage().contains("expected JSON String"));
+        }
+    }
+
+    public void testDeserYearMonth() throws Exception
+    {
+        String yearMonthString = new YearMonth(2013, 8).toString();
+        YearMonth yearMonth = MAPPER.readValue(quote(yearMonthString), YearMonth.class);
+        assertEquals(new YearMonth(2013, 8), yearMonth);
+    }
+
+    public void testDeserYearMonthFromEmptyString() throws Exception
+    {
+        YearMonth yearMonth = MAPPER.readValue(quote(""), YearMonth.class);
+        assertNull(yearMonth);
+    }
+
+    public void testDeserYearMonthFailsForUnexpectedType() throws IOException
+    {
+        try
+        {
+            MAPPER.readValue("{\"year\":2013}", YearMonth.class);
+            fail();
+        } catch (JsonMappingException e)
+        {
+            assertTrue(e.getMessage().contains("expected JSON String"));
+        }
+    }
+
 }

src/test/java/com/fasterxml/jackson/datatype/joda/JodaSerializationTest.java

@@ -239,4 +239,21 @@ public void testInstantSer() throws IOException {
         m.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         assertEquals(quote("1970-01-01T00:00:00.000Z"), m.writeValueAsString(instant));
     }
+
+    public void testMonthDaySer() throws Exception
+    {
+        MonthDay monthDay = new MonthDay(7, 23);
+        ObjectMapper mapper = jodaMapper();
+        String json = mapper.writeValueAsString(monthDay);
+        assertEquals(quote("--07-23"), json);
+    }
+
+    public void testYearMonthSer() throws Exception
+    {
+        YearMonth yearMonth = new YearMonth(2013, 8);
+        ObjectMapper mapper = jodaMapper();
+        String json = mapper.writeValueAsString(yearMonth);
+        assertEquals(quote("2013-08"), json);
+    }
+
 }