Lint fixes

Author: vverman

oauth2_http/java/com/google/auth/mtls/X509Provider.java

@@ -35,7 +35,6 @@
 import com.google.auth.oauth2.PropertyProvider;
 import com.google.auth.oauth2.SystemEnvironmentProvider;
 import com.google.auth.oauth2.SystemPropertyProvider;
-import com.google.common.base.Strings;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -162,6 +161,4 @@ public boolean isAvailable() throws IOException {
     }
     return true;
   }
-
-
 }

oauth2_http/java/com/google/auth/oauth2/AwsCredentials.java

@@ -196,7 +196,6 @@ String getRegionalCredentialVerificationUrl() {
     return this.regionalCredentialVerificationUrl;
   }
 
-
   @VisibleForTesting
   AwsSecurityCredentialsSupplier getAwsSecurityCredentialsSupplier() {
     return this.awsSecurityCredentialsSupplier;

oauth2_http/java/com/google/auth/oauth2/EnvironmentProvider.java

@@ -2,7 +2,7 @@
 
 /**
  * Interface for an environment provider.
- * 
+ *
  * <p>For internal use only.
  */
 public interface EnvironmentProvider {

oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java

@@ -33,7 +33,6 @@
 
 import com.google.auth.http.HttpTransportFactory;
 import com.google.auth.mtls.MtlsHttpTransportFactory;
-import com.google.auth.mtls.MtlsUtils;
 import com.google.auth.mtls.X509Provider;
 import com.google.auth.oauth2.IdentityPoolCredentialSource.IdentityPoolCredentialSourceType;
 import com.google.common.annotations.VisibleForTesting;
@@ -219,6 +218,7 @@ Builder setX509Provider(X509Provider x509Provider) {
       this.x509Provider = x509Provider;
       return this;
     }
+
     /**
      * Sets the subject token supplier. The supplier should return a valid subject token string.
      *

oauth2_http/java/com/google/auth/oauth2/PropertyProvider.java

@@ -2,7 +2,7 @@
 
 /**
  * Interface for a system property provider.
- * 
+ *
  * <p>For internal use only.
  */
 public interface PropertyProvider {

oauth2_http/java/com/google/auth/oauth2/SystemPropertyProvider.java

@@ -4,7 +4,7 @@
 
 /**
  * Represents the default system property provider.
- * 
+ *
  * <p>For internal use only.
  */
 public class SystemPropertyProvider implements PropertyProvider, Serializable {

oauth2_http/javatests/com/google/auth/mtls/X509ProviderTest.java

@@ -36,10 +36,8 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.auth.oauth2.SystemEnvironmentProvider;
 import com.google.auth.oauth2.SystemPropertyProvider;
 import com.google.auth.oauth2.TestEnvironmentProvider;
-import com.google.auth.oauth2.TestPropertyProvider;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

oauth2_http/javatests/com/google/auth/oauth2/IdentityPoolCredentialsTest.java

@@ -1212,7 +1212,7 @@ void build_withCustomProvider_throwsOnGetCertificatePath()
   private void createCredentialsWithCertificate(
       X509Provider x509Provider, Map<String, Object> certificateMap) {
     Map<String, Object> credentialSourceMap = new HashMap<>();
-     credentialSourceMap.put("certificate", certificateMap);
+    credentialSourceMap.put("certificate", certificateMap);
     IdentityPoolCredentialSource credentialSource =
         new IdentityPoolCredentialSource(credentialSourceMap);
 
@@ -1306,40 +1306,40 @@ public HttpTransport create() {
     }
   }
 
-   static class TestX509Provider extends X509Provider {
+   private static class TestX509Provider extends X509Provider {
     private final KeyStore keyStore;
-    private final String certPath;
-    private boolean throwOnGetKeyStore;
-    private boolean throwOnGetCertificatePath;
+    private final String certificatePath;
+    private boolean shouldThrowOnGetKeyStore = false;
+    private boolean shouldThrowOnGetCertificatePath = false;
 
-    public TestX509Provider(KeyStore keyStore, String certPath) {
+    TestX509Provider(KeyStore keyStore, String certificatePath) {
       super();
       this.keyStore = keyStore;
-      this.certPath = certPath;
-    }
-
-    public void setShouldThrowOnGetKeyStore(boolean throwOnGetKeyStore) {
-      this.throwOnGetKeyStore = throwOnGetKeyStore;
-    }
-
-    public void setShouldThrowOnGetCertificatePath(boolean throwOnGetCertificatePath) {
-      this.throwOnGetCertificatePath = throwOnGetCertificatePath;
+      this.certificatePath = certificatePath;
     }
 
     @Override
     public KeyStore getKeyStore() throws IOException {
-      if (throwOnGetKeyStore) {
+      if (shouldThrowOnGetKeyStore) {
         throw new IOException("Simulated IOException on get keystore");
       }
       return keyStore;
     }
 
     @Override
     public String getCertificatePath() throws IOException {
-      if (throwOnGetCertificatePath) {
+      if (shouldThrowOnGetCertificatePath) {
         throw new IOException("Simulated IOException on certificate path");
       }
-      return certPath;
+      return certificatePath;
+    }
+
+    void setShouldThrowOnGetKeyStore(boolean shouldThrow) {
+      this.shouldThrowOnGetKeyStore = shouldThrow;
+    }
+
+    void setShouldThrowOnGetCertificatePath(boolean shouldThrow) {
+      this.shouldThrowOnGetCertificatePath = shouldThrow;
     }
   }
 }