Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lqiu96 merged 2 commits into from
May 4, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
254a8ee
chore(datastore): Clean up a few test files with new V3 changes
lqiu96 May 4, 2026
0d6939c
chore: Address PR feedback
lqiu96 May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions ...google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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)
Expand All @@ -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 =
Comment thread
lqiu96 marked this conversation as resolved.
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 =
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The variable name grpcTransportOptionsCustomHost is misleading as it no longer explicitly sets gRPC transport. Consider renaming it to something like defaultOptionsCustomHost to accurately reflect its configuration.

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 =
Comment thread
lqiu96 marked this conversation as resolved.
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()
Expand Down
10 changes: 2 additions & 8 deletions ...d-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreClientSideMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down
7 changes: 1 addition & 6 deletions ...oud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
Loading