svn commit: r1048896 - in /httpcomponents/httpcore/trunk/httpcore/src: main/java/org/apache/http/params/BasicHttpParams.java test/java/org/apache/http/params/TestBasicHttpParams.java

[se...@apache.org]

Author: sebb
Date: Tue Dec 14 01:35:50 2010
New Revision: 1048896

URL: http://svn.apache.org/viewvc?rev=1048896&view=rev
Log:
Provide access to the underlying parameter set

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java?rev=1048896&r1=1048895&r2=1048896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java Tue Dec 14 01:35:50 2010
@@ -28,9 +28,11 @@
 package org.apache.http.params;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Set;
 
 import org.apache.http.params.HttpParams;
 
@@ -163,4 +165,13 @@ public class BasicHttpParams extends Abs
         }
     }
 
+    /**
+     * Provide access to the set of parameters as Map.Entry elements.
+     * 
+     * @return the Set of Map.Entry<String, Object> elements
+     * @since 4.1.1
+     */
+    public Set entrySet(){
+        return Collections.unmodifiableMap(parameters).entrySet();
+    }
 }

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java?rev=1048896&r1=1048895&r2=1048896&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java Tue Dec 14 01:35:50 2010
@@ -27,6 +27,10 @@
 
 package org.apache.http.params;
 
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import junit.framework.TestCase;
 
 /**
@@ -53,4 +57,18 @@ public class TestBasicHttpParams extends
                 params.removeParameter("param1"));
     }
 
+    public void testIterate() {
+        BasicHttpParams params = new BasicHttpParams();
+        Set entrySet = params.entrySet();
+        Iterator iterator = entrySet.iterator();
+        assertTrue(entrySet.isEmpty());
+        assertFalse(iterator.hasNext());
+        params.setBooleanParameter("true", true);
+        assertFalse(entrySet.isEmpty());
+        assertEquals(1, entrySet.size());
+        iterator = entrySet.iterator(); // refetch, as iterator is a snapshot
+        assertTrue("Iterator has an entry",iterator.hasNext());
+        Entry entry = (Entry) iterator.next();
+        assertTrue((Boolean) entry.getValue());
+    }
 }