Drop TimeConverter, stick to RFC 2616, close AsyncHttpClient#778

Author: Stephane Landelle

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

@@ -17,7 +17,6 @@
 
 import static com.ning.http.client.AsyncHttpClientConfigDefaults.*;
 
-import com.ning.http.client.date.TimeConverter;
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.RequestFilter;
 import com.ning.http.client.filter.ResponseFilter;
@@ -78,7 +77,6 @@ public class AsyncHttpClientConfig {
     protected int maxRequestRetry;
     protected boolean disableUrlEncodingForBoundRequests;
     protected int ioThreadMultiplier;
-    protected TimeConverter timeConverter;
     protected String[] enabledProtocols;
     protected String[] enabledCipherSuites;
     protected AsyncHttpProviderConfig<?, ?> providerConfig;
@@ -115,7 +113,6 @@ private AsyncHttpClientConfig(int connectTimeout,//
             int maxRequestRetry, //
             boolean disableUrlEncodingForBoundedRequests, //
             int ioThreadMultiplier, //
-            TimeConverter timeConverter,//
             String[] enabledProtocols,//
             String[] enabledCipherSuites,//
             AsyncHttpProviderConfig<?, ?> providerConfig) {
@@ -149,7 +146,6 @@ private AsyncHttpClientConfig(int connectTimeout,//
         this.maxRequestRetry = maxRequestRetry;
         this.disableUrlEncodingForBoundRequests = disableUrlEncodingForBoundedRequests;
         this.ioThreadMultiplier = ioThreadMultiplier;
-        this.timeConverter = timeConverter;
         this.enabledProtocols = enabledProtocols;
         this.enabledCipherSuites = enabledCipherSuites;
         this.providerConfig = providerConfig;
@@ -441,13 +437,6 @@ public int getConnectionTTL() {
         return connectionTTL;
     }
 
-    /**
-     * since 1.8.2
-     */
-    public TimeConverter getTimeConverter() {
-        return timeConverter;
-    }
-
     /**
      * since 1.9.0
      */
@@ -506,7 +495,6 @@ public static class Builder {
         private int ioThreadMultiplier = defaultIoThreadMultiplier();
         private String[] enabledProtocols;
         private String[] enabledCipherSuites;
-        private TimeConverter timeConverter;
         private AsyncHttpProviderConfig<?, ?> providerConfig;
 
         public Builder() {
@@ -915,11 +903,6 @@ public Builder setConnectionTTL(int connectionTTL) {
             return this;
         }
 
-        public Builder setTimeConverter(TimeConverter timeConverter) {
-            this.timeConverter = timeConverter;
-            return this;
-        }
-
         public Builder setAcceptAnyCertificate(boolean acceptAnyCertificate) {
             this.acceptAnyCertificate = acceptAnyCertificate;
             return this;
@@ -974,7 +957,6 @@ public Builder(AsyncHttpClientConfig prototype) {
             removeQueryParamOnRedirect = prototype.isRemoveQueryParamOnRedirect();
             hostnameVerifier = prototype.getHostnameVerifier();
             strict302Handling = prototype.isStrict302Handling();
-            timeConverter = prototype.timeConverter;
             enabledProtocols = prototype.enabledProtocols;
             enabledCipherSuites = prototype.enabledCipherSuites;
             acceptAnyCertificate = prototype.acceptAnyCertificate;
@@ -1039,7 +1021,6 @@ else if (hostnameVerifier == null)
                     maxRequestRetry, //
                     disableUrlEncodingForBoundedRequests, //
                     ioThreadMultiplier, //
-                    timeConverter,//
                     enabledProtocols, //
                     enabledCipherSuites, //
                     providerConfig);

src/main/java/com/ning/http/client/cookie/CookieDecoder.java

@@ -12,32 +12,21 @@
  */
 package com.ning.http.client.cookie;
 
-import com.ning.http.client.date.CalendarTimeConverter;
-import com.ning.http.client.date.TimeConverter;
 import com.ning.http.util.StringUtils;
 
 public class CookieDecoder {
 
-    public static final TimeConverter DEFAULT_TIME_CONVERTER = new CalendarTimeConverter();
-
-    public static Cookie decode(String header) {
-        return decode(header, DEFAULT_TIME_CONVERTER);
-    }
-
     /**
      * Decodes the specified HTTP header value into {@link Cookie}.
      * 
      * @return the decoded {@link Cookie}
      */
-    public static Cookie decode(String header, TimeConverter timeConverter) {
-
-        if (timeConverter == null)
-            timeConverter = DEFAULT_TIME_CONVERTER;
+    public static Cookie decode(String header) {
 
         if (header.length() == 0)
             return null;
 
-        KeyValuePairsParser pairsParser = new KeyValuePairsParser(timeConverter);
+        KeyValuePairsParser pairsParser = new KeyValuePairsParser();
 
         final int headerLen = header.length();
         loop: for (int i = 0;;) {

src/main/java/com/ning/http/client/cookie/KeyValuePairsParser.java

@@ -12,9 +12,8 @@
  */
 package com.ning.http.client.cookie;
 
-import com.ning.http.client.date.RFC2616Date;
-import com.ning.http.client.date.RFC2616DateParser;
-import com.ning.http.client.date.TimeConverter;
+import java.text.ParsePosition;
+import java.util.Date;
 
 /**
  * A companion for CookieDecoder that parses key-value pairs (cookie name/value
@@ -24,28 +23,30 @@
  */
 class KeyValuePairsParser {
 
-    private final TimeConverter timeBuilder;
     private String name;
     private String value;
     private String rawValue;
     private String domain;
     private String path;
-    private long expires = -1L;
+    private String expires;
     private int maxAge = -1;
     private boolean secure;
     private boolean httpOnly;
 
-    /**
-     * @param timeBuilder used for parsing expires attribute
-     */
-    public KeyValuePairsParser(TimeConverter timeBuilder) {
-        this.timeBuilder = timeBuilder;
-    }
-
     public Cookie cookie() {
-        return name != null ? new Cookie(name, value, rawValue, domain, path, expires, maxAge, secure, httpOnly) : null;
+        return name != null ? new Cookie(name, value, rawValue, domain, path, computeExpires(), maxAge, secure, httpOnly) : null;
     }
 
+    private long computeExpires() {
+        if (expires != null) {
+            Date expiresDate = RFC2616DateParser.get().parse(expires, new ParsePosition(0));
+            if (expiresDate != null)
+                return expiresDate.getTime();
+        }
+        
+        return -1L;
+    }
+    
     /**
      * Parse and store a key-value pair. First one is considered to be the
      * cookie name/value. Unknown attribute names are silently discarded.
@@ -156,15 +157,7 @@ private boolean isMaxAge(char c0, char c1, char c2, char c3, char c4, char c5, c
     }
 
     private void setExpire(String value) {
-
-        RFC2616Date dateElements = new RFC2616DateParser(value).parse();
-        if (dateElements != null) {
-            try {
-                expires = timeBuilder.toTime(dateElements);
-            } catch (Exception e1) {
-                // ignore failure to parse -> treat as session cookie
-            }
-        }
+        expires = value;
     }
 
     private void setMaxAge(String value) {

src/main/java/com/ning/http/client/cookie/RFC2616DateParser.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014 AsyncHttpClient Project. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+package com.ning.http.client.cookie;
+
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+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 RFC2616DateParser extends SimpleDateFormat {
+
+    private final SimpleDateFormat format1 = new RFC2616DateParserObsolete1();
+    private final SimpleDateFormat format2 = new RFC2616DateParserObsolete2();
+
+    private static final ThreadLocal<RFC2616DateParser> DATE_FORMAT_HOLDER = new ThreadLocal<RFC2616DateParser>() {
+        @Override
+        protected RFC2616DateParser initialValue() {
+            return new RFC2616DateParser();
+        }
+    };
+
+    public static RFC2616DateParser get() {
+        return DATE_FORMAT_HOLDER.get();
+    }
+
+    /**
+     * Standard date format<p>
+     * Sun, 06 Nov 1994 08:49:37 GMT -> E, d MMM yyyy HH:mm:ss z
+     */
+    private RFC2616DateParser() {
+        super("E, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH);
+        setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
+
+    @Override
+    public Date parse(String text, ParsePosition pos) {
+        Date date = super.parse(text, pos);
+        if (date == null) {
+            date = format1.parse(text, pos);
+        }
+        if (date == null) {
+            date = format2.parse(text, pos);
+        }
+        return date;
+    }
+
+    /**
+     * First obsolete format<p>
+     * Sunday, 06-Nov-94 08:49:37 GMT -> E, d-MMM-y HH:mm:ss z
+     */
+    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
+     * <p>
+     * Sun Nov 6 08:49:37 1994 -> EEE, MMM d HH:mm:ss yyyy
+     */
+    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"));
+        }
+    }
+}