Skip to content

Commit 5413210

Browse files
committed
Created new grpc wrapper
1 parent 6b0b400 commit 5413210

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
8282
import com.google.cloud.spanner.encryption.EncryptionConfigProtoMapper;
8383
import com.google.cloud.spanner.v1.stub.GrpcSpannerStub;
84+
import com.google.cloud.spanner.v1.stub.GrpcSpannerStubWrapper;
8485
import com.google.cloud.spanner.v1.stub.SpannerStub;
8586
import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
8687
import com.google.common.annotations.VisibleForTesting;
@@ -410,7 +411,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
410411
/* isAdminClient = */ false, isEmulatorEnabled(options, emulatorHost)))
411412
.build();
412413
ClientContext clientContext = ClientContext.create(spannerStubSettings);
413-
this.spannerStub = GrpcSpannerStub.create(spannerStubSettings, clientContext);
414+
this.spannerStub = GrpcSpannerStubWrapper.create(spannerStubSettings, clientContext);
414415
BuiltInMetricsConstant.DIRECT_PATH_ENABLED =
415416
((GrpcTransportChannel) clientContext.getTransportChannel()).isDirectPath()
416417
&& isAttemptDirectPathXds;
@@ -461,7 +462,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
461462
.getStreamWatchdogProvider()
462463
.withCheckInterval(pdmlSettings.getStreamWatchdogCheckInterval()));
463464
}
464-
this.partitionedDmlStub = GrpcSpannerStub.create(pdmlSettings.build());
465+
this.partitionedDmlStub = GrpcSpannerStubWrapper.create(pdmlSettings.build());
465466
this.instanceAdminStubSettings =
466467
options
467468
.getInstanceAdminStubSettings()

google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,6 @@ public static final GrpcSpannerStub create(ClientContext clientContext) throws I
247247
return new GrpcSpannerStub(SpannerStubSettings.newBuilder().build(), clientContext);
248248
}
249249

250-
public static final GrpcSpannerStub create(
251-
SpannerStubSettings settings, ClientContext clientContext) throws IOException {
252-
return new GrpcSpannerStub(settings, clientContext);
253-
}
254-
255250
public static final GrpcSpannerStub create(
256251
ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
257252
return new GrpcSpannerStub(
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.google.cloud.spanner.v1.stub;
2+
3+
import com.google.api.gax.rpc.ClientContext;
4+
import java.io.IOException;
5+
6+
public class GrpcSpannerStubWrapper extends GrpcSpannerStub {
7+
8+
public static final GrpcSpannerStubWrapper create(SpannerStubSettings settings, ClientContext clientContext) throws IOException {
9+
return new GrpcSpannerStubWrapper(settings, clientContext);
10+
}
11+
protected GrpcSpannerStubWrapper(SpannerStubSettings settings, ClientContext clientContext)
12+
throws IOException {
13+
super(settings, clientContext);
14+
}
15+
}

0 commit comments

Comments
 (0)