You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/01/12 21:44:31 UTC

svn commit: r1724317 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http: cookie/Cookie.java cookie/CookiePriorityComparator.java impl/cookie/BasicClientCookie.java

Author: olegk
Date: Tue Jan 12 20:44:31 2016
New Revision: 1724317

URL: http://svn.apache.org/viewvc?rev=1724317&view=rev
Log:
Added #getCreationDate method to Cookie interface

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java?rev=1724317&r1=1724316&r2=1724317&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java Tue Jan 12 20:44:31 2016
@@ -124,7 +124,10 @@ public interface Cookie {
      */
     boolean isExpired(final Date date);
 
-    //TODO: RFC 6265 requires cookies to track their creation time; add #getCreationDate()
+    /**
+     * Returns creation time of the cookie.
+     */
+    Date getCreationDate();
 
 }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java?rev=1724317&r1=1724316&r2=1724317&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePriorityComparator.java Tue Jan 12 20:44:31 2016
@@ -31,7 +31,6 @@ import java.util.Comparator;
 import java.util.Date;
 
 import org.apache.hc.core5.annotation.Immutable;
-import org.apache.http.impl.cookie.BasicClientCookie;
 
 /**
  * This cookie comparator ensures that cookies with longer paths take precedence over
@@ -54,11 +53,10 @@ public class CookiePriorityComparator im
     public int compare(final Cookie c1, final Cookie c2) {
         final int l1 = getPathLength(c1);
         final int l2 = getPathLength(c2);
-        //TODO: processChallenge this class once Cookie interface has been expended with #getCreationTime method
         final int result = l2 - l1;
-        if (result == 0 && c1 instanceof BasicClientCookie && c2 instanceof BasicClientCookie) {
-            final Date d1 = ((BasicClientCookie) c1).getCreationDate();
-            final Date d2 = ((BasicClientCookie) c2).getCreationDate();
+        if (result == 0) {
+            final Date d1 = c1.getCreationDate();
+            final Date d2 = c2.getCreationDate();
             if (d1 != null && d2 != null) {
                 return (int) (d1.getTime() - d2.getTime());
             }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=1724317&r1=1724316&r2=1724317&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java Tue Jan 12 20:44:31 2016
@@ -234,6 +234,7 @@ public class BasicClientCookie implement
     /**
      * @since 4.4
      */
+    @Override
     public Date getCreationDate() {
         return creationDate;
     }