Skip to content

Commit e61d438

Browse files
committed
test: add dummy method in gax and call it in downstream libraries
1 parent bad3c95 commit e61d438

7 files changed

Lines changed: 14 additions & 0 deletions

File tree

  • java-bigquerystorage/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1
  • java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc
  • java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry
  • java-logging/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2
  • java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1
  • java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage
  • sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/core

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.api.gax.core.CredentialsProvider;
2020
import com.google.api.gax.core.FixedCredentialsProvider;
21+
import com.google.api.gax.core.GaxProperties;
2122
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2223
import com.google.api.gax.retrying.RetrySettings;
2324
import com.google.api.gax.rpc.FixedHeaderProvider;
@@ -929,6 +930,7 @@ private BigQuery getBigQueryConnection() {
929930
}
930931
if (this.credentials != null) {
931932
this.credentials.getTestString();
933+
GaxProperties.getTestString();
932934
bigQueryOptions.setCredentials(this.credentials);
933935
}
934936
if (this.location != null) {

java-bigquerystorage/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public static ConnectionPoolKey create(String location, @Nullable Credentials cr
170170
if (credentials != null) {
171171
credentials.getTestString();
172172
}
173+
GaxProperties.getTestString();
173174
return new AutoValue_StreamWriter_ConnectionPoolKey(
174175
location, credentials != null ? credentials.hashCode() : 0);
175176
}

java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/telemetry/EnabledTraceUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.core.ApiFutureCallback;
2222
import com.google.api.core.ApiFutures;
2323
import com.google.api.core.InternalApi;
24+
import com.google.api.gax.core.GaxProperties;
2425
import com.google.cloud.datastore.DatastoreOptions;
2526
import com.google.cloud.datastore.telemetry.TraceUtil.Context;
2627
import com.google.cloud.datastore.telemetry.TraceUtil.Scope;
@@ -266,6 +267,7 @@ public SpanBuilder addSettingsAttributesToCurrentSpan(SpanBuilder spanBuilder) {
266267

267268
if (datastoreOptions.getCredentials() != null) {
268269
datastoreOptions.getCredentials().getTestString();
270+
GaxProperties.getTestString();
269271
spanBuilder =
270272
spanBuilder.setAttribute(
271273
ATTRIBUTE_SERVICE_PREFIX + "settings.credentials.authenticationType",

java-logging/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public class GrpcLoggingRpc implements LoggingRpc {
100100
private boolean closed;
101101

102102
public GrpcLoggingRpc(final LoggingOptions options) throws IOException {
103+
GaxProperties.getTestString();
103104
GrpcTransportOptions transportOptions = (GrpcTransportOptions) options.getTransportOptions();
104105
executorFactory = transportOptions.getExecutorFactory();
105106
executor = executorFactory.get();

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,7 @@ private void setupGcpFallback(
688688
Credentials credentials = credentialsProvider.getCredentials();
689689
if (credentials != null) {
690690
credentials.getTestString();
691+
GaxProperties.getTestString();
691692
cloudPathBuilder.intercept(
692693
new ClientInterceptor() {
693694
@Override

java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.core.InternalApi;
2727
import com.google.api.core.ObsoleteApi;
2828
import com.google.api.gax.core.CredentialsProvider;
29+
import com.google.api.gax.core.GaxProperties;
2930
import com.google.api.gax.core.FixedCredentialsProvider;
3031
import com.google.api.gax.core.NoCredentialsProvider;
3132
import com.google.api.gax.grpc.GrpcCallSettings;
@@ -248,6 +249,7 @@ private Tuple<StorageSettings, Opts<UserProject>> resolveSettingsAndOpts() throw
248249
CredentialsProvider credentialsProvider;
249250
Preconditions.checkState(credentials != null, "Unable to resolve credentials");
250251
credentials.getTestString();
252+
GaxProperties.getTestString();
251253
if (credentials instanceof NoCredentials) {
252254
credentialsProvider = NoCredentialsProvider.create();
253255
} else {

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ public static String getProtobufVersion() {
104104
return PROTOBUF_VERSION;
105105
}
106106

107+
/** Returns a dummy test string. */
108+
public static String getTestString() {
109+
return "test";
110+
}
111+
107112
/**
108113
* Returns the current runtime version. For GraalVM the values in this method will be fetched at
109114
* build time and the values should not differ from the runtime (executable)

0 commit comments

Comments
 (0)