Merge branch 'master' into ng-3.0

Author: cowtowncoder

release-notes/CREDITS

@@ -632,6 +632,10 @@ Bertrand Renuart (brenuart@github)
    (2.8.9)
   * Reported #1651: `StdDateFormat` fails to parse 'zulu' date when TimeZone other than UTC
    (2.8.9)
+  * Suggested #1745: StdDateFormat: accept and truncate millis larger than 3 digits
+   (2.9.1)
+  * Contributed #1749: StdDateFormat: performance improvement of '_format(..)' method
+   (2.9.1)
 
 Kevin Gallardo (newkek@github)
   * Reported #1658: Infinite recursion when deserializing a class extending a Map,
@@ -693,3 +697,8 @@ Christian Basler (Dissem@github)
   * Reported #1688: Deserialization fails for `java.nio.file.Path` implementations when
     default typing enabled
    (2.9.0)
+
+Tim Bartley (tbartley@github)
+  * Reported, suggested fix for #1705: Non-generic interface method hides type resolution info
+    from generic base class
+   (2.9.1)

release-notes/VERSION

@@ -5,8 +5,16 @@ Project: jackson-databind
 
 2.9.1 (not yet released)
 
+#1705: Non-generic interface method hides type resolution info from generic base class
+ (reported by Tim B)
 #1725: `NPE` In `TypeFactory. constructParametricType(...)`
  (reported by ctytgat@github)
+#1730: InvalidFormatException` for `JsonToken.VALUE_EMBEDDED_OBJECT`
+ (reported by zigzago@github)
+#1745: StdDateFormat: accept and truncate millis larger than 3 digits
+ (suggested by Bertrand R)
+#1749: StdDateFormat: performance improvement of '_format(..)' method 
+ (contributed by Bertrand R)
 - Fix `DelegatingDeserializer` constructor to pass `handledType()` (and
   not type of deserializer being delegated to!)
 
@@ -110,7 +118,7 @@ Project: jackson-databind
   `MapperFeature.ALLOW_COERCION_OF_SCALARS`
  (requested by magdel@github)
 
-2.8.10 (not yet released)
+2.8.10 (24-Aug-2017)
 
 #1657: `StdDateFormat` deserializes dates with no tz/offset as UTC instead of
   configured timezone

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -1458,7 +1458,7 @@ public Object deserializeFromEmbedded(JsonParser p, DeserializationContext ctxt)
         //    more meaningful exceptions.
         Object value = p.getEmbeddedObject();
         if (value != null) {
-            if (!_beanType.getClass().isInstance(value)) {
+            if (!_beanType.isTypeOrSuperTypeOf(value.getClass())) {
                 // allow this to be handled...
                 value = ctxt.handleWeirdNativeValue(_beanType, value, p);
             }

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethodCollector.java

@@ -131,6 +131,9 @@ private void _addMemberMethods(TypeResolutionContext tc,
                     //   may also result in faster method calls (interface calls are slightly
                     //   costlier than regular method calls)
                     b.method = m;
+                    // 23-Aug-2017, tatu: [databind#1705] Also need to change the type resolution context if so
+                    //    (note: mix-over case above shouldn't need it)
+//                    b.typeContext = tc;
                 }
             }
         }
@@ -176,7 +179,7 @@ private boolean _isIncludableMemberMethod(Method m)
     }
 
     private final static class MethodBuilder {
-        public final TypeResolutionContext typeContext;
+        public TypeResolutionContext typeContext;
 
         // Method left empty for "floating" mix-in, filled in as need be
         public Method method;

src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java

@@ -101,12 +101,21 @@ public class StdDateFormat
         DATE_FORMAT_ISO8601 = new SimpleDateFormat(DATE_FORMAT_STR_ISO8601, DEFAULT_LOCALE);
         DATE_FORMAT_ISO8601.setTimeZone(DEFAULT_TIMEZONE);
     }
-    
+
     /**
      * A singleton instance can be used for cloning purposes, as a blueprint of sorts.
      */
     public final static StdDateFormat instance = new StdDateFormat();
