diff --git a/src/main/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceImpl.java b/src/main/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceImpl.java index 0432989d..4ce017e4 100644 --- a/src/main/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceImpl.java +++ b/src/main/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceImpl.java @@ -1,6 +1,7 @@ package com.appdirect.sdk.meteredusage.service; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.UUID; @@ -22,7 +23,6 @@ import com.appdirect.sdk.meteredusage.model.MeteredUsageResponse; import com.google.common.annotations.VisibleForTesting; import com.google.gdata.util.common.base.Preconditions; -import com.google.inject.internal.Lists; import retrofit2.Response; @Slf4j @@ -40,17 +40,17 @@ public MeteredUsageApiClientServiceImpl(DeveloperSpecificAppmarketCredentialsSup @Override public APIResult reportUsage(String baseUrl, String secretKey, String idempotentKey, MeteredUsageItem meteredUsageItem, boolean billable) { - return reportUsage(baseUrl, secretKey, idempotentKey, Lists.newArrayList(meteredUsageItem), billable); + return reportUsage(baseUrl, secretKey, idempotentKey, Collections.singletonList(meteredUsageItem), billable); } @Override public APIResult reportUsage(String baseUrl, String secretKey, MeteredUsageItem meteredUsageItem, boolean billable) { - return reportUsage(baseUrl, secretKey, UUID.randomUUID().toString(), Lists.newArrayList(meteredUsageItem), billable); + return reportUsage(baseUrl, secretKey, UUID.randomUUID().toString(), Collections.singletonList(meteredUsageItem), billable); } @Override public APIResult reportUsage(String baseUrl, String secretKey, MeteredUsageItem meteredUsageItem, boolean billable, String sourceType) { - return reportUsage(baseUrl, secretKey, UUID.randomUUID().toString(), Lists.newArrayList(meteredUsageItem), billable, sourceType); + return reportUsage(baseUrl, secretKey, UUID.randomUUID().toString(), Collections.singletonList(meteredUsageItem), billable, sourceType); } @Override @@ -70,12 +70,12 @@ public APIResult reportUsage(String baseUrl, String secretKey, String idempotent @Override public APIResult reportUsage(String baseUrl, String idempotentKey, MeteredUsageItem meteredUsageItem, boolean billable, String secretKey, String secret) { - return reportUsage(baseUrl, idempotentKey, Lists.newArrayList(meteredUsageItem), billable, secretKey, secret, org.apache.commons.lang3.StringUtils.EMPTY); + return reportUsage(baseUrl, idempotentKey, Collections.singletonList(meteredUsageItem), billable, secretKey, secret, org.apache.commons.lang3.StringUtils.EMPTY); } @Override public APIResult reportUsage(String baseUrl, MeteredUsageItem meteredUsageItem, boolean billable, String secretKey, String secret) { - return reportUsage(baseUrl, UUID.randomUUID().toString(), Lists.newArrayList(meteredUsageItem), billable, secretKey, secret, org.apache.commons.lang3.StringUtils.EMPTY); + return reportUsage(baseUrl, UUID.randomUUID().toString(), Collections.singletonList(meteredUsageItem), billable, secretKey, secret, org.apache.commons.lang3.StringUtils.EMPTY); } @Override @@ -85,7 +85,7 @@ public APIResult reportUsage(String baseUrl, List meteredUsage @Override public APIResult reportUsage(String baseUrl, MeteredUsageItem meteredUsageItem, boolean billable, String secretKey, String secret, String sourceType) { - return reportUsage(baseUrl, UUID.randomUUID().toString(), Lists.newArrayList(meteredUsageItem), billable, secretKey, secret, sourceType); + return reportUsage(baseUrl, UUID.randomUUID().toString(), Collections.singletonList(meteredUsageItem), billable, secretKey, secret, sourceType); } @Override diff --git a/src/test/java/com/appdirect/sdk/meteredusage/mother/MeteredUsageItemMother.java b/src/test/java/com/appdirect/sdk/meteredusage/mother/MeteredUsageItemMother.java index 2dc020d7..54057b11 100644 --- a/src/test/java/com/appdirect/sdk/meteredusage/mother/MeteredUsageItemMother.java +++ b/src/test/java/com/appdirect/sdk/meteredusage/mother/MeteredUsageItemMother.java @@ -1,14 +1,15 @@ package com.appdirect.sdk.meteredusage.mother; +import java.util.Collections; + import com.appdirect.sdk.meteredusage.model.MeteredUsageItem; import com.appdirect.sdk.utils.ConstantUtils; -import com.google.inject.internal.Lists; public class MeteredUsageItemMother { public static MeteredUsageItem.MeteredUsageItemBuilder basic() { return MeteredUsageItem.builder() .accountId(ConstantUtils.ACCOUNT_ID) - .usageList(Lists.newArrayList(UsageItemMother.basic().build())); + .usageList(Collections.singletonList(UsageItemMother.basic().build())); } public static MeteredUsageItem.MeteredUsageItemBuilder withSubscriptionId() { diff --git a/src/test/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceTest.java b/src/test/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceTest.java index 5738bc75..141f2a70 100644 --- a/src/test/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceTest.java +++ b/src/test/java/com/appdirect/sdk/meteredusage/service/MeteredUsageApiClientServiceTest.java @@ -30,7 +30,6 @@ import com.appdirect.sdk.meteredusage.model.MeteredUsageResponse; import com.appdirect.sdk.meteredusage.mother.MeteredUsageItemMother; import com.appdirect.sdk.utils.ConstantUtils; -import com.google.inject.internal.Lists; import okhttp3.MediaType; import okhttp3.ResponseBody; import okio.Buffer; @@ -65,7 +64,7 @@ public void testBillUsage_noErrors() { MeteredUsageApi meteredUsageApi = mock(MeteredUsageApi.class); Response response = buildResponse(requestAccepted); Call call = new RetrofitCallStub(response).getCall(); - List items = Lists.newArrayList(meteredUsageItem); + List items = Collections.singletonList(meteredUsageItem); doReturn(call).when(meteredUsageApi).meteredUsageCall(any()); doReturn(meteredUsageApi).when(meteredUsageApiClientService).createMeteredUsageApi(ConstantUtils.BASE_URL, ConstantUtils.CONSUMER_KEY, ConstantUtils.CONSUMER_SECRET); @@ -85,7 +84,7 @@ public void testSourceTypeUsage_noErrors() { MeteredUsageApi meteredUsageApi = mock(MeteredUsageApi.class); Response response = buildResponse(requestAccepted); Call call = new RetrofitCallStub(response).getCall(); - List items = Lists.newArrayList(meteredUsageItem); + List items = Collections.singletonList(meteredUsageItem); doReturn(call).when(meteredUsageApi).meteredUsageCall(any()); doReturn(meteredUsageApi).when(meteredUsageApiClientService).createMeteredUsageApi(ConstantUtils.BASE_URL, ConstantUtils.CONSUMER_KEY, ConstantUtils.CONSUMER_SECRET); @@ -105,7 +104,7 @@ public void testBillUsage_unsuccessfulCall() { MeteredUsageApi meteredUsageApi = mock(MeteredUsageApi.class); Response response = buildResponse(httpStatus, ErrorCode.UNKNOWN_ERROR.toString()); Call call = new RetrofitCallStub(response).getCall(); - List items = Lists.newArrayList(meteredUsageItem); + List items = Collections.singletonList(meteredUsageItem); doReturn(call).when(meteredUsageApi).meteredUsageCall(any()); doReturn(meteredUsageApi).when(meteredUsageApiClientService).createMeteredUsageApi(ConstantUtils.BASE_URL, ConstantUtils.CONSUMER_KEY, ConstantUtils.CONSUMER_SECRET); @@ -125,7 +124,7 @@ public void testBillUsageNullSecret_noErrors() { MeteredUsageApi meteredUsageApi = mock(MeteredUsageApi.class); Response response = buildResponse(requestAccepted); Call call = new RetrofitCallStub(response).getCall(); - List items = Lists.newArrayList(meteredUsageItem); + List items = Collections.singletonList(meteredUsageItem); doReturn(call).when(meteredUsageApi).meteredUsageCall(any()); doReturn(meteredUsageApi).when(meteredUsageApiClientService).createMeteredUsageApi(ConstantUtils.BASE_URL, ConstantUtils.CONSUMER_KEY, null); @@ -145,7 +144,7 @@ public void testBillUsageNullSecret_unsuccessfulCall() { MeteredUsageApi meteredUsageApi = mock(MeteredUsageApi.class); Response response = buildResponse(httpStatus, ErrorCode.UNKNOWN_ERROR.toString()); Call call = new RetrofitCallStub(response).getCall(); - List items = Lists.newArrayList(meteredUsageItem); + List items = Collections.singletonList(meteredUsageItem); doReturn(call).when(meteredUsageApi).meteredUsageCall(any()); doReturn(meteredUsageApi).when(meteredUsageApiClientService).createMeteredUsageApi(ConstantUtils.BASE_URL, ConstantUtils.CONSUMER_KEY, null);