Fixed deprecation warnings

Author: SMadani

build.gradle

@@ -33,6 +33,10 @@ task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
 }
 
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+}
+
 task javadocJar(type: Jar) {
     archiveClassifier.set("javadoc")
     from javadoc
@@ -148,19 +152,3 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign publishing.publications.mavenJava
 }
-
-test {
-    maxHeapSize = "1024m"
-}
-
-// credit: http://stackoverflow.com/a/22681854/305340
-tasks.withType(JavaCompile) {
-    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
-    doFirst {
-        if (System.env.JDK8_HOME != null) {
-            options.bootClasspath = "$System.env.JDK8_HOME/jre/lib/rt.jar"
-            options.bootClasspath += "$File.pathSeparator$System.env.JDK8_HOME/jre/lib/jce.jar"
-            // and other specific JDK jars
-        }
-    }
-}

src/main/java/com/opentok/Broadcast.java

@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -125,12 +126,13 @@ public String getStatus() {
      * stream's status.
      */
     @JsonProperty("broadcastUrls")
+    @SuppressWarnings("unchecked")
     private void unpack(Map<String,Object> broadcastUrls) {
         if (broadcastUrls == null) return;
-        hls = (String)broadcastUrls.get("hls");
-        ArrayList<Map<String,String>> rtmpResponse = (ArrayList<Map<String,String>>)broadcastUrls.get("rtmp");
-        if (rtmpResponse == null || rtmpResponse.size() == 0) return;
-        for ( Map<String,String> element : rtmpResponse) {
+        hls = (String) broadcastUrls.get("hls");
+        Iterable<Map<String,String>> rtmpResponse = (Iterable<Map<String,String>>)broadcastUrls.get("rtmp");
+        if (rtmpResponse == null) return;
+        for (Map<String,String> element : rtmpResponse) {
             Rtmp rtmp = new Rtmp();
             rtmp.setId(element.get("id"));
             rtmp.setServerUrl(element.get("serverUrl"));

src/main/java/com/opentok/OpenTok.java

@@ -424,8 +424,6 @@ public ArchiveList listArchives(String sessionId, int offset, int count) throws
             return archiveListReader.readValue(archives);
         } catch (JsonProcessingException e) {
             throw new RequestException("Exception mapping json: " + e.getMessage());
-        } catch (IOException e) {
-            throw new RequestException("Exception mapping json: " + e.getMessage());
         }
     }
 
@@ -842,8 +840,6 @@ public StreamList listStreams(String sessionId) throws OpenTokException {
             return streamListReader.readValue(streams);
         } catch (JsonProcessingException e) {
             throw new RequestException("Exception mapping json: " + e.getMessage());
-        } catch (IOException e) {
-            throw new RequestException("Exception mapping json: " + e.getMessage());
         }
     }
 
@@ -871,8 +867,6 @@ public Sip dial(String sessionId, String token, SipProperties properties) throws
             return sipReader.readValue(sip);
         } catch (JsonProcessingException e) {
             throw new RequestException("Exception mapping json: " + e.getMessage());
-        } catch (IOException e) {
-            throw new RequestException("Exception mapping json: " + e.getMessage());
         }
     }
 

src/main/java/com/opentok/Session.java

@@ -117,7 +117,7 @@ public String generateToken(TokenOptions tokenOptions) throws OpenTokException {
         Role role = tokenOptions.getRole();
         double expireTime = tokenOptions.getExpireTime(); // will be 0 if nothing was explicitly set
         String data = tokenOptions.getData();             // will be null if nothing was explicitly set
-        Long create_time = new Long(System.currentTimeMillis() / 1000).longValue();
+        long create_time = System.currentTimeMillis() / 1000;
 
         StringBuilder dataStringBuilder = new StringBuilder();
         Random random = new Random();

src/main/java/com/opentok/util/HttpClient.java

@@ -1215,8 +1215,7 @@ public HttpClient build() {
 
             config = configBuilder.build();
             // NOTE: not thread-safe, config could be modified by another thread here?
-            HttpClient client = new HttpClient(this);
-            return client;
+            return new HttpClient(this);
         }
 
         // credit: https://github.com/AsyncHttpClient/async-http-client/blob/b52a8de5d6a862b5d1652d62f87ce774cbcff156/src/main/java/com/ning/http/client/ProxyServer.java#L99-L127
@@ -1284,9 +1283,10 @@ public TokenAuthRequestFilter(int apiKey, String apiSecret) {
         public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
             try {
                 return new FilterContext.FilterContextBuilder<T>(ctx)
-                        .request(new RequestBuilder(ctx.getRequest())
-                                .addHeader(authHeader, TokenGenerator.generateToken(apiKey, apiSecret))
-                                .build())
+                        .request(ctx.getRequest().toBuilder()
+                            .addHeader(authHeader, TokenGenerator.generateToken(apiKey, apiSecret))
+                            .build()
+                        )
                         .build();
             } catch (OpenTokException e) {
                 e.printStackTrace();

src/test/java/com/opentok/test/Helpers.java

@@ -20,6 +20,7 @@
 import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
@@ -31,21 +32,17 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.matching;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.opentok.util.Crypto.signData;
-import static com.opentok.util.TokenGenerator.ISSUED_AT;
-import static com.opentok.util.TokenGenerator.ISSUER;
-import static com.opentok.util.TokenGenerator.ISSUER_TYPE;
-import static com.opentok.util.TokenGenerator.PROJECT_ISSUER_TYPE;
-import static org.junit.Assert.assertTrue;
+import static com.opentok.util.TokenGenerator.*;
 
 public class Helpers {
 
     public static final String JTI = "jti";
 
     public static Map<String, String> decodeToken(String token) throws UnsupportedEncodingException {
-        Map<String, String> tokenData = new HashMap<String, String>();
+        Map<String, String> tokenData = new HashMap<>();
         token = token.substring(4);
         byte[] buffer = Base64.decodeBase64(token);
-        String decoded = new String(buffer, "UTF-8");
+        String decoded = new String(buffer, StandardCharsets.UTF_8);
         String[] decodedParts = decoded.split(":");
         for (String part : decodedParts) {
             tokenData.putAll(decodeFormData(part));
@@ -57,7 +54,7 @@ public static boolean verifyTokenSignature(String token, String apiSecret) throw
             UnsupportedEncodingException, NoSuchAlgorithmException, SignatureException, InvalidKeyException {
         token = token.substring(4);
         byte[] buffer = Base64.decodeBase64(token);
-        String decoded = new String(buffer, "UTF-8");
+        String decoded = new String(buffer, StandardCharsets.UTF_8);
         String[] decodedParts = decoded.split(":");
         String signature = decodeToken(token).get("sig");
         return (signature.equals(signData(decodedParts[1], apiSecret)));
@@ -79,10 +76,10 @@ public static void verifyUserAgent() {
     }
 
     private static Map<String, String> decodeFormData(String formData) throws UnsupportedEncodingException {
-        Map<String, String> decodedFormData = new HashMap<String, String>();
+        Map<String, String> decodedFormData = new HashMap<>();
         String[] pairs = formData.split("\\&");
-        for (int i = 0; i < pairs.length; i++) {
-            String[] fields = pairs[i].split("=");
+        for (String pair : pairs) {
+            String[] fields = pair.split("=");
             String name = URLDecoder.decode(fields[0], "UTF-8");
             String value = URLDecoder.decode(fields[1], "UTF-8");
             decodedFormData.put(name, value);