Migrate DateParser to java.time, close AsyncHttpClient#1011

Author: slandelle

client/src/main/java/org/asynchttpclient/cookie/CookieUtil.java

@@ -12,7 +12,6 @@
  */
 package org.asynchttpclient.cookie;
 
-import java.text.ParsePosition;
 import java.util.BitSet;
 import java.util.Date;
 
@@ -97,7 +96,7 @@ static CharSequence unwrapValue(CharSequence cs) {
 
     static long computeExpires(String expires) {
         if (expires != null) {
-            Date expiresDate = DateParser.get().parse(expires, new ParsePosition(0));
+            Date expiresDate = DateParser.parse(expires);
             if (expiresDate != null)
                 return expiresDate.getTime();
         }

client/src/main/java/org/asynchttpclient/cookie/DateParser.java

@@ -12,85 +12,50 @@
  */
 package org.asynchttpclient.cookie;
 
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Locale;
-import java.util.TimeZone;
 
 /**
  * A parser for <a href="http://tools.ietf.org/html/rfc2616#section-3.3">RFC2616
  * Date format</a>.
  * 
  * @author slandelle
  */
-@SuppressWarnings("serial")
-public class DateParser extends SimpleDateFormat {
-
-    private final SimpleDateFormat format1 = new RFC2616DateParserObsolete1();
-    private final SimpleDateFormat format2 = new RFC2616DateParserObsolete2();
-
-    private static final ThreadLocal<DateParser> DATE_FORMAT_HOLDER = new ThreadLocal<DateParser>() {
-        @Override
-        protected DateParser initialValue() {
-            return new DateParser();
+public final class DateParser {
+
+    private static final DateTimeFormatter PROPER_FORMAT_RFC822 = DateTimeFormatter.RFC_1123_DATE_TIME;
+    // give up on pre 2000 dates
+    private static final DateTimeFormatter OBSOLETE_FORMAT1_RFC850 = DateTimeFormatter.ofPattern("EEEE, dd-MMM-yy HH:mm:ss z", Locale.ENGLISH);
+    private static final DateTimeFormatter OBSOLETE_FORMAT2_ANSIC = DateTimeFormatter.ofPattern("EEE MMM d HH:mm:ss yyyy", Locale.ENGLISH);
+
+    private static Date parseZonedDateTimeSilent(String text, DateTimeFormatter formatter) {
+        try {
+            return Date.from(ZonedDateTime.parse(text, formatter).toInstant());
+        } catch (Exception e) {
+            return null;
         }
-    };
-
-    public static DateParser get() {
-        return DATE_FORMAT_HOLDER.get();
     }
 
-    /**
-     * Standard date format
-     * <br>
-     * E, d MMM yyyy HH:mm:ss z
-     * e.g. Sun, 06 Nov 1994 08:49:37 GMT
-     */
-    private DateParser() {
-        super("E, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH);
-        setTimeZone(TimeZone.getTimeZone("GMT"));
+    private static Date parseDateTimeSilent(String text, DateTimeFormatter formatter) {
+        try {
+            return Date.from(LocalDateTime.parse(text, formatter).toInstant(ZoneOffset.UTC));
+        } catch (Exception e) {
+            return null;
+        }
     }
 
-    @Override
-    public Date parse(String text, ParsePosition pos) {
-        Date date = super.parse(text, pos);
+    public static Date parse(String text) {
+        Date date = parseZonedDateTimeSilent(text, PROPER_FORMAT_RFC822);
         if (date == null) {
-            date = format1.parse(text, pos);
+            date = parseZonedDateTimeSilent(text, OBSOLETE_FORMAT1_RFC850);
         }
         if (date == null) {
-            date = format2.parse(text, pos);
+            date = parseDateTimeSilent(text, OBSOLETE_FORMAT2_ANSIC);
         }
         return date;
     }
-
-    /**
-     * First obsolete format
-     * <br>
-     * E, d-MMM-y HH:mm:ss z
-     * e.g. Sunday, 06-Nov-94 08:49:37 GMT
-     */
-    private static final class RFC2616DateParserObsolete1 extends SimpleDateFormat {
-        private static final long serialVersionUID = -3178072504225114298L;
-
-        RFC2616DateParserObsolete1() {
-            super("E, dd-MMM-yy HH:mm:ss z", Locale.ENGLISH);
-            setTimeZone(TimeZone.getTimeZone("GMT"));
-        }
-    }
-
-    /**
-     * Second obsolete format
-     * <br>
-     * EEE, MMM d HH:mm:ss yyyy
-     * e.g. Sun Nov 6 08:49:37 1994
-     */
-    private static final class RFC2616DateParserObsolete2 extends SimpleDateFormat {
-        private static final long serialVersionUID = 3010674519968303714L;
-
-        RFC2616DateParserObsolete2() {
-            super("E MMM d HH:mm:ss yyyy", Locale.ENGLISH);
-            setTimeZone(TimeZone.getTimeZone("GMT"));
-        }
-    }
 }

client/src/test/java/org/asynchttpclient/cookie/RFC2616DateParserTest.java renamed to client/src/test/java/org/asynchttpclient/cookie/DateParserTest.java

@@ -28,11 +28,11 @@
  * 
  * @author slandelle
  */
-public class RFC2616DateParserTest {
+public class DateParserTest {
 
     @Test(groups = "fast")
     public void testRFC822() throws ParseException {
-        Date date = DateParser.get().parse("Sun, 06 Nov 1994 08:49:37 GMT");
+        Date date = DateParser.parse("Sun, 06 Nov 1994 08:49:37 GMT");
         assertNotNull(date);
 
         Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));
@@ -48,7 +48,7 @@ public void testRFC822() throws ParseException {
 
     @Test(groups = "fast")
     public void testRFC822SingleDigitDayOfMonth() throws ParseException {
-        Date date = DateParser.get().parse("Sun, 6 Nov 1994 08:49:37 GMT");
+        Date date = DateParser.parse("Sun, 6 Nov 1994 08:49:37 GMT");
         assertNotNull(date);
 
         Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));
@@ -64,7 +64,7 @@ public void testRFC822SingleDigitDayOfMonth() throws ParseException {
 
     @Test(groups = "fast")
     public void testRFC822SingleDigitHour() throws ParseException {
-        Date date = DateParser.get().parse("Sun, 6 Nov 1994 8:49:37 GMT");
+        Date date = DateParser.parse("Sun, 6 Nov 1994 8:49:37 GMT");
         assertNotNull(date);
 
         Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));
@@ -80,23 +80,23 @@ public void testRFC822SingleDigitHour() throws ParseException {
 
     @Test(groups = "fast")
     public void testRFC850() throws ParseException {
-        Date date = DateParser.get().parse("Sunday, 06-Nov-94 08:49:37 GMT");
+        Date date = DateParser.parse("Saturday, 06-Nov-94 08:49:37 GMT");
         assertNotNull(date);
-        
+
         Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));
         cal.setTime(date);
-        assertEquals(cal.get(Calendar.DAY_OF_WEEK), Calendar.SUNDAY);
+        assertEquals(cal.get(Calendar.DAY_OF_WEEK), Calendar.SATURDAY);
         assertEquals(cal.get(Calendar.DAY_OF_MONTH), 6);
         assertEquals(cal.get(Calendar.MONTH), Calendar.NOVEMBER);
-        assertEquals(cal.get(Calendar.YEAR), 1994);
+        assertEquals(cal.get(Calendar.YEAR), 2094);
         assertEquals(cal.get(Calendar.HOUR), 8);
         assertEquals(cal.get(Calendar.MINUTE), 49);
         assertEquals(cal.get(Calendar.SECOND), 37);
     }
 
     @Test(groups = "fast")
     public void testANSIC() throws ParseException {
-        Date date = DateParser.get().parse("Sun Nov  6 08:49:37 1994");
+        Date date = DateParser.parse("Sun Nov 6 08:49:37 1994");
         assertNotNull(date);
 
         Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"));

client/src/test/java/org/asynchttpclient/netty/NettyAsyncResponseTest.java

@@ -27,15 +27,12 @@
 import org.asynchttpclient.cookie.Cookie;
 import org.testng.annotations.Test;
 
-/**
- * @author Benjamin Hanzelmann
- */
 public class NettyAsyncResponseTest {
 
     @Test(groups = "standalone")
     public void testCookieParseExpires() {
-        // e.g. "Sun, 06-Feb-2012 03:45:24 GMT";
-        SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd-MMM-yyyy HH:mm:ss z", Locale.US);
+        // e.g. "Tue, 27 Oct 2015 12:54:24 GMT";
+        SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
         sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
 
         Date date = new Date(System.currentTimeMillis() + 60000);