Addressed comments

Author: sakthivelmanii

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -1616,18 +1616,12 @@ public Builder disableLeaderAwareRouting() {
     }
 
     @BetaApi
-    public Builder enableDirectAccess() {
-      this.enableDirectAccess = true;
+    public Builder setEnableDirectAccess(boolean enableDirectAccess) {
+      this.enableDirectAccess = enableDirectAccess;
       return this;
     }
 
-    @BetaApi
-    public Builder disableDirectAccess() {
-      this.enableDirectAccess = false;
-      return this;
-    }
-
-    @ObsoleteApi("Use disableDirectAccess() instead")
+    @ObsoleteApi("Use setEnableDirectAccess(false) instead")
     @Deprecated
     public Builder disableDirectPath() {
       this.enableDirectAccess = false;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java

@@ -1082,7 +1082,7 @@ boolean isExperimentalHost() {
     return getInitialConnectionPropertyValue(IS_EXPERIMENTAL_HOST);
   }
 
-  boolean isEnableDirectAccess() {
+  Boolean isEnableDirectAccess() {
     return getInitialConnectionPropertyValue(ENABLE_DIRECT_ACCESS);
   }
 

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionProperties.java

@@ -193,7 +193,7 @@ public class ConnectionProperties {
               + "Otherwise it will automatically fallback to the standard network path. "
               + "NOTE: The default for this property is currently false, "
               + "but this could be changed in the future.",
-          false,
+          null,
           BOOLEANS,
           BooleanConverter.INSTANCE,
           Context.STARTUP);

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SpannerPool.java

@@ -164,7 +164,7 @@ static class SpannerPoolKey {
     private final String clientCertificate;
     private final String clientCertificateKey;
     private final boolean isExperimentalHost;
-    private final boolean enableDirectAccess;
+    private final Boolean enableDirectAccess;
 
     @VisibleForTesting
     static SpannerPoolKey of(ConnectionOptions options) {
@@ -416,8 +416,8 @@ Spanner createSpanner(SpannerPoolKey key, ConnectionOptions options) {
     if (key.isExperimentalHost) {
       builder.setExperimentalHost(key.host);
     }
-    if (key.enableDirectAccess) {
-      builder.enableDirectAccess();
+    if (key.enableDirectAccess != null) {
+      builder.setEnableDirectAccess(key.enableDirectAccess);
     }
     if (options.getConfigurator() != null) {
       options.getConfigurator().configure(builder);

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java

@@ -1317,7 +1317,12 @@ public void testEnableDirectAccess() {
     ConnectionOptions.Builder builderWithoutDirectPathParam = ConnectionOptions.newBuilder();
     builderWithoutDirectPathParam.setUri(
         "spanner://localhost:15000/instances/default/databases/singers-db;usePlainText=true");
-    assertFalse(builderWithoutDirectPathParam.build().isEnableDirectAccess());
+    assertNull(builderWithoutDirectPathParam.build().isEnableDirectAccess());
+
+    ConnectionOptions.Builder builderWithDirectPathParamFalse = ConnectionOptions.newBuilder();
+    builderWithDirectPathParamFalse.setUri(
+        "spanner://localhost:15000/instances/default/databases/singers-db;usePlainText=true;enableDirectAccess=false");
+    assertFalse(builderWithDirectPathParamFalse.build().isEnableDirectAccess());
 
     ConnectionOptions.Builder builderWithDirectPathParam = ConnectionOptions.newBuilder();
     builderWithDirectPathParam.setUri(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/CredentialsProviderTest.java

@@ -93,7 +93,7 @@ public void testCredentialsProvider() throws Throwable {
                   .setConfigurator(
                       spannerOptions -> {
                         spannerOptions.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
-                        spannerOptions.disableDirectAccess();
+                        spannerOptions.setEnableDirectAccess(false);
                       })
                   .build();
 
@@ -135,7 +135,7 @@ public void testCredentialsProvider() throws Throwable {
                   .setConfigurator(
                       spannerOptions -> {
                         spannerOptions.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
-                        spannerOptions.disableDirectAccess();
+                        spannerOptions.setEnableDirectAccess(false);
                       })
                   .build();
           try (Connection connection = options.getConnection()) {

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

@@ -879,7 +879,7 @@ private SpannerOptions createSpannerOptions() {
         .setProjectId("[PROJECT]")
         // Set a custom channel configurator to allow http instead of https.
         .setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
-        .disableDirectAccess()
+        .setEnableDirectAccess(false)
         .setHost("http://" + endpoint)
         // Set static credentials that will return the static OAuth test token.
         .setCredentials(STATIC_CREDENTIALS)

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

@@ -290,7 +290,7 @@ private static SpannerOptions createSpannerOptions(InetSocketAddress address, Se
         .setProjectId("[PROJECT]")
         // Set a custom channel configurator to allow http instead of https.
         .setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
-        .disableDirectAccess()
+        .setEnableDirectAccess(false)
         .setHost("http://" + endpoint)
         // Set static credentials that will return the static OAuth test token.
         .setCredentials(STATIC_CREDENTIALS)