-    
+
+    /**
+     * Blueprint "Calendar" instance for use during formatting. Cannot be used as is,
+     * due to thread-safety issues, but can be used for constructing actual instances 
+     * more cheaply by cloning.
+     *
+     * @since 2.9.1
+     */
+    protected static final Calendar CALENDAR = new GregorianCalendar(DEFAULT_TIMEZONE, DEFAULT_LOCALE);
+
     /**
      * Caller may want to explicitly override timezone to use; if so,
      * we will have non-null value here.
@@ -124,6 +133,13 @@ public class StdDateFormat
      * @since 2.7
      */
     protected Boolean _lenient;
+
+    /**
+     * Lazily instantiated calendar used by this instance for serialization ({@link #format(Date)}).
+     *
+     * @since 2.9.1
+     */
+    private transient Calendar _calendar;
 
     private transient DateFormat _formatRFC1123;
 
@@ -313,28 +329,35 @@ public StringBuffer format(Date date, StringBuffer toAppendTo,
         _format(tz, _locale, date, toAppendTo);
         return toAppendTo;
     }
-
-    protected static void _format(TimeZone tz, Locale loc, Date date,
+    
+    protected void _format(TimeZone tz, Locale loc, Date date,
             StringBuffer buffer)
     {
-        Calendar calendar = new GregorianCalendar(tz, loc);
-        calendar.setTime(date);
+        Calendar cal = _calendar;
+        if (cal == null ) {
+            _calendar = cal = (Calendar)CALENDAR.clone();
+        }
+        if (!cal.getTimeZone().equals(tz) ) {
+            cal.setTimeZone(tz);
+        }
+        // Note: Calendar locale not updated since we don't need it here...
+        cal.setTime(date);
 
-        pad4(buffer, calendar.get(Calendar.YEAR));
+        pad4(buffer, cal.get(Calendar.YEAR));
         buffer.append('-');
-        pad2(buffer, calendar.get(Calendar.MONTH) + 1);
+        pad2(buffer, cal.get(Calendar.MONTH) + 1);
         buffer.append('-');
-        pad2(buffer, calendar.get(Calendar.DAY_OF_MONTH));
+        pad2(buffer, cal.get(Calendar.DAY_OF_MONTH));
         buffer.append('T');
-        pad2(buffer, calendar.get(Calendar.HOUR_OF_DAY));
+        pad2(buffer, cal.get(Calendar.HOUR_OF_DAY));
         buffer.append(':');
-        pad2(buffer, calendar.get(Calendar.MINUTE));
+        pad2(buffer, cal.get(Calendar.MINUTE));
         buffer.append(':');
-        pad2(buffer, calendar.get(Calendar.SECOND));
+        pad2(buffer, cal.get(Calendar.SECOND));
         buffer.append('.');
-        pad3(buffer, calendar.get(Calendar.MILLISECOND));
+        pad3(buffer, cal.get(Calendar.MILLISECOND));
 
-        int offset = tz.getOffset(calendar.getTimeInMillis());
+        int offset = tz.getOffset(cal.getTimeInMillis());
         if (offset != 0) {
             int hours = Math.abs((offset / (60 * 1000)) / 60);
             int minutes = Math.abs((offset / (60 * 1000)) % 60);
@@ -498,8 +521,7 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
         } else {
             Matcher m = PATTERN_ISO8601.matcher(dateStr);
             if (m.matches()) {
-                // Important! START with optional timezone; otherwise
-                // Calendar will implode.
+                // Important! START with optional time zone; otherwise Calendar will explode
 
                 int start = m.start(2);
                 int end = m.end(2);
@@ -546,20 +568,27 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
                 } else {
                     // first char is '.', but rest....
                     msecs = 0;
-                    switch (end-start) {
+                    final int fractLen = end-start;
+                    switch (fractLen) {
+                    default: // [databind#1745] Allow longer fractions... for now, cap at nanoseconds tho
+
+                        if (fractLen > 9) { // only allow up to nanos
+                            throw new ParseException(String.format(
+"Cannot parse date \"%s\": invalid fractional seconds '%s'; can use at most 9 digits",
+                                       dateStr, m.group(1).substring(1)
+                                       ),
+                                pos.getErrorIndex());
+                        }
+                        // fall through
                     case 3:
                         msecs += (dateStr.charAt(start+2) - '0');
                     case 2:
                         msecs += 10 * (dateStr.charAt(start+1) - '0');
                     case 1:
                         msecs += 100 * (dateStr.charAt(start) - '0');
                         break;
-                    default:
-                        throw new ParseException(String.format(
-"Cannot parse date \"%s\": invalid fractional seconds '%s'; can use at most 3 digits",
-                                       dateStr, m.group(1).substring(1)
-                                       ),
-                                pos.getErrorIndex());
+                    case 0:
+                        break;
                     }
                     cal.set(Calendar.MILLISECOND, msecs);
                 }

src/test/java/com/fasterxml/jackson/databind/deser/jdk/DateDeserializationTest.java

@@ -223,6 +223,31 @@ public void testISO8601PartialMilliseconds() throws Exception
         assertEquals(450, c.get(Calendar.MILLISECOND));
     }
 
+    // [Databind#1745]
+    public void testISO8601FractSecondsLong() throws Exception
+    {
+        String inputStr;
+        Date inputDate;
+        Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+
+        inputStr = "2014-10-03T18:00:00.3456-05:00";
+        inputDate = MAPPER.readValue(quote(inputStr), java.util.Date.class);
+        c.setTime(inputDate);
+        assertEquals(2014, c.get(Calendar.YEAR));
+        assertEquals(Calendar.OCTOBER, c.get(Calendar.MONTH));
+        assertEquals(3, c.get(Calendar.DAY_OF_MONTH));
+        // should truncate; not error or round
+        assertEquals(345, c.get(Calendar.MILLISECOND));
+
+        // But! Still limit to 9 digits (nanoseconds)
+        try {
+            MAPPER.readValue(quote("2014-10-03T18:00:00.1234567890-05:00"), java.util.Date.class);
+        } catch (InvalidFormatException e) {
+            verifyException(e, "invalid fractional seconds");
+            verifyException(e, "can use at most 9 digits");
+        }
+    }
+
     public void testISO8601MissingSeconds() throws Exception
     {
         String inputStr;

src/test/java/com/fasterxml/jackson/databind/introspect/TestPOJOPropertiesCollector.java renamed to src/test/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollectorTest.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-public class TestPOJOPropertiesCollector
+public class POJOPropertiesCollectorTest
     extends BaseMapTest
 {
     static class Simple {

src/test/java/com/fasterxml/jackson/databind/util/TestTokenBuffer.java

@@ -15,6 +15,10 @@ public class TestTokenBuffer extends BaseMapTest
 {
     private final ObjectMapper MAPPER = objectMapper();
 
+    static class Base1730 { }
+
+    static class Sub1730 extends Base1730 { }
+
     /*
     /**********************************************************
     /* Basic TokenBuffer tests
@@ -573,7 +577,7 @@ public void testWithMultipleJsonParserSequences() throws IOException
         buf2.close();
         buf3.close();
         buf4.close();
-    }    
+    }
 
     // [databind#743]
     public void testRawValues() throws Exception
@@ -592,4 +596,20 @@ public void testRawValues() throws Exception
         // then verify it would be serialized just fine
         assertEquals(RAW, MAPPER.writeValueAsString(buf));
     }
+
+    // [databind#1730]
+    public void testEmbeddedObjectCoerceCheck() throws Exception
+    {
+        TokenBuffer buf = new TokenBuffer(null, false);
+        Object inputPojo = new Sub1730();
+        buf.writeEmbeddedObject(inputPojo);
+
+        // first: raw value won't be transformed in any way:
+        JsonParser p = buf.asParser();
+        Base1730 out = MAPPER.readValue(p, Base1730.class);
+
+        assertSame(inputPojo, out);
+        p.close();
+        buf.close();
+    }
 }