Skip to content

Remove google-collections dependency #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattdudys wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove google-collections dependency #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions src/main/com/sailthru/client/AbstractSailthruClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand Down
17 changes: 10 additions & 7 deletions src/test/com/sailthru/client/AbstractSailthruClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down