Skip to content

Commit 28beb5b

Browse files
committed
refactor(bigtable): remove production dependency on grpc admin service stub
1 parent 589ccbe commit 28beb5b

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

java-bigtable/google-cloud-bigtable/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,11 @@
278278
<classifier>testlib</classifier>
279279
<scope>test</scope>
280280
</dependency>
281+
281282
<dependency>
282283
<groupId>com.google.api.grpc</groupId>
283284
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
285+
<scope>test</scope>
284286
</dependency>
285287
<dependency>
286288
<groupId>com.google.cloud</groupId>

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.google.api.gax.rpc.OperationCallable;
3131
import com.google.api.gax.rpc.UnaryCallSettings;
3232
import com.google.api.gax.rpc.UnaryCallable;
33-
import com.google.bigtable.admin.v2.BigtableTableAdminGrpc;
3433
import com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata;
3534
import com.google.bigtable.admin.v2.TableName;
3635
import com.google.cloud.bigtable.admin.v2.stub.AwaitConsistencyCallableV2;
@@ -169,7 +168,12 @@ private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
169168
// encapsulates
170169
// its own channel. The initial RPC is never called through this OperationCallable.
171170
MethodDescriptor<Void, Operation> fakeDescriptor =
172-
BigtableTableAdminGrpc.getRestoreTableMethod().toBuilder(
171+
MethodDescriptor.<Void, Operation>newBuilder()
172+
.setType(MethodDescriptor.MethodType.UNARY)
173+
.setFullMethodName(
174+
MethodDescriptor.generateFullMethodName(
175+
"google.bigtable.admin.v2.BigtableTableAdmin", "RestoreTable"))
176+
.setRequestMarshaller(
173177
new Marshaller<Void>() {
174178
@Override
175179
public InputStream stream(Void value) {
@@ -180,8 +184,9 @@ public InputStream stream(Void value) {
180184
public Void parse(InputStream stream) {
181185
throw new UnsupportedOperationException();
182186
}
183-
},
184-
BigtableTableAdminGrpc.getRestoreTableMethod().getResponseMarshaller())
187+
})
188+
.setResponseMarshaller(
189+
io.grpc.protobuf.ProtoUtils.marshaller(Operation.getDefaultInstance()))
185190
.build();
186191

187192
GrpcCallSettings<Void, Operation> unusedInitialCallSettings =

0 commit comments

Comments
 (0)