chore: Set the transport options via the builder

Author: lqiu96

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java

@@ -180,12 +180,16 @@ public Builder setTransportOptions(@Nonnull TransportOptions transportOptions) {
     }
 
     /**
-     * Sets the transport to gRPC. Note this functionality is experimental and subject to change.
+     * This method deprecated. Prefer to use {@link #setTransportOptions(TransportOptions)} instead.
+     * When using the transport-neutral variant, you may need to cast to TransportOptions when using
+     * a GrpcTransportOptions class, otherwise it will default to the deprecated method.
+     *
+     * <p>Sets the transport to gRPC. Note this functionality is experimental and subject to change.
      */
+    @Deprecated
     @BetaApi
     public Builder setTransportOptions(GrpcTransportOptions transportOptions) {
-      this.transportOptions = transportOptions;
-      return super.setTransportOptions(transportOptions);
+      return setTransportOptions((TransportOptions) transportOptions);
     }
 
     @Override

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java

@@ -22,6 +22,7 @@
 import com.google.api.core.InternalApi;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
+import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.testing.BaseEmulatorHelper;
@@ -242,11 +243,14 @@ public DatastoreOptions getOptions(String namespace) {
   }
 
   /**
-   * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
-   * localhost. The transportOptions is set to {@code grpcTransportOptions}.
+   * Prefer to set the TransportOptions via the Options Builder.
+   *
+   * <p>Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator
+   * on localhost. The transportOptions is set to {@code grpcTransportOptions}.
    */
+  @Deprecated
   public DatastoreOptions getGrpcTransportOptions(GrpcTransportOptions grpcTransportOptions) {
-    return optionsBuilder.setTransportOptions(grpcTransportOptions).build();
+    return optionsBuilder.setTransportOptions((TransportOptions) grpcTransportOptions).build();
   }
 
   public DatastoreOptions.Builder setNamespace(String namespace) {

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreImplMetricsTest.java

@@ -21,6 +21,7 @@
 import com.google.api.gax.rpc.StatusCode;
 import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceOptions;
+import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.cloud.datastore.telemetry.DatastoreMetricsRecorder;
@@ -115,7 +116,7 @@ public void setUp() {
                     .build());
 
     if (TelemetryConstants.Transport.GRPC.equals(transport)) {
-      builder.setTransportOptions(GrpcTransportOptions.newBuilder().build());
+      builder.setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build());
     } else {
       builder.setTransportOptions(HttpTransportOptions.newBuilder().build());
     }

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java

@@ -27,6 +27,7 @@
 import com.google.api.gax.grpc.ChannelPoolSettings;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.cloud.NoCredentials;
+import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.spi.DatastoreRpcFactory;
 import com.google.cloud.datastore.spi.v1.DatastoreRpc;
 import com.google.cloud.datastore.v1.DatastoreSettings;
@@ -217,7 +218,7 @@ public void testGrpcDefaultChannelConfigurations() {
             .setServiceRpcFactory(datastoreRpcFactory)
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
-            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setCredentials(NoCredentials.getInstance())
             .setHost("http://localhost:" + PORT)
             .build();
@@ -250,7 +251,7 @@ public void testCustomChannelAndCredentials() {
             .setServiceRpcFactory(datastoreRpcFactory)
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
-            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setChannelProvider(channelProvider)
             .setCredentials(NoCredentials.getInstance())
             .setHost("http://localhost:" + PORT)
@@ -296,7 +297,7 @@ public void testTransport() {
     // custom grpc transport
     DatastoreOptions grpcTransportOptions =
         DatastoreOptions.newBuilder()
-            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
@@ -309,7 +310,7 @@ public void testTransport() {
   public void testHostWithGrpcAndHttp() {
     DatastoreOptions grpcTransportOptions =
         DatastoreOptions.newBuilder()
-            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
@@ -319,7 +320,7 @@ public void testHostWithGrpcAndHttp() {
     String customHost = "http://localhost:" + PORT;
     DatastoreOptions grpcTransportOptionsCustomHost =
         DatastoreOptions.newBuilder()
-            .setTransportOptions(GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setHost(customHost)
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java

@@ -17,7 +17,6 @@
 package com.google.cloud.datastore;
 
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
-import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.common.truth.Truth;
 import java.io.IOException;
 import java.time.Duration;
@@ -32,8 +31,7 @@ public class DatastoreTestGrpc extends AbstractDatastoreTest {
 
   private static final LocalDatastoreHelper helper = LocalDatastoreHelper.create(1.0, 9090);
 
-  private static DatastoreOptions options =
-      helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+  private static DatastoreOptions options = helper.getOptions();
   private static Datastore datastore = options.getService();
 
   public DatastoreTestGrpc(DatastoreOptions options, Datastore datastore) {
@@ -48,7 +46,7 @@ public static Iterable<Object[]> data() {
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     helper.start();
-    options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+    options = helper.getOptions();
     datastore = options.getService();
   }
 

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java

@@ -17,7 +17,7 @@
 package com.google.cloud.datastore;
 
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
-import com.google.cloud.grpc.GrpcTransportOptions;
+import com.google.cloud.http.HttpTransportOptions;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
@@ -46,7 +46,10 @@ public static Iterable<Object[]> data() {
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     helper.start();
-    options = helper.getGrpcTransportOptions(GrpcTransportOptions.newBuilder().build());
+    options =
+        helper.getOptions().toBuilder()
+            .setTransportOptions(HttpTransportOptions.newBuilder().build())
+            .build();
     datastore = options.getService();
   }
 

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreClientSideMetrics.java

@@ -28,7 +28,6 @@
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.telemetry.TelemetryConstants;
 import com.google.cloud.grpc.GrpcTransportOptions;
-import com.google.cloud.http.HttpTransportOptions;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
@@ -124,9 +123,9 @@ public void setUp() {
                     .build());
 
     if (transportOptions instanceof GrpcTransportOptions) {
-      builder.setTransportOptions((GrpcTransportOptions) transportOptions);
+      builder.setTransportOptions(transportOptions);
     } else {
-      builder.setTransportOptions((HttpTransportOptions) transportOptions);
+      builder.setTransportOptions(transportOptions);
     }
 
     datastore = builder.build().getService();

java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

@@ -114,8 +114,7 @@ public static RemoteDatastoreHelper create(
             .setNamespace(UUID.randomUUID().toString())
             .setRetrySettings(retrySettings());
     if (transportOptions instanceof GrpcTransportOptions) {
-      datastoreOptionBuilder =
-          datastoreOptionBuilder.setTransportOptions((GrpcTransportOptions) transportOptions);
+      datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
     } else {
       datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
     }