Fix assorted warnings (#186)

elharo · chingor13 · commit 42c9906bc3b9 · 2018-09-06T10:21:08.000-07:00
* warnings

* revert
diff --git a/oauth2_http/java/com/google/auth/oauth2/OAuth2Utils.java b/oauth2_http/java/com/google/auth/oauth2/OAuth2Utils.java
@@ -201,7 +201,7 @@ static long validateLong(Map<String, Object> map, String key, String errorPrefix
   /**
    * Return the specified map from JSON or throw a helpful error message.
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   static Map<String, Object> validateMap(Map<String, Object> map, String key, String errorPrefix)
       throws IOException {
     Object value = map.get(key);
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ClientIdTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ClientIdTest.java
@@ -66,7 +66,7 @@ public void constructor() {
 
   @Test(expected = NullPointerException.class)
   public void constructor_nullClientId_throws() {
-    ClientId clientId = ClientId.newBuilder()
+    ClientId.newBuilder()
         .setClientSecret(CLIENT_SECRET)
         .build();
   }
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java
@@ -43,7 +43,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
-import com.google.api.client.json.GenericJson;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Clock;
@@ -232,7 +231,6 @@ public LowLevelHttpResponse execute() throws IOException {
         ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build();
 
     try {
-      byte[] bytes = {0xD, 0xE, 0xA, 0xD};
       credentials.getAccount();
       fail("Fetching default service account should have failed");
     } catch (RuntimeException e) {
@@ -269,7 +267,6 @@ public LowLevelHttpResponse execute() throws IOException {
         ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build();
 
     try {
-      byte[] bytes = {0xD, 0xE, 0xA, 0xD};
       credentials.getAccount();
       fail("Fetching default service account should have failed");
     } catch (RuntimeException e) {
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java b/oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java
@@ -586,7 +586,6 @@ private static class TestDefaultCredentialsProvider extends DefaultCredentialsPr
     private final Map<String, String> properties = new HashMap<>();
     private final Map<String, InputStream> files = new HashMap<>();
     private boolean fileSandbox = false;
-    private int forNameCallCount = 0;
 
     TestDefaultCredentialsProvider () {
     }
@@ -620,7 +619,6 @@ void setProperty(String property, String value) {
 
     @Override
     Class<?> forName(String className) throws ClassNotFoundException {
-      forNameCallCount++;
       Class<?> lookup = types.get(className);
       if (lookup != null) {
         return lookup;
@@ -633,10 +631,6 @@ protected boolean isOnGAEStandard7() {
       return getProperty("isOnGAEStandard7", "false").equals("true");
     }
 
-    int getForNameCallCount() {
-      return forNameCallCount;
-    }
-
     @Override
     boolean isFile(File file) {
       if (fileSandbox) {
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/MockTokenServerTransport.java b/oauth2_http/javatests/com/google/auth/oauth2/MockTokenServerTransport.java
@@ -45,7 +45,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayDeque;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void constructor() {`
`66`	`66`
`67`	`67`	`@Test(expected = NullPointerException.class)`
`68`	`68`	`public void constructor_nullClientId_throws() {`
`69`		`- ClientId clientId = ClientId.newBuilder()`
	`69`	`+ ClientId.newBuilder()`
`70`	`70`	`.setClientSecret(CLIENT_SECRET)`
`71`	`71`	`.build();`
`72`	`72`	`}`