From 2c80847c93c173b971d61ec3782355d380dfc798 Mon Sep 17 00:00:00 2001
From: Matt Dudys <mdudys@sailthru.com>
Date: Mon, 24 Aug 2020 10:34:40 -0400
Subject: [PATCH] Remove google-collections dependency

google-collections is old and has been succeeded by google-guava. It was
only used in unit tests cases for the convenience of constructing small
maps. These can be mostly replaced with Collections.singletonMap. Having
it as a compile dependency meant that this was propagated to dependent
projects.

Theoretically a dependent project could be relying on this transitive
dependency and break when it is removed, so I think this should be a
minor version bump.
---
 pom.xml                                         |  5 -----
 .../sailthru/client/AbstractSailthruClient.java |  3 ---
 .../client/AbstractSailthruClientTest.java      | 17 ++++++++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 668e372..1ce127b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,11 +95,6 @@
       <version>3.4.6</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
-      <version>1.0</version>
-    </dependency>
   </dependencies>
 
   <build>
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<String, String> headers) {
         customHeaders = headers;
     }
 
-    @VisibleForTesting
     void setSailthruHttpClient(SailthruHttpClient httpClient) {
         this.httpClient = httpClient;
     }
 
-
     private void recordRateLimitInfo(ApiAction action, HttpRequestMethod method, Object response) {
         Map<String,Object> responseMap = (Map<String,Object>) 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.<String,Object>of(Send.PARAM_SEND_ID, "some valid send id"));
+        sailthruClient.apiGet(ApiAction.send, Collections.<String, Object>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.<String,Object>of(Send.PARAM_SEND_ID, "some valid send id"));
-        sailthruClient.apiGet(ApiAction.list, ImmutableMap.<String,Object>of("list", "some list"));
-        sailthruClient.apiPost(ApiAction.RETURN, ImmutableMap.of("email", "foo@bar.com", "items", Collections.emptyList()));
+        sailthruClient.apiGet(ApiAction.send, Collections.<String, Object>singletonMap(Send.PARAM_SEND_ID, "some valid send id"));
+        sailthruClient.apiGet(ApiAction.list, Collections.<String, Object>singletonMap("list", "some list"));
+        Map<String, Object> returnParams = new HashMap<String, Object>();
+        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.<String,Object>of("list", "some list"));
-        sailthruClient.apiPost(ApiAction.list, ImmutableMap.<String,Object>of("list", "some new list"));
+        sailthruClient.apiGet(ApiAction.list, Collections.<String, Object>singletonMap("list", "some list"));
+        sailthruClient.apiPost(ApiAction.list, Collections.<String, Object>singletonMap("list", "some new list"));
 
         LastRateLimitInfo getLastRateLimitInfo = sailthruClient.getLastRateLimitInfo(ApiAction.list, AbstractSailthruClient.HttpRequestMethod.GET);
         assertEquals(getLimit, getLastRateLimitInfo.getLimit());