chore(datastore): Clean up a few test files with new V3 changes (#12987)

gRPC Transport is the new default so there is no need to explicitly set
it.

Author: lqiu96

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

@@ -27,7 +27,6 @@
 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 +216,6 @@ public void testGrpcDefaultChannelConfigurations() {
             .setServiceRpcFactory(datastoreRpcFactory)
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
-            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setCredentials(NoCredentials.getInstance())
             .setHost("http://localhost:" + PORT)
             .build();
@@ -250,7 +248,6 @@ public void testCustomChannelAndCredentials() {
             .setServiceRpcFactory(datastoreRpcFactory)
             .setProjectId(PROJECT_ID)
             .setDatabaseId(DATABASE_ID)
-            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setChannelProvider(channelProvider)
             .setCredentials(NoCredentials.getInstance())
             .setHost("http://localhost:" + PORT)
@@ -262,63 +259,50 @@ public void testCustomChannelAndCredentials() {
   public void testTransport() {
     // default grpc transport
     assertThat(options.build().getTransportOptions()).isInstanceOf(GrpcTransportOptions.class);
-
-    // custom http transport
-    DatastoreOptions httpTransportOptions =
+    DatastoreOptions grpcTransportOptions =
         DatastoreOptions.newBuilder()
-            .setTransportOptions(HttpTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
-    assertThat(httpTransportOptions.getTransportOptions()).isInstanceOf(HttpTransportOptions.class);
+    assertThat(grpcTransportOptions.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class);
+    assertThat(grpcTransportOptions.getTransportChannelProvider())
+        .isInstanceOf(InstantiatingGrpcChannelProvider.class);
 
-    // custom grpc transport
-    DatastoreOptions grpcTransportOptions =
+    // custom http transport
+    DatastoreOptions httpTransportOptions =
         DatastoreOptions.newBuilder()
-            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
+            .setTransportOptions(HttpTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
-    assertThat(grpcTransportOptions.getTransportOptions()).isInstanceOf(GrpcTransportOptions.class);
-    assertThat(grpcTransportOptions.getTransportChannelProvider())
-        .isInstanceOf(InstantiatingGrpcChannelProvider.class);
+    assertThat(httpTransportOptions.getTransportOptions()).isInstanceOf(HttpTransportOptions.class);
   }
 
   @Test
   public void testHostWithGrpcAndHttp() {
     DatastoreOptions grpcTransportOptions =
         DatastoreOptions.newBuilder()
-            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
     assertThat(grpcTransportOptions.getHost()).isEqualTo(DatastoreSettings.getDefaultEndpoint());
-    assertThat(grpcTransportOptions.getHost()).isEqualTo("datastore.googleapis.com:443");
 
     String customHost = "http://localhost:" + PORT;
     DatastoreOptions grpcTransportOptionsCustomHost =
         DatastoreOptions.newBuilder()
-            .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build())
             .setHost(customHost)
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
     assertThat(grpcTransportOptionsCustomHost.getHost()).isEqualTo(customHost);
 
-    DatastoreOptions defaultTransportOptions =
-        DatastoreOptions.newBuilder()
-            .setProjectId(PROJECT_ID)
-            .setCredentials(NoCredentials.getInstance())
-            .build();
-    assertThat(defaultTransportOptions.getHost()).isEqualTo(DatastoreSettings.getDefaultEndpoint());
-
-    DatastoreOptions httpTransportOptions =
+    DatastoreOptions httpJsonTransportOptions =
         DatastoreOptions.newBuilder()
             .setTransportOptions(HttpTransportOptions.newBuilder().build())
             .setProjectId(PROJECT_ID)
             .setCredentials(NoCredentials.getInstance())
             .build();
-    assertThat(httpTransportOptions.getHost()).isEqualTo(DatastoreFactory.DEFAULT_HOST);
+    assertThat(httpJsonTransportOptions.getHost()).isEqualTo(DatastoreFactory.DEFAULT_HOST);
 
     DatastoreOptions httpTransportOptionsCustomHost =
         DatastoreOptions.newBuilder()

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

@@ -27,7 +27,6 @@
 import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.telemetry.TelemetryConstants;
-import com.google.cloud.grpc.GrpcTransportOptions;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
@@ -120,13 +119,8 @@ public void setUp() {
                     .setMetricsEnabled(true)
                     .setOpenTelemetry(customOtel)
                     .setExportBuiltinMetricsToGoogleCloudMonitoring(false)
-                    .build());
-
-    if (transportOptions instanceof GrpcTransportOptions) {
-      builder.setTransportOptions(transportOptions);
-    } else {
-      builder.setTransportOptions(transportOptions);
-    }
+                    .build())
+            .setTransportOptions(transportOptions);
 
     datastore = builder.build().getService();
 

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

@@ -26,7 +26,6 @@
 import com.google.cloud.datastore.Query;
 import com.google.cloud.datastore.QueryResults;
 import com.google.cloud.datastore.StructuredQuery;
-import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.http.HttpTransportOptions;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import java.time.Duration;
@@ -113,11 +112,7 @@ public static RemoteDatastoreHelper create(
             .setDatabaseId(databaseId)
             .setNamespace(UUID.randomUUID().toString())
             .setRetrySettings(retrySettings());
-    if (transportOptions instanceof GrpcTransportOptions) {
-      datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
-    } else {
-      datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
-    }
+    datastoreOptionBuilder = datastoreOptionBuilder.setTransportOptions(transportOptions);
 
     if (openTelemetrySdk != null) {
       datastoreOptionBuilder.setOpenTelemetryOptions(