Skip to content

Commit 84b8e69

Browse files
committed
style(bigtable): clean up fully qualified ProtoUtils reference
1 parent d3b510b commit 84b8e69

1 file changed

Lines changed: 10 additions & 15 deletions

File tree

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.google.protobuf.Empty;
4545
import io.grpc.MethodDescriptor;
4646
import io.grpc.MethodDescriptor.Marshaller;
47+
import io.grpc.protobuf.ProtoUtils;
4748
import java.io.IOException;
4849
import java.io.InputStream;
4950
import java.time.Duration;
@@ -161,15 +162,12 @@ private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
161162

162163
// Reusing getRestoreTableMethod() as a placeholder descriptor for LRO optimization tracking.
163164
// Since there is no dedicated gRPC LRO method descriptor generated for OptimizeRestoredTable
164-
// LRO,
165-
// we reuse getRestoreTableMethod() (which is an LRO and returns a google.longrunning.Operation)
166-
// and attach a throwing Marshaller for Void to satisfy the OperationCallable constructor
167-
// requirements.
168-
// Note: We do not plumb the gRPC ManagedChannel into the ClientContext below because this
169-
// callable
170-
// is only used for resumeFutureCall() (polling existing LROs via OperationsStub), which already
171-
// encapsulates
172-
// its own channel. The initial RPC is never called through this OperationCallable.
165+
// LRO, we reuse getRestoreTableMethod() (which is an LRO and returns a
166+
// google.longrunning.Operation) and attach a throwing Marshaller for Void to satisfy the
167+
// OperationCallable constructor requirements. Note: We do not plumb the gRPC ManagedChannel
168+
// into the ClientContext below because this callable is only used for resumeFutureCall()
169+
// (polling existing LROs via OperationsStub), which already encapsulates its own channel.
170+
// The initial RPC is never called through this OperationCallable.
173171
MethodDescriptor<Void, Operation> fakeDescriptor =
174172
MethodDescriptor.<Void, Operation>newBuilder()
175173
.setType(MethodDescriptor.MethodType.UNARY)
@@ -188,8 +186,7 @@ public Void parse(InputStream stream) {
188186
throw new UnsupportedOperationException();
189187
}
190188
})
191-
.setResponseMarshaller(
192-
io.grpc.protobuf.ProtoUtils.marshaller(Operation.getDefaultInstance()))
189+
.setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
193190
.build();
194191

195192
GrpcCallSettings<Void, Operation> unusedInitialCallSettings =
@@ -228,10 +225,8 @@ public Empty apply(OperationSnapshot input) {
228225
// Note: The clientContext created here only contains the basic clock and executor settings
229226
// required by the polling algorithm to schedule polling attempts. We do not need to populate
230227
// the channel or call context details here because the operations stub
231-
// (stub.getOperationsStub())
232-
// already encapsulates the fully-configured default call context (including channels,
233-
// credentials,
234-
// and headers) for executing the polling RPCs.
228+
// (stub.getOperationsStub()) already encapsulates the fully-configured default call context
229+
// (including channels, credentials, and headers) for executing the polling RPCs.
235230
ClientContext clientContext =
236231
ClientContext.newBuilder()
237232
.setClock(settings.getStubSettings().getClock())

0 commit comments

Comments
 (0)