diff --git a/pom.xml b/pom.xml
index 668e372..1ce127b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,11 +95,6 @@
3.4.6
test
-
- com.google.collections
- google-collections
- 1.0
-
diff --git a/src/main/com/sailthru/client/AbstractSailthruClient.java b/src/main/com/sailthru/client/AbstractSailthruClient.java
index f3ba484..c8a365c 100644
--- a/src/main/com/sailthru/client/AbstractSailthruClient.java
+++ b/src/main/com/sailthru/client/AbstractSailthruClient.java
@@ -1,6 +1,5 @@
package com.sailthru.client;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.sailthru.client.handler.JsonHandler;
@@ -336,12 +335,10 @@ public void setCustomHeaders(Map headers) {
customHeaders = headers;
}
- @VisibleForTesting
void setSailthruHttpClient(SailthruHttpClient httpClient) {
this.httpClient = httpClient;
}
-
private void recordRateLimitInfo(ApiAction action, HttpRequestMethod method, Object response) {
Map responseMap = (Map) response;
Object lastRateLimitInfo = responseMap.get(SailthruHandler.RATE_LIMIT_INFO_KEY);
diff --git a/src/test/com/sailthru/client/AbstractSailthruClientTest.java b/src/test/com/sailthru/client/AbstractSailthruClientTest.java
index af61e73..292d889 100644
--- a/src/test/com/sailthru/client/AbstractSailthruClientTest.java
+++ b/src/test/com/sailthru/client/AbstractSailthruClientTest.java
@@ -1,6 +1,5 @@
package com.sailthru.client;
-import com.google.common.collect.ImmutableMap;
import com.sailthru.client.http.SailthruHttpClient;
import com.sailthru.client.params.Send;
import org.apache.http.HttpHost;
@@ -23,6 +22,7 @@
import java.io.IOException;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertEquals;
@@ -60,7 +60,7 @@ public void testGetLastRateLimitInfo() throws IOException {
CloseableHttpResponse httpResponse = getMockHttpResponseWithRateLimitHeaders(limit, remaining, resetDate);
doReturn(httpResponse).when(httpClient).execute(any(HttpHost.class), any(HttpRequest.class), (HttpContext)any());
- sailthruClient.apiGet(ApiAction.send, ImmutableMap.of(Send.PARAM_SEND_ID, "some valid send id"));
+ sailthruClient.apiGet(ApiAction.send, Collections.singletonMap(Send.PARAM_SEND_ID, "some valid send id"));
LastRateLimitInfo rateLimitInfo = sailthruClient.getLastRateLimitInfo(ApiAction.send, AbstractSailthruClient.HttpRequestMethod.GET);
assertEquals(limit, rateLimitInfo.getLimit());
@@ -96,9 +96,12 @@ public void testGetLastRateLimitInfoDifferentActions() throws IOException {
.when(httpClient)
.execute(any(HttpHost.class), any(HttpRequest.class), (HttpContext)any());
- sailthruClient.apiGet(ApiAction.send, ImmutableMap.of(Send.PARAM_SEND_ID, "some valid send id"));
- sailthruClient.apiGet(ApiAction.list, ImmutableMap.of("list", "some list"));
- sailthruClient.apiPost(ApiAction.RETURN, ImmutableMap.of("email", "foo@bar.com", "items", Collections.emptyList()));
+ sailthruClient.apiGet(ApiAction.send, Collections.singletonMap(Send.PARAM_SEND_ID, "some valid send id"));
+ sailthruClient.apiGet(ApiAction.list, Collections.singletonMap("list", "some list"));
+ Map returnParams = new HashMap();
+ returnParams.put("email", "foo@bar.com");
+ returnParams.put("items", Collections.emptyList());
+ sailthruClient.apiPost(ApiAction.RETURN, returnParams);
LastRateLimitInfo sendRateLimitInfo = sailthruClient.getLastRateLimitInfo(ApiAction.send, AbstractSailthruClient.HttpRequestMethod.GET);
assertEquals(sendLimit, sendRateLimitInfo.getLimit());
@@ -134,8 +137,8 @@ public void testGetLastRateLimitInfoDifferentMethods() throws IOException {
doReturn(getHttpResponse).doReturn(postHttpResponse).when(httpClient).execute(any(HttpHost.class), any(HttpRequest.class), (HttpContext)any());
- sailthruClient.apiGet(ApiAction.list, ImmutableMap.of("list", "some list"));
- sailthruClient.apiPost(ApiAction.list, ImmutableMap.of("list", "some new list"));
+ sailthruClient.apiGet(ApiAction.list, Collections.singletonMap("list", "some list"));
+ sailthruClient.apiPost(ApiAction.list, Collections.singletonMap("list", "some new list"));
LastRateLimitInfo getLastRateLimitInfo = sailthruClient.getLastRateLimitInfo(ApiAction.list, AbstractSailthruClient.HttpRequestMethod.GET);
assertEquals(getLimit, getLastRateLimitInfo.getLimit());