hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r988723 - in /httpcomponents/httpclient/branches/4.0.x/httpclient/src: main/java/org/apache/http/impl/client/ main/java/org/apache/http/impl/cookie/ test/java/org/apache/http/impl/client/
Date Tue, 24 Aug 2010 20:54:04 GMT
Author: olegk
Date: Tue Aug 24 20:54:03 2010
New Revision: 988723

URL: http://svn.apache.org/viewvc?rev=988723&view=rev
Log:
Made BasicClientCookie, BasicClientCookie2, and BasicCookieStore Serializable

Added:
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
  (with props)
Modified:
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java?rev=988723&r1=988722&r2=988723&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
(original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
Tue Aug 24 20:54:03 2010
@@ -26,6 +26,7 @@
 
 package org.apache.http.impl.client;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -46,7 +47,9 @@ import org.apache.http.cookie.CookieIden
  * @since 4.0
  */
 @ThreadSafe
-public class BasicCookieStore implements CookieStore {
+public class BasicCookieStore implements CookieStore, Serializable {
+
+    private static final long serialVersionUID = -1113466491038527240L;
 
     @GuardedBy("this")
     private final ArrayList<Cookie> cookies;

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=988723&r1=988722&r2=988723&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
(original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
Tue Aug 24 20:54:03 2010
@@ -27,6 +27,7 @@
 
 package org.apache.http.impl.cookie;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -43,7 +44,9 @@ import org.apache.http.cookie.SetCookie;
  * @since 4.0
  */
 @NotThreadSafe
-public class BasicClientCookie implements SetCookie, ClientCookie, Cloneable {
+public class BasicClientCookie implements SetCookie, ClientCookie, Cloneable, Serializable
{
+
+    private static final long serialVersionUID = -3869795591041535538L;
 
     /**
      * Default Constructor taking a name and a value. The value may be null.

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java?rev=988723&r1=988722&r2=988723&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
(original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
Tue Aug 24 20:54:03 2010
@@ -41,6 +41,8 @@ import org.apache.http.cookie.SetCookie2
 @NotThreadSafe
 public class BasicClientCookie2 extends BasicClientCookie implements SetCookie2 {
 
+    private static final long serialVersionUID = -6913749905211574650L;
+
     private String commentURL;
     private int[] ports;
     private boolean discard;

Added: httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java?rev=988723&view=auto
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
(added)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
Tue Aug 24 20:54:03 2010
@@ -0,0 +1,98 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.client;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Calendar;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.http.cookie.Cookie;
+import org.apache.http.impl.cookie.BasicClientCookie;
+
+/**
+ * Unit tests for {@link BasicCookieStore}.
+ */
+public class TestBasicCookieStore extends TestCase {
+
+    public void testBasics() throws Exception {
+        BasicCookieStore store = new BasicCookieStore();
+        store.addCookie(new BasicClientCookie("name1", "value1"));
+        store.addCookies(new BasicClientCookie[] {new BasicClientCookie("name2", "value2")});
+        List<Cookie> l = store.getCookies();
+        assertNotNull(l);
+        assertEquals(2, l.size());
+        assertEquals("name1", l.get(0).getName());
+        assertEquals("name2", l.get(1).getName());
+        store.clear();
+        l = store.getCookies();
+        assertNotNull(l);
+        assertEquals(0, l.size());
+    }
+
+    public void testExpiredCookie() throws Exception {
+        BasicCookieStore store = new BasicCookieStore();
+        BasicClientCookie cookie = new BasicClientCookie("name1", "value1");
+
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.DAY_OF_YEAR, -10);
+        cookie.setExpiryDate(c.getTime());
+        store.addCookie(cookie);
+        List<Cookie> l = store.getCookies();
+        assertNotNull(l);
+        assertEquals(0, l.size());
+    }
+
+    public void testSerialization() throws Exception {
+        BasicCookieStore orig = new BasicCookieStore();
+        orig.addCookie(new BasicClientCookie("name1", "value1"));
+        orig.addCookie(new BasicClientCookie("name2", "value2"));
+        ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
+        ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
+        outstream.writeObject(orig);
+        outstream.close();
+        byte[] raw = outbuffer.toByteArray();
+        ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
+        ObjectInputStream instream = new ObjectInputStream(inbuffer);
+        BasicCookieStore clone = (BasicCookieStore) instream.readObject();
+        List<Cookie> expected = orig.getCookies();
+        List<Cookie> clones = clone.getCookies();
+        assertNotNull(expected);
+        assertNotNull(clones);
+        assertEquals(expected.size(), clones.size());
+        for (int i = 0; i < expected.size(); i++) {
+            assertEquals(expected.get(i).getName(), clones.get(i).getName());
+            assertEquals(expected.get(i).getValue(), clones.get(i).getValue());
+        }
+    }
+
+}

Propchange: httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCookieStore.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message