From 254a8eeed90666826e4b1740f26adb3a60cf3831 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 4 May 2026 10:32:24 -0400 Subject: [PATCH 1/2] chore(datastore): Clean up a few test files with new V3 changes --- .../google/cloud/datastore/DatastoreOptionsTest.java | 11 +++-------- .../datastore/it/ITDatastoreClientSideMetrics.java | 10 ++-------- .../datastore/testing/RemoteDatastoreHelper.java | 7 +------ 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java index bff0fdfcfc95..80b33753daa9 100644 --- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java +++ b/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) @@ -275,7 +272,6 @@ public void testTransport() { // custom grpc transport DatastoreOptions grpcTransportOptions = DatastoreOptions.newBuilder() - .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build()) .setProjectId(PROJECT_ID) .setCredentials(NoCredentials.getInstance()) .build(); @@ -288,7 +284,6 @@ public void testTransport() { public void testHostWithGrpcAndHttp() { DatastoreOptions grpcTransportOptions = DatastoreOptions.newBuilder() - .setTransportOptions((TransportOptions) GrpcTransportOptions.newBuilder().build()) .setProjectId(PROJECT_ID) .setCredentials(NoCredentials.getInstance()) .build(); @@ -298,19 +293,19 @@ public void testHostWithGrpcAndHttp() { 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 httpJsonTransportOptions = DatastoreOptions.newBuilder() .setProjectId(PROJECT_ID) .setCredentials(NoCredentials.getInstance()) .build(); - assertThat(defaultTransportOptions.getHost()).isEqualTo(DatastoreSettings.getDefaultEndpoint()); + assertThat(httpJsonTransportOptions.getHost()) + .isEqualTo(DatastoreSettings.getDefaultEndpoint()); DatastoreOptions httpTransportOptions = DatastoreOptions.newBuilder() diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreClientSideMetrics.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreClientSideMetrics.java index 7303bf1e6de2..bacb08f43ef0 100644 --- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreClientSideMetrics.java +++ b/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(); diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java index 6fbf4d3a7913..4126b359449a 100644 --- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java +++ b/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( From 0d6939c57515c3e5a2b63bcee27047d6d35721d2 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 4 May 2026 10:48:25 -0400 Subject: [PATCH 2/2] chore: Address PR feedback --- .../cloud/datastore/DatastoreOptionsTest.java | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java index 80b33753daa9..f5b793c29774 100644 --- a/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java +++ b/java-datastore/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java @@ -259,25 +259,23 @@ 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(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 @@ -288,7 +286,6 @@ public void testHostWithGrpcAndHttp() { .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 = @@ -300,20 +297,12 @@ public void testHostWithGrpcAndHttp() { assertThat(grpcTransportOptionsCustomHost.getHost()).isEqualTo(customHost); DatastoreOptions httpJsonTransportOptions = - DatastoreOptions.newBuilder() - .setProjectId(PROJECT_ID) - .setCredentials(NoCredentials.getInstance()) - .build(); - assertThat(httpJsonTransportOptions.getHost()) - .isEqualTo(DatastoreSettings.getDefaultEndpoint()); - - DatastoreOptions httpTransportOptions = 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()