merge fixes

Author: kinsaurralde

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -457,8 +457,6 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
       TransportChannelProvider baseChannelProvider =
           MoreObjects.firstNonNull(
               options.getChannelProvider(), defaultChannelProviderBuilder.build());
-      boolean enableLocationApi =
-          Boolean.parseBoolean(System.getenv(EXPERIMENTAL_LOCATION_API_ENV_VAR));
       TransportChannelProvider channelProvider =
           enableLocationApi && baseChannelProvider instanceof InstantiatingGrpcChannelProvider
               ? new KeyAwareTransportChannelProvider(
@@ -699,13 +697,13 @@ private InstantiatingGrpcChannelProvider.Builder createChannelProviderBuilder(
             .setAllowNonDefaultServiceAccount(true);
     if (isEnableDirectAccess) {
       defaultChannelProviderBuilder.setAttemptDirectPath(true);
-      defaultChannelProviderBuilder.setAttemptDirectPathXds();
       if (isEnableDirectPathBoundToken()) {
         // This will let the credentials try to fetch a hard-bound access token if the runtime
         // environment supports it.
         defaultChannelProviderBuilder.setAllowHardBoundTokenTypes(
             Collections.singletonList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS));
       }
+      defaultChannelProviderBuilder.setAttemptDirectPathXds();
     }
 
     options.enablegRPCMetrics(defaultChannelProviderBuilder);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java

@@ -1134,14 +1134,6 @@ private SpannerOptions createSpannerOptions() {
         .build();
   }
 
-  private boolean isJava8() {
-    return JavaVersionUtil.getJavaMajorVersion() == 8;
-  }
-
-  private boolean isWindows() {
-    return System.getProperty("os.name").toLowerCase().contains("windows");
-  }
-
   static class TestableGapicSpannerRpc extends GapicSpannerRpc {
     public TestableGapicSpannerRpc(SpannerOptions options) {
       super(options);