Merge branch 'master' into ng-3.0

Author: cowtowncoder

.travis.yml

@@ -2,8 +2,8 @@ language: java
 
 # Since Jackson 2.7, build requires jdk7, although module itself works on jdk6 still (for now)
 jdk:
-  - oraclejdk7
-  - oraclejdk8
+  - openjdk7
+  - openjdk8
 
 # Below this line is configuration for deploying to the Sonatype OSS repo
 # http://blog.xeiam.com/2013/05/configure-travis-ci-to-deploy-snapshots.html

release-notes/CREDITS

@@ -636,6 +636,8 @@ Bertrand Renuart (brenuart@github)
    (2.9.1)
   * Contributed #1749: StdDateFormat: performance improvement of '_format(..)' method
    (2.9.1)
+  * Contributed #1759: Reuse `Calendar` instance during parsing by `StdDateFormat`
+   (2.9.1)
 
 Kevin Gallardo (newkek@github)
   * Reported #1658: Infinite recursion when deserializing a class extending a Map,

release-notes/VERSION

@@ -17,6 +17,8 @@ Project: jackson-databind
  (suggested by Bertrand R)
 #1749: StdDateFormat: performance improvement of '_format(..)' method 
  (contributed by Bertrand R)
+#1759: Reuse `Calendar` instance during parsing by `StdDateFormat`
+ (contributed by Bertrand R)
 - Fix `DelegatingDeserializer` constructor to pass `handledType()` (and
   not type of deserializer being delegated to!)
 

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

@@ -397,14 +397,7 @@ public StringBuffer format(Date date, StringBuffer toAppendTo,
     protected void _format(TimeZone tz, Locale loc, Date date,
             StringBuffer buffer)
     {
-        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...
+        Calendar cal = _getCalendar(tz);
         cal.setTime(date);
 
         pad4(buffer, cal.get(Calendar.YEAR));
@@ -561,7 +554,7 @@ protected Date parseAsISO8601(String dateStr, ParsePosition pos)
         }
     }
 
-    protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
+    protected Date _parseAsISO8601(String dateStr, ParsePosition bogus)
         throws IllegalArgumentException, ParseException
     {
         final int totalLen = dateStr.length();
@@ -570,10 +563,8 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
         if ((_timezone != null) && ('Z' != dateStr.charAt(totalLen-1))) {
             tz = _timezone;
         }
-        Calendar cal = new GregorianCalendar(tz, _locale);
-        if (_lenient != null) {
-            cal.setLenient(_lenient.booleanValue());
-        }
+        Calendar cal = _getCalendar(tz);
+        cal.clear();
         String formatStr;
         if (totalLen <= 10) {
             Matcher m = PATTERN_PLAIN.matcher(dateStr);
@@ -645,8 +636,7 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
                             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());
+                                       ), start);
                         }
                         // fall through
                     case 3:
@@ -669,7 +659,9 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition pos)
         throw new ParseException
         (String.format("Cannot parse date \"%s\": while it seems to fit format '%s', parsing fails (leniency? %s)",
                        dateStr, formatStr, _lenient),
-           pos.getErrorIndex());
+                // [databind#1742]: Might be able to give actual location, some day, but for now
+                //  we can't give anything more indicative
+                0);
     }
 
     private static int _parse4D(String str, int index) {
@@ -721,6 +713,18 @@ protected void _clearFormats() {
         _formatRFC1123 = null;
     }
 
+    protected Calendar _getCalendar(TimeZone tz) {
+        Calendar cal = _calendar;
+        if (cal == null ) {
+            _calendar = cal = (Calendar)CALENDAR.clone();
+        }
+        if (!cal.getTimeZone().equals(tz) ) {
+            cal.setTimeZone(tz);
+        }
+        cal.setLenient(isLenient());
+        return cal;
+    }
+    
     protected static <T> boolean _equals(T value1, T value2) {
         if (value1 == value2) {
             return true;

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

@@ -225,7 +225,6 @@ public void testIntBooleanMap() throws Exception
         String JSON = "{ \"1\" : true, \"-1\" : false }";
         Map<Object,Object> result = MAPPER.readValue
             (JSON, new TypeReference<HashMap<Integer,Boolean>>() { });
-
         assertNotNull(result);
         assertEquals(HashMap.class, result.getClass());
         assertEquals(2, result.size());

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

@@ -176,6 +176,7 @@ public void testSampleDoc() throws Exception
         // and that's all folks!
     }
 
+    @SuppressWarnings("unlikely-arg-type")
     public void testUntypedMap() throws Exception
     {
         // to get "untyped" default map-to-map, pass Object.class

src/test/java/com/fasterxml/jackson/databind/misc/RaceCondition738Test.java

@@ -63,7 +63,7 @@ public void testRepeatedly() throws Exception {
     }
 
     void runOnce(int round, int max) throws Exception {
-        final ObjectMapper mapper = getObjectMapper();
+        final ObjectMapper mapper = newObjectMapper();
         Callable<String> writeJson = new Callable<String>() {
             @Override
             public String call() throws Exception {
@@ -92,8 +92,4 @@ public String call() throws Exception {
             }
         }
     }
-
-    private static ObjectMapper getObjectMapper() {
-        return new ObjectMapper();
-    }
 }

src/test/java/com/fasterxml/jackson/databind/misc/ThreadSafety1759Test.java

@@ -0,0 +1,71 @@
+package com.fasterxml.jackson.databind.misc;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.fasterxml.jackson.databind.*;
+
+public class ThreadSafety1759Test extends BaseMapTest
+{
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    public void testCalendarForDeser() throws Exception
+    {
+        final ObjectMapper mapper = newObjectMapper();
+
+        final int numThreads = 4;
+        final int COUNT = 3000;
+        final AtomicInteger counter = new AtomicInteger();
+
+        // IMPORTANT! Use different timestamp for every thread
+        List<Callable<Throwable>> calls = new ArrayList<Callable<Throwable>>();
+        for (int thread = 1; thread <= numThreads; ++thread) {
+            final String json = quote(String.format("2017-01-%02dT16:30:49Z", thread));
+            final long timestamp = mapper.readValue(json, Date.class).getTime();
+
+            calls.add(createCallable(thread, mapper, json, timestamp, COUNT, counter));
+        }
+
+        ExecutorService executor = Executors.newFixedThreadPool(numThreads);
+        List<Future<Throwable>> results = new ArrayList<>();
+        for (Callable<Throwable> c : calls) {
+            results.add(executor.submit(c));
+        }
+        executor.shutdown();
+        for (Future<Throwable> f : results) {
+            Throwable t = f.get(5, TimeUnit.SECONDS);
+            if (t != null) {
+                fail("Exception during processing: "+t.getMessage());
+            }
+        }
+        assertEquals(numThreads * COUNT, counter.get());
+    }
+
+    private Callable<Throwable> createCallable(final int threadId,
+            final ObjectMapper mapper,
+            final String json, final long timestamp,
+            final int count, final AtomicInteger counter)
+    {
+        return new Callable<Throwable>() {
+            @Override
+            public Throwable call() throws IOException {
+                for (int i = 0; i < count; ++i) {
+                    Date dt = mapper.readValue(json, Date.class);
+                    if (dt.getTime() != timestamp) {
+                        return new IllegalArgumentException("Wrong timestamp (thread id "+threadId+", input: "+json+": should get "+timestamp+", got "+dt.getTime());
+                    }
+                    counter.addAndGet(1);
+                }
+                return null;
+            }
+        };
+    }
+}