debian/changelog

+jackson-datatype-joda (2.9.8-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Fixed the build failure caused by the latest jackson-core upgrade
+  * Standards-Version updated to 4.3.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 11 Jan 2019 13:03:14 +0100
+
 jackson-datatype-joda (2.9.4-2) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -3,7 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Tim Potter <tpot@hp.com>
-Build-Depends: debhelper (>= 11),
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  javahelper,
@@ -20,9 +21,9 @@ Build-Depends: debhelper (>= 11),
  libreplacer-java,
  maven-debian-helper,
  xmlstarlet
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jackson-datatype-joda.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jackson-datatype-joda.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/jackson-datatype-joda.git
+Vcs-Browser: https://salsa.debian.org/java-team/jackson-datatype-joda
 Homepage: https://github.com/FasterXML/jackson-datatype-joda
 
 Package: libjackson2-datatype-joda-java

debian/maven.rules

+com.fasterxml.jackson jackson-base pom s/2.9.8/debian/ * *
 com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-annotations * s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *

debian/watch

-version=3
-
+version=4
+opts="repack,compression=xz" \
 https://github.com/FasterXML/jackson-datatype-joda/tags \
 /FasterXML/jackson-datatype-joda/archive/jackson-datatype-joda-(.*)\.tar\.gz

pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.9.4</version>
+    <version>2.9.8</version>
   </parent>
   <groupId>com.fasterxml.jackson.datatype</groupId>
   <artifactId>jackson-datatype-joda</artifactId>
   <name>Jackson-datatype-Joda</name>
-  <version>2.9.4</version>
+  <version>2.9.8</version>
   <packaging>bundle</packaging>
   <description>Add-on module for Jackson (http://jackson.codehaus.org) to support
 Joda (http://joda-time.sourceforge.net/) data types.
@@ -19,7 +19,7 @@ Joda (http://joda-time.sourceforge.net/) data types.
     <connection>scm:git:git@github.com:FasterXML/jackson-datatype-joda.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-datatype-joda.git</developerConnection>
     <url>http://github.com/FasterXML/jackson-datatype-joda</url>    
-    <tag>jackson-datatype-joda-2.9.4</tag>
+    <tag>jackson-datatype-joda-2.9.8</tag>
   </scm>
   <properties>
     <!-- Generate PackageVersion.java into this directory. -->

release-notes/CREDITS

@@ -71,3 +71,8 @@ Daniel Qian (chanjarster@github)
  * Reported, contributed fix for #93: ADJUST_DATES_TO_CONTEXT_TIME_ZONE got wrong result
    when parse string contains zone id
   (2.9.0)
+
+Adrian Palanques (devdevx@github)
+ * Reported, contributed fix for #101: Instant, YearMonth and MonthDay not use
+   pattern in @JsonFormat
+  (2.9.7)

release-notes/VERSION

@@ -4,6 +4,19 @@ Project: jackson-datatype-joda
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.8 (15-Dec-2018)
+
+No changes since 2.9.7
+
+2.9.7 (19-Sep-2018)
+
+#99: Binary compatibility broken in 2.9.x in `DateTimeSerializer`
+ (reported, fixed by andrewl102@github)
+#101: Instant, YearMonth and MonthDay not use pattern in @JsonFormat
+ (reported, fixed by Adrian P)
+
+2.9.6 (12-Jun-2018)
+2.9.5 (26-Mar-2018)
 2.9.4 (24-Jan-2018)
 2.9.3 (09-Dec-2017)
 2.9.2 (14-Oct-2017)

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

 package com.fasterxml.jackson.datatype.joda;
 
 import com.fasterxml.jackson.databind.JsonDeserializer;
-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.deser.key.*;
 import com.fasterxml.jackson.datatype.joda.ser.*;
@@ -37,7 +35,6 @@ public class JodaModule extends SimpleModule
         addDeserializer(YearMonth.class, new YearMonthDeserializer());
 
         // then serializers:
-        final JsonSerializer<Object> stringSer = ToStringSerializer.instance;
         addSerializer(DateTime.class, new DateTimeSerializer());
         addSerializer(DateTimeZone.class, new DateTimeZoneSerializer());
         addSerializer(Duration.class, new DurationSerializer());
@@ -47,8 +44,8 @@ public class JodaModule extends SimpleModule
         addSerializer(LocalTime.class, new LocalTimeSerializer());
         addSerializer(Period.class, new PeriodSerializer());
         addSerializer(Interval.class, new IntervalSerializer());
-        addSerializer(MonthDay.class, stringSer);
-        addSerializer(YearMonth.class, stringSer);
+        addSerializer(MonthDay.class, new MonthDaySerializer());
+        addSerializer(YearMonth.class, new YearMonthSerializer());
 
         // then key deserializers
         addKeyDeserializer(DateTime.class, new DateTimeKeyDeserializer());

src/main/java/com/fasterxml/jackson/datatype/joda/cfg/FormatConfig.java

 package com.fasterxml.jackson.datatype.joda.cfg;
 
+import java.util.Arrays;
+
 import org.joda.time.DateTimeZone;
+import org.joda.time.DateTimeFieldType;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 import org.joda.time.format.ISOPeriodFormat;
@@ -62,19 +65,28 @@ public class FormatConfig
     public final static JacksonJodaPeriodFormat DEFAULT_PERIOD_FORMAT
         = new JacksonJodaPeriodFormat(ISOPeriodFormat.standard());
 
+    public final static JacksonJodaDateFormat DEFAULT_YEAR_MONTH_FORMAT
+            = new JacksonJodaDateFormat(ISODateTimeFormat.yearMonth());
+
+    public final static JacksonJodaDateFormat DEFAULT_MONTH_DAY_FORMAT
+            = createMonthDayFormat();
+
     // // // And then some wrapper methods for improved diagnostics, and possible
     // // // default settings for things like "withOffsetParsed()" (see
     // // // [dataformat-joda#75] for more information)
     
-    private final static JacksonJodaDateFormat createUTC(DateTimeFormatter f)
-    {
-        f = f.withZoneUTC();
-        return new JacksonJodaDateFormat(f);
+    private final static JacksonJodaDateFormat createUTC(DateTimeFormatter f) {
+        return new JacksonJodaDateFormat(f.withZoneUTC());
+    }
+
+    private final static JacksonJodaDateFormat createDefaultTZ(DateTimeFormatter f) {
+        return new JacksonJodaDateFormat(f.withZone(DEFAULT_TZ));
     }
 
-    private final static JacksonJodaDateFormat createDefaultTZ(DateTimeFormatter f)
+    private final static JacksonJodaDateFormat createMonthDayFormat()
     {
-        f = f.withZone(DEFAULT_TZ);
-        return new JacksonJodaDateFormat(f);
+        return new JacksonJodaDateFormat(ISODateTimeFormat.forFields(
+                Arrays.asList(DateTimeFieldType.monthOfYear(), DateTimeFieldType.dayOfMonth()),
+                true, true));
     }
 }

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

@@ -4,17 +4,11 @@ import java.io.IOException;
 
 import org.joda.time.Duration;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonTokenId;
-import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.datatype.joda.cfg.FormatConfig;
-import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat;
 import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaPeriodFormat;
 
 /**

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

@@ -7,6 +7,8 @@ import org.joda.time.Instant;
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.datatype.joda.cfg.FormatConfig;
+import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat;
 
 /**
  * Basic deserializer for {@link org.joda.time.ReadableDateTime} and its subtypes.
@@ -14,12 +16,21 @@ import com.fasterxml.jackson.databind.*;
  * Does not (yet?) support JSON object; support can be added if desired.
  */
 public class InstantDeserializer
-    extends JodaDeserializerBase<Instant>
+    extends JodaDateDeserializerBase<Instant>
 {
     private static final long serialVersionUID = 1L;
 
     public InstantDeserializer() {
-        super(Instant.class);
+        this(FormatConfig.DEFAULT_DATETIME_PARSER);
+    }
+
+    public InstantDeserializer(JacksonJodaDateFormat format) {
+        super(Instant.class, format);
+    }
+
+    @Override
+    public JodaDateDeserializerBase<?> withFormat(JacksonJodaDateFormat format) {
+        return new InstantDeserializer(format);
     }
 
     @Override
@@ -34,7 +45,9 @@ public class InstantDeserializer
             if (str.length() == 0) {
                 return null;
             }
-            return new Instant(str);
+            // 11-Sep-2018, tatu: `DateTimeDeserializer` allows timezone inclusion in brackets;
+            //    should that be checked here too?
+            return Instant.parse(str, _format.createParser(ctxt));
         }
         return _handleNotNumberOrString(p, ctxt);
     }

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

@@ -2,6 +2,8 @@ package com.fasterxml.jackson.datatype.joda.deser;
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.datatype.joda.cfg.FormatConfig;
+import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat;
 import org.joda.time.MonthDay;
 
 import com.fasterxml.jackson.core.JsonParser;
@@ -13,13 +15,21 @@ import com.fasterxml.jackson.databind.DeserializationContext;
  * <p>
  * Expects a string value compatible with MonthDay's parse operation.
  */
-public class MonthDayDeserializer extends JodaDeserializerBase<MonthDay>
+public class MonthDayDeserializer extends JodaDateDeserializerBase<MonthDay>
 {
     private static final long serialVersionUID = 1L;
 
-    public MonthDayDeserializer()
-    {
-        super(MonthDay.class);
+    public MonthDayDeserializer() {
+        this(FormatConfig.DEFAULT_MONTH_DAY_FORMAT);
+    }
+
+    public MonthDayDeserializer(JacksonJodaDateFormat format) {
+        super(MonthDay.class, format);
+    }
+
+    @Override
+    public JodaDateDeserializerBase<?> withFormat(JacksonJodaDateFormat format) {
+        return new MonthDayDeserializer(format);
     }
 
     @Override
@@ -32,7 +42,7 @@ public class MonthDayDeserializer extends JodaDeserializerBase<MonthDay>
             if (str.isEmpty()) {
                 return getNullValue(ctxt);
             }
-            return MonthDay.parse(str);
+            return MonthDay.parse(str, this._format.createParser(ctxt));
         }
         return (MonthDay) ctxt.handleUnexpectedToken(handledType(), p.getCurrentToken(), p,
                 "expected JSON String");

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

@@ -2,6 +2,8 @@ package com.fasterxml.jackson.datatype.joda.deser;
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.datatype.joda.cfg.FormatConfig;
+import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat;
 import org.joda.time.YearMonth;
 
 import com.fasterxml.jackson.core.JsonParser;
@@ -13,13 +15,21 @@ import com.fasterxml.jackson.databind.DeserializationContext;
  * <p>
  * Expects a string value compatible with YearMonth's parse operation.
  */
-public class YearMonthDeserializer extends JodaDeserializerBase<YearMonth>
+public class YearMonthDeserializer extends JodaDateDeserializerBase<YearMonth>
 {
     private static final long serialVersionUID = 1L;
 
-    public YearMonthDeserializer()
-    {
-        super(YearMonth.class);
+    public YearMonthDeserializer() {
+        this(FormatConfig.DEFAULT_YEAR_MONTH_FORMAT);
+    }
+
+    public YearMonthDeserializer(JacksonJodaDateFormat format) {
+        super(YearMonth.class, format);
+    }
+
+    @Override
+    public JodaDateDeserializerBase<?> withFormat(JacksonJodaDateFormat format) {
+        return new YearMonthDeserializer(format);
     }
 
     @Override
@@ -31,7 +41,7 @@ public class YearMonthDeserializer extends JodaDeserializerBase<YearMonth>
             if (str.isEmpty()) {
                 return null;
             }
-            return YearMonth.parse(str);
+            return YearMonth.parse(str, _format.createParser(ctxt));
         }
         return (YearMonth) ctxt.handleUnexpectedToken(handledType(), p.getCurrentToken(), p,
                 "expected JSON String");

src/main/java/com/fasterxml/jackson/datatype/joda/ser/DateMidnightSerializer.java

@@ -25,6 +25,10 @@ public class DateMidnightSerializer
         this(FormatConfig.DEFAULT_LOCAL_DATEONLY_FORMAT, 0);
     }
 
+    public DateMidnightSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
+
     public DateMidnightSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         // true -> use arrays

src/main/java/com/fasterxml/jackson/datatype/joda/ser/DateTimeSerializer.java

@@ -19,6 +19,10 @@ public class DateTimeSerializer
         this(FormatConfig.DEFAULT_DATETIME_PRINTER, 0);
     }
 
+    public DateTimeSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
+
     public DateTimeSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         // false -> no arrays (numbers)

src/main/java/com/fasterxml/jackson/datatype/joda/ser/DurationSerializer.java

@@ -24,6 +24,11 @@ public class DurationSerializer // non final since 2.6.1
     // it as container for numeric/textual distinction
     
     public DurationSerializer() { this(FormatConfig.DEFAULT_DATEONLY_FORMAT, 0); }
+
+    public DurationSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
+    
     public DurationSerializer(JacksonJodaDateFormat formatter,
             int shapeOverride) {
         // false -> no arrays (numbers)

src/main/java/com/fasterxml/jackson/datatype/joda/ser/InstantSerializer.java

@@ -15,8 +15,11 @@ public class InstantSerializer // non final since 2.6.1
 {
     private static final long serialVersionUID = 1L;
 
-    // NOTE: formatter not used for printing at all, hence choice doesn't matter
-    public InstantSerializer() { this(FormatConfig.DEFAULT_TIMEONLY_FORMAT, 0); }
+    public InstantSerializer() { this(FormatConfig.DEFAULT_DATETIME_PRINTER, 0); }
+    public InstantSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
+
     public InstantSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         super(Instant.class, format, SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
@@ -40,7 +43,7 @@ public class InstantSerializer // non final since 2.6.1
         throws IOException
     {
         if (_serializationShape(provider) == FORMAT_STRING) {
-            gen.writeString(value.toString());
+            gen.writeString(_format.createFormatter(provider).print(value));
         } else {
             gen.writeNumber(value.getMillis());
         }

src/main/java/com/fasterxml/jackson/datatype/joda/ser/IntervalSerializer.java

@@ -17,6 +17,9 @@ public class IntervalSerializer extends JodaDateSerializerBase<Interval>
     private static final long serialVersionUID = 1L;
 
     public IntervalSerializer() { this(FormatConfig.DEFAULT_DATETIME_PRINTER, 0); }
+    public IntervalSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
     public IntervalSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         super(Interval.class, format, SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS,

src/main/java/com/fasterxml/jackson/datatype/joda/ser/LocalDateSerializer.java

@@ -17,12 +17,17 @@ public class LocalDateSerializer // non final since 2.6.1
     private static final long serialVersionUID = 1L;
 
     public LocalDateSerializer() { this(FormatConfig.DEFAULT_LOCAL_DATEONLY_FORMAT, 0); }
+    public LocalDateSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
     public LocalDateSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         super(LocalDate.class, format, SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
                 FORMAT_ARRAY, shapeOverride);
     }
 
+
+
     @Override
     public LocalDateSerializer withFormat(JacksonJodaDateFormat formatter,
             int shapeOverride) {

src/main/java/com/fasterxml/jackson/datatype/joda/ser/LocalDateTimeSerializer.java

@@ -16,12 +16,16 @@ public class LocalDateTimeSerializer // non final since 2.6.1
     private static final long serialVersionUID = 1L;
 
     public LocalDateTimeSerializer() { this(FormatConfig.DEFAULT_LOCAL_DATETIME_PRINTER, 0); }
+    public LocalDateTimeSerializer(JacksonJodaDateFormat format) {
+        this(format, 0);
+    }
     public LocalDateTimeSerializer(JacksonJodaDateFormat format,
             int shapeOverride) {
         super(LocalDateTime.class, format, SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
                 FORMAT_ARRAY, shapeOverride);
     }
 
+
     @Override
     public LocalDateTimeSerializer withFormat(JacksonJodaDateFormat formatter,
             int shapeOverride) {