removing function and moving logic into HandshakerServiceChannel

Author: srkethireddy

alts/src/main/java/io/grpc/alts/HandshakerServiceChannel.java

@@ -16,6 +16,7 @@
 
 package io.grpc.alts;
 
+import com.google.common.base.MoreObjects;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -39,7 +40,7 @@
 final class HandshakerServiceChannel {
 
   static final Resource<Channel> SHARED_HANDSHAKER_CHANNEL =
-      new ChannelResource(MetadataServerAddressUtil.getHandshakerAddress());
+      new ChannelResource(MoreObjects.firstNonNull(System.getenv("GCE_METADATA_HOST"), "metadata.google.internal.:8080"));
 
 
   /** Returns a resource of handshaker service channel for testing only. */

alts/src/main/java/io/grpc/alts/MetadataServerAddressUtil.java

@@ -56,19 +56,6 @@ public void setUp() throws Exception {
         HandshakerServiceChannel.getHandshakerChannelForTesting("localhost:" + server.getPort());
   }
 
-  @Test
-  public void handshakerAddress_default() {
-    assertThat(MetadataServerAddressUtil.getHandshakerAddress())
-        .isEqualTo("metadata.google.internal.:8080");
-  }
-
-  @Test
-  public void handshakerAddress_withEnvVar() {
-    if (MetadataServerAddressUtil.TEST_METADATA_HOST_ENV_VAR != null ) {
-      assertThat(MetadataServerAddressUtil.getHandshakerAddress())
-          .isEqualTo(MetadataServerAddressUtil.TEST_METADATA_HOST_ENV_VAR);
-    }
-  }
 
   @Test
   public void sharedChannel_authority() {