cleanup.

Author: rmehta19

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

@@ -476,11 +476,7 @@ ChannelCredentials createMtlsChannelCredentials() throws IOException, GeneralSec
   @VisibleForTesting
   boolean isGoogleS2AEnabled() {
     String S2AEnv = envProvider.getenv(S2A_ENV_ENABLE_USE_S2A);
-    boolean isS2AEnv = Boolean.parseBoolean(S2AEnv);
-    if (isS2AEnv) {
-      return true;
-    }
-    return false;
+    return Boolean.parseBoolean(S2AEnv);
   }
 
   @VisibleForTesting
@@ -515,7 +511,6 @@ ChannelCredentials createMtlsToS2AChannelCredentials(
         .build();
   }
 
-  @VisibleForTesting
   ChannelCredentials createS2ASecuredChannelCredentials() {
     S2A s2aUtils = S2A.newBuilder().build();
     String plaintextAddress = s2aUtils.getPlaintextS2AAddress();

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

@@ -290,6 +290,7 @@ void testToBuilder() {
             .setProcessorCount(2)
             .setEndpoint("fake.endpoint:443")
             .setMtlsEndpoint("fake.endpoint:443")
+            .setEndpointOverride("fake.endpoint.override:443")
             .setMaxInboundMessageSize(12345678)
             .setMaxInboundMetadataSize(4096)
             .setKeepAliveTimeDuration(keepaliveTime)
@@ -304,6 +305,7 @@ void testToBuilder() {
 
     assertThat(builder.getEndpoint()).isEqualTo("fake.endpoint:443");
     assertThat(builder.getMtlsEndpoint()).isEqualTo("fake.endpoint:443");
+    assertThat(builder.getEndpointOverride()).isEqualTo("fake.endpoint.override:443");
     assertThat(builder.getMaxInboundMessageSize()).isEqualTo(12345678);
     assertThat(builder.getMaxInboundMetadataSize()).isEqualTo(4096);
     assertThat(builder.getKeepAliveTimeDuration()).isEqualTo(keepaliveTime);
@@ -1047,18 +1049,18 @@ void isGoogleS2AEnabled_envVarNotSet_returnsFalse() {
     Mockito.when(envProvider.getenv(InstantiatingGrpcChannelProvider.S2A_ENV_ENABLE_USE_S2A))
         .thenReturn("false");
     InstantiatingGrpcChannelProvider provider =
-        InstantiatingGrpcChannelProvider.newBuilder().build();
+        InstantiatingGrpcChannelProvider.newBuilder().setEnvProvider(envProvider).build();
     Truth.assertThat(provider.isGoogleS2AEnabled()).isFalse();
   }
 
   @Test
-  void isGoogleS2AEnabled_envVarNotSet_returnsTrue() {
+  void isGoogleS2AEnabled_envVarSet_returnsTrue() {
     EnvironmentProvider envProvider = Mockito.mock(EnvironmentProvider.class);
     Mockito.when(envProvider.getenv(InstantiatingGrpcChannelProvider.S2A_ENV_ENABLE_USE_S2A))
         .thenReturn("true");
     InstantiatingGrpcChannelProvider provider =
-        InstantiatingGrpcChannelProvider.newBuilder().build();
-    Truth.assertThat(provider.isGoogleS2AEnabled()).isFalse();
+        InstantiatingGrpcChannelProvider.newBuilder().setEnvProvider(envProvider).build();
+    Truth.assertThat(provider.isGoogleS2AEnabled()).isTrue();
   }
 
   @Test