Skip to content

Commit 387fad5

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

File tree

3 files changed

+36
-8
lines changed

3 files changed

+36
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStub;
8181
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
8282
import com.google.cloud.spanner.encryption.EncryptionConfigProtoMapper;
83-
import com.google.cloud.spanner.v1.stub.GrpcSpannerStub;
83+
import com.google.cloud.spanner.v1.stub.GrpcSpannerStubWrapper;
8484
import com.google.cloud.spanner.v1.stub.SpannerStub;
8585
import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
8686
import com.google.common.annotations.VisibleForTesting;
@@ -410,7 +410,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
410410
/* isAdminClient = */ false, isEmulatorEnabled(options, emulatorHost)))
411411
.build();
412412
ClientContext clientContext = ClientContext.create(spannerStubSettings);
413-
this.spannerStub = GrpcSpannerStub.create(spannerStubSettings, clientContext);
413+
this.spannerStub = GrpcSpannerStubWrapper.create(spannerStubSettings, clientContext);
414414
BuiltInMetricsConstant.DIRECT_PATH_ENABLED =
415415
((GrpcTransportChannel) clientContext.getTransportChannel()).isDirectPath()
416416
&& isAttemptDirectPathXds;
@@ -461,7 +461,7 @@ public GapicSpannerRpc(final SpannerOptions options) {
461461
.getStreamWatchdogProvider()
462462
.withCheckInterval(pdmlSettings.getStreamWatchdogCheckInterval()));
463463
}
464-
this.partitionedDmlStub = GrpcSpannerStub.create(pdmlSettings.build());
464+
this.partitionedDmlStub = GrpcSpannerStubWrapper.create(pdmlSettings.build());
465465
this.instanceAdminStubSettings =
466466
options
467467
.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: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright 2024 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.spanner.v1.stub;
18+
19+
import com.google.api.gax.rpc.ClientContext;
20+
import java.io.IOException;
21+
22+
public class GrpcSpannerStubWrapper extends GrpcSpannerStub {
23+
24+
public static final GrpcSpannerStubWrapper create(
25+
SpannerStubSettings settings, ClientContext clientContext) throws IOException {
26+
return new GrpcSpannerStubWrapper(settings, clientContext);
27+
}
28+
29+
protected GrpcSpannerStubWrapper(SpannerStubSettings settings, ClientContext clientContext)
30+
throws IOException {
31+
super(settings, clientContext);
32+
}
33+
}

0 commit comments

Comments
 (0)