Removed google-collections dependency; renamed headers class as it re…

…ally wasn't headers specific
ning · Jul 23, 2010 · ecd9b19 · ecd9b19
1 parent ac3f34f
commit ecd9b19
Show file tree

Hide file tree

Showing 22 changed files with 2,516 additions and 1,345 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,7 @@
         <developer>
             <id>thomd</id>
             <name>Thomas Dudziak</name>
+            <email>tomdz@apache.org</email>
         </developer>
         <developer>
             <id>neotyk</id>
@@ -74,12 +75,6 @@
             <version>1.2.13</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>1.0</version>
-        </dependency>
-
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/src/main/java/com/ning/http/client/AsyncHttpClient.java b/src/main/java/com/ning/http/client/AsyncHttpClient.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import com.google.common.collect.Multimap;
 import com.ning.http.client.Request.EntityWriter;
 
 /**
@@ -268,7 +267,7 @@ public BoundRequestBuilder setHeader(String name, String value) {
         }
 
         @Override
-        public BoundRequestBuilder setHeaders(Headers headers) {
+        public BoundRequestBuilder setHeaders(FluentCaseInsensitiveStringsMap headers) {
             return super.setHeaders(headers);
         }
 
@@ -283,7 +282,7 @@ public BoundRequestBuilder setParameters(Map<String, String> parameters) throws
         }
 
         @Override
-        public BoundRequestBuilder setParameters(Multimap<String, String> parameters) throws IllegalArgumentException {
+        public BoundRequestBuilder setParameters(FluentStringsMap parameters) throws IllegalArgumentException {
             return super.setParameters(parameters);
         }