Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: httpclient-dev@jakarta.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r418102 -
 /jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java
Date: Thu, 29 Jun 2006 18:06:12 -0000
To: httpclient-commits@jakarta.apache.org
From: olegk@apache.org
Message-Id: <20060629180612.7BB9C1A983A@eris.apache.org>

Author: olegk
Date: Thu Jun 29 11:06:11 2006
New Revision: 418102

URL: http://svn.apache.org/viewvc?rev=418102&view=rev
Log:
* Cookie is no longer a subclass of NameValuePair
* Removed #equals and #hashCode methods. The concept of identity equality and value equality of cookies is domain specific. It should be addressed at the application level

Modified:
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java?rev=418102&r1=418101&r2=418102&view=diff
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/cookie/Cookie.java Thu Jun 29 11:06:11 2006
@@ -31,9 +31,6 @@
 
 import java.util.Date;
 
-import org.apache.http.NameValuePair;
-import org.apache.http.util.LangUtils;
-
 /**
  * <p>
  * HTTP "magic-cookie" represents a piece of state information
@@ -54,13 +51,39 @@
  * 
  * @version $Revision$
  */
-public class Cookie extends NameValuePair {
+public class Cookie {
 
     /**
-     * Default constructor. Creates a blank cookie 
+     * Default Constructor taking a name and a value. The value may be null.
+     * 
+     * @param name The name.
+     * @param value The value.
      */
     public Cookie(final String name, final String value) {
-        super(name, value);
+        super();
+        if (name == null) {
+            throw new IllegalArgumentException("Name may not be null");
+        }
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * Returns the name.
+     *
+     * @return String name The name
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Returns the value.
+     *
+     * @return String value The current value.
+     */
+    public String getValue() {
+        return this.value;
     }
 
     /**
@@ -150,10 +173,6 @@
      */
     public void setDomain(String domain) {
         if (domain != null) {
-            int ndx = domain.indexOf(":");
-            if (ndx != -1) {
-              domain = domain.substring(0, ndx);
-            }
             cookieDomain = domain.toLowerCase();
         } else {
             cookieDomain = null;
@@ -303,39 +322,10 @@
         return hasDomainAttribute;
     }
 
-    /**
-     * Returns a hash code in keeping with the
-     * {@link Object#hashCode} general hashCode contract.
-     * @return A hash code
-     */
-    public int hashCode() {
-        int hash = LangUtils.HASH_SEED;
-        hash = LangUtils.hashCode(hash, this.getName());
-        hash = LangUtils.hashCode(hash, this.cookieDomain);
-        hash = LangUtils.hashCode(hash, this.cookiePath);
-        return hash;
-    }
-
-
-    /**
-     * Two cookies are equal if the name, path and domain match.
-     * @param obj The object to compare against.
-     * @return true if the two objects are equal.
-     */
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (this == obj) return true;
-        if (obj instanceof Cookie) {
-            Cookie that = (Cookie) obj;
-            return LangUtils.equals(this.getName(), that.getName())
-                  && LangUtils.equals(this.cookieDomain, that.cookieDomain)
-                  && LangUtils.equals(this.cookiePath, that.cookiePath);
-        } else {
-            return false;
-        }
-    }
-
    // ----------------------------------------------------- Instance Variables
+
+    private final String name;
+    private final String value;
 
    /** Comment attribute. */
    private String  cookieComment;