chore: drop some of the Guava usage which is easily replaced (twilio#567

)

src/main/java/com/twilio/base/Page.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
 import com.twilio.exception.ApiConnectionException;
 
 import java.io.IOException;
@@ -103,7 +102,7 @@ public String getUrl(String domain) {
     }
 
     public boolean hasNextPage() {
-        return !Strings.isNullOrEmpty(nextPageUri) || !Strings.isNullOrEmpty(nextPageUrl);
+        return (nextPageUri != null && !nextPageUri.isEmpty()) || (nextPageUrl != null && !nextPageUrl.isEmpty());
     }
 
     /**

src/main/java/com/twilio/base/Reader.java

@@ -87,7 +87,7 @@ public Page<T> getPage(final String targetUrl) {
      * Retrieve the target page of resources.
      *
      * @param targetUrl API-generated URL for the requested results page
-     * @param client client used to fetch
+     * @param client    client used to fetch
      * @return Page containing the target pageSize of resources
      */
     public abstract Page<T> getPage(final String targetUrl, final TwilioRestClient client);
@@ -105,7 +105,7 @@ public Page<T> nextPage(final Page<T> page) {
     /**
      * Fetch the following page of resources using specified client.
      *
-     * @param page current page of resources
+     * @param page   current page of resources
      * @param client client used to fetch
      * @return Page containing the next pageSize of resources
      */
@@ -124,7 +124,7 @@ public Page<T> previousPage(final Page<T> page) {
     /**
      * Fetch the prior page of resources using specified client.
      *
-     * @param page current page of resources
+     * @param page   current page of resources
      * @param client client used to fetch
      * @return Page containing the previous pageSize of resources
      */
@@ -153,10 +153,9 @@ public Reader<T> limit(final long limit) {
         this.limit = limit;
 
         if (this.pageSize == null) {
-            this.pageSize = (new Long(this.limit)).intValue();
+            this.pageSize = this.limit.intValue();
         }
 
         return this;
     }
-
 }

src/main/java/com/twilio/converter/PrefixedCollapsibleMap.java

@@ -1,7 +1,6 @@
 package com.twilio.converter;
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,11 +16,11 @@ private static Map<String, String> flatten(
         List<String> previous
     ) {
         for (Map.Entry<String, Object> entry : map.entrySet()) {
-            List<String> next = Lists.newArrayList(previous);
+            List<String> next = new ArrayList<>(previous);
             next.add(entry.getKey());
 
             if (entry.getValue() instanceof Map) {
-                flatten((Map<String, Object>)entry.getValue(), result, next);
+                flatten((Map<String, Object>) entry.getValue(), result, next);
             } else {
                 result.put(Joiner.on('.').join(next), entry.getValue().toString());
             }
@@ -34,7 +33,7 @@ private static Map<String, String> flatten(
      * Flatten a Map of String, Object into a Map of String, String where keys are '.' separated
      * and prepends a key.
      *
-     * @param map map to transform
+     * @param map    map to transform
      * @param prefix key to prepend
      * @return flattened map
      */
@@ -52,5 +51,4 @@ public static Map<String, String> serialize(Map<String, Object> map, String pref
 
         return result;
     }
-
 }

src/main/java/com/twilio/http/NetworkHttpClient.java

@@ -1,10 +1,7 @@
 package com.twilio.http;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.twilio.Twilio;
 import com.twilio.exception.ApiException;
-import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
@@ -19,6 +16,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -46,19 +44,19 @@ public NetworkHttpClient() {
      * @param config a RequestConfig.
      */
     public NetworkHttpClient(RequestConfig config) {
-        Collection<Header> headers = Lists.<Header>newArrayList(
+        Collection<BasicHeader> headers = Arrays.asList(
             new BasicHeader("X-Twilio-Client", "java-" + Twilio.VERSION),
             new BasicHeader(HttpHeaders.USER_AGENT, "twilio-java/" + Twilio.VERSION + " (" + Twilio.JAVA_VERSION + ")"),
             new BasicHeader(HttpHeaders.ACCEPT, "application/json"),
             new BasicHeader(HttpHeaders.ACCEPT_ENCODING, "utf-8")
         );
 
         String googleAppEngineVersion = System.getProperty("com.google.appengine.runtime.version");
-        boolean isNotGoogleAppEngine = Strings.isNullOrEmpty(googleAppEngineVersion);
+        boolean isGoogleAppEngine = googleAppEngineVersion != null && !googleAppEngineVersion.isEmpty();
 
         org.apache.http.impl.client.HttpClientBuilder clientBuilder = HttpClientBuilder.create();
 
-        if (isNotGoogleAppEngine) {
+        if (!isGoogleAppEngine) {
             clientBuilder.useSystemProperties();
         }
 
@@ -79,7 +77,7 @@ public NetworkHttpClient(RequestConfig config) {
      * @param clientBuilder an HttpClientBuilder.
      */
     public NetworkHttpClient(HttpClientBuilder clientBuilder) {
-        Collection<Header> headers = Lists.<Header>newArrayList(
+        Collection<BasicHeader> headers = Arrays.asList(
                 new BasicHeader("X-Twilio-Client", "java-" + Twilio.VERSION),
                 new BasicHeader(
                     HttpHeaders.USER_AGENT, "twilio-java/" + Twilio.VERSION + " (" + Twilio.JAVA_VERSION + ") custom"

src/main/java/com/twilio/http/ValidationClient.java

@@ -1,10 +1,7 @@
 package com.twilio.http;
 
-
-import com.google.common.collect.Lists;
 import com.twilio.Twilio;
 import com.twilio.exception.ApiException;
-import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
@@ -17,6 +14,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +40,7 @@ public ValidationClient(String accountSid, String credentialSid, String signingK
             .setSocketTimeout(SOCKET_TIMEOUT)
             .build();
 
-        Collection<Header> headers = Lists.<Header>newArrayList(
+        Collection<BasicHeader> headers = Arrays.asList(
             new BasicHeader("X-Twilio-Client", "java-" + Twilio.VERSION),
             new BasicHeader(HttpHeaders.USER_AGENT, "twilio-java/" + Twilio.VERSION + " (" + Twilio.JAVA_VERSION + ")"),
             new BasicHeader(HttpHeaders.ACCEPT, "application/json"),

src/main/java/com/twilio/http/ValidationInterceptor.java

@@ -1,6 +1,5 @@
 package com.twilio.http;
 
-import com.google.common.collect.Lists;
 import com.twilio.jwt.Jwt;
 import com.twilio.jwt.validation.ValidationToken;
 import org.apache.http.HttpException;
@@ -10,11 +9,12 @@
 
 import java.io.IOException;
 import java.security.PrivateKey;
+import java.util.Arrays;
 import java.util.List;
 
 public class ValidationInterceptor implements HttpRequestInterceptor {
 
-    private static final List<String> HEADERS = Lists.newArrayList("authorization", "host");
+    private static final List<String> HEADERS = Arrays.asList("authorization", "host");
 
     private final String accountSid;
     private final String credentialSid;
@@ -24,10 +24,10 @@ public class ValidationInterceptor implements HttpRequestInterceptor {
     /**
      * Create a new ValidationInterceptor.
      *
-     * @param  accountSid Twilio Acocunt SID
-     * @param  credentialSid Twilio Credential SID
-     * @param  signingKeySid Twilio Signing Key
-     * @param  privateKey Private Key
+     * @param accountSid    Twilio Acocunt SID
+     * @param credentialSid Twilio Credential SID
+     * @param signingKeySid Twilio Signing Key
+     * @param privateKey    Private Key
      */
     public ValidationInterceptor(String accountSid, String credentialSid, String signingKeySid, PrivateKey privateKey) {
         this.accountSid = accountSid;

src/main/java/com/twilio/jwt/accesstoken/VoiceGrant.java

@@ -1,7 +1,6 @@
 package com.twilio.jwt.accesstoken;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.google.common.base.Strings;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -36,9 +35,9 @@ public VoiceGrant setOutgoingApplicationSid(String outgoingApplicationSid) {
 
     /**
      * Set the outgoing application.
-     * 
-     * @param  outgoingApplicationSid outgoing application sid
-     * @param  outgoingApplicationParams outgoing application parameters
+     *
+     * @param outgoingApplicationSid    outgoing application sid
+     * @param outgoingApplicationParams outgoing application parameters
      * @return voice grant
      */
     public VoiceGrant setOutgoingApplication(
@@ -80,16 +79,16 @@ public class Payload {
 
         /**
          * Generate VoiceGrant payload.
-         * 
-         * @param  grant VoiceGrant
+         *
+         * @param grant VoiceGrant
          */
         public Payload(VoiceGrant grant) {
             if (grant.incomingAllow != null) {
-              this.incoming = new HashMap<>();
-              this.incoming.put("allow", grant.incomingAllow);
+                this.incoming = new HashMap<>();
+                this.incoming.put("allow", grant.incomingAllow);
             }
 
-            if (!Strings.isNullOrEmpty(grant.outgoingApplicationSid)) {
+            if (grant.outgoingApplicationSid != null && !grant.outgoingApplicationSid.isEmpty()) {
                 this.outgoing = new HashMap<>();
                 this.outgoing.put("application_sid", grant.outgoingApplicationSid);
 
@@ -98,14 +97,13 @@ public Payload(VoiceGrant grant) {
                 }
             }
 
-            if (!Strings.isNullOrEmpty(grant.pushCredentialSid)) {
+            if (grant.pushCredentialSid != null && !grant.pushCredentialSid.isEmpty()) {
                 this.push_credential_sid = grant.pushCredentialSid;
             }
 
-            if (!Strings.isNullOrEmpty(grant.endpointId)) {
+            if (grant.endpointId != null && !grant.endpointId.isEmpty()) {
                 this.endpoint_id = grant.endpointId;
             }
         }
     }
-
 }

src/main/java/com/twilio/jwt/client/ClientCapability.java

@@ -1,7 +1,6 @@
 package com.twilio.jwt.client;
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import com.twilio.jwt.Jwt;
 import com.twilio.jwt.JwtEncodingException;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -61,7 +60,7 @@ public static class Builder {
         private String accountSid;
         private String authToken;
         private int ttl = 3600;
-        private List<Scope> scopes = Lists.newArrayList();
+        private List<Scope> scopes = new ArrayList<>();
 
         /**
          * Create a new builder for a Client Capability.

src/main/java/com/twilio/jwt/taskrouter/Policy.java

@@ -6,12 +6,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.twilio.http.HttpMethod;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
 
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -88,14 +88,14 @@ public boolean equals(Object o) {
         Policy policy = (Policy) o;
         return allowed == policy.allowed &&
             method == policy.method &&
-            Objects.equal(url, policy.url) &&
-            Objects.equal(queryFilter, policy.queryFilter) &&
-            Objects.equal(postFilter, policy.postFilter);
+            Objects.equals(url, policy.url) &&
+            Objects.equals(queryFilter, policy.queryFilter) &&
+            Objects.equals(postFilter, policy.postFilter);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(url, method, queryFilter, postFilter, allowed);
+        return Objects.hash(url, method, queryFilter, postFilter, allowed);
     }
 
     @Override

src/main/java/com/twilio/jwt/taskrouter/PolicyUtils.java

@@ -1,9 +1,9 @@
 package com.twilio.jwt.taskrouter;
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import com.twilio.http.HttpMethod;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class PolicyUtils {
@@ -16,50 +16,54 @@ private PolicyUtils() {}
      * Build the default Polices for a Worker.
      *
      * @param workspaceSid Workspace sid of the worker
-     * @param workerSid Worker sid
+     * @param workerSid    Worker sid
      * @return generated Policies
      */
     public static List<Policy> defaultWorkerPolicies(String workspaceSid, String workerSid) {
-        Policy activities = new Policy.Builder()
+        final List<Policy> policies = new ArrayList<>();
+
+        policies.add(new Policy.Builder()
             .url(UrlUtils.activities(workspaceSid))
             .method(HttpMethod.GET)
             .allowed(true)
-            .build();
+            .build());
 
-        Policy tasks = new Policy.Builder()
+        policies.add(new Policy.Builder()
             .url(UrlUtils.allTasks(workspaceSid))
             .method(HttpMethod.GET)
             .allowed(true)
-            .build();
+            .build());
 
-        Policy reservations = new Policy.Builder()
+        policies.add(new Policy.Builder()
             .url(UrlUtils.allReservations(workspaceSid, workerSid))
             .method(HttpMethod.GET)
             .allowed(true)
-            .build();
-        
-        Policy workerFetch = new Policy.Builder()
+            .build());
+
+        policies.add(new Policy.Builder()
             .url(UrlUtils.worker(workspaceSid, workerSid))
             .method(HttpMethod.GET)
             .allowed(true)
-            .build();
+            .build());
 
-        return Lists.newArrayList(activities, tasks, reservations, workerFetch);
+        return policies;
     }
 
     /**
      * Build the default Event Bridge Policies.
      *
      * @param accountSid account sid
-     * @param channelId channel id
+     * @param channelId  channel id
      * @return generated Policies
      */
     public static List<Policy> defaultEventBridgePolicies(String accountSid, String channelId) {
+        final List<Policy> policies = new ArrayList<>();
+
         String url = Joiner.on('/').join(TASKROUTER_EVENT_URL, accountSid, channelId);
 
-        Policy get = new Policy.Builder().url(url).method(HttpMethod.GET).allowed(true).build();
-        Policy post = new Policy.Builder().url(url).method(HttpMethod.POST).allowed(true).build();
+        policies.add(new Policy.Builder().url(url).method(HttpMethod.GET).allowed(true).build());
+        policies.add(new Policy.Builder().url(url).method(HttpMethod.POST).allowed(true).build());
 
-        return Lists.newArrayList(get, post);
+        return policies;
     }
 }