Skip to content

Commit d3b510b

Browse files
committed
style(bigtable): clean up remaining fully qualified com.google references
1 parent 1abf480 commit d3b510b

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
*/
1616
package com.google.cloud.bigtable.admin.v2;
1717

18+
import com.google.api.core.ApiClock;
1819
import com.google.api.core.ApiFunction;
1920
import com.google.api.core.ApiFuture;
2021
import com.google.api.core.ApiFutures;
22+
import com.google.api.gax.grpc.GrpcCallContext;
2123
import com.google.api.gax.grpc.GrpcCallSettings;
2224
import com.google.api.gax.grpc.GrpcCallableFactory;
2325
import com.google.api.gax.grpc.ProtoOperationTransformers.MetadataTransformer;
@@ -26,6 +28,7 @@
2628
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
2729
import com.google.api.gax.retrying.RetrySettings;
2830
import com.google.api.gax.rpc.ApiExceptions;
31+
import com.google.api.gax.rpc.ClientContext;
2932
import com.google.api.gax.rpc.OperationCallSettings;
3033
import com.google.api.gax.rpc.OperationCallable;
3134
import com.google.api.gax.rpc.UnaryCallSettings;
@@ -132,7 +135,7 @@ protected BigtableTableAdminClientV2(
132135
private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
133136
GrpcBigtableTableAdminStub stub,
134137
BigtableTableAdminStubSettings settings,
135-
com.google.api.core.ApiClock clock,
138+
ApiClock clock,
136139
ScheduledExecutorService executor) {
137140
// TODO(igorbernstein2): expose polling settings
138141
RetrySettings pollingSettings =
@@ -195,8 +198,8 @@ public Void parse(InputStream stream) {
195198
final MetadataTransformer<OptimizeRestoredTableMetadata> protoMetadataTransformer =
196199
MetadataTransformer.create(OptimizeRestoredTableMetadata.class);
197200

198-
final ResponseTransformer<com.google.protobuf.Empty> protoResponseTransformer =
199-
ResponseTransformer.create(com.google.protobuf.Empty.class);
201+
final ResponseTransformer<Empty> protoResponseTransformer =
202+
ResponseTransformer.create(Empty.class);
200203

201204
OperationCallSettings<Void, Empty, OptimizeRestoredTableMetadata> operationCallSettings =
202205
OperationCallSettings.<Void, Empty, OptimizeRestoredTableMetadata>newBuilder()
@@ -229,11 +232,11 @@ public Empty apply(OperationSnapshot input) {
229232
// already encapsulates the fully-configured default call context (including channels,
230233
// credentials,
231234
// and headers) for executing the polling RPCs.
232-
com.google.api.gax.rpc.ClientContext clientContext =
233-
com.google.api.gax.rpc.ClientContext.newBuilder()
235+
ClientContext clientContext =
236+
ClientContext.newBuilder()
234237
.setClock(settings.getStubSettings().getClock())
235238
.setExecutor(backgroundExecutor)
236-
.setDefaultCallContext(com.google.api.gax.grpc.GrpcCallContext.createDefault())
239+
.setDefaultCallContext(GrpcCallContext.createDefault())
237240
.build();
238241

239242
return GrpcCallableFactory.createOperationCallable(

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.google.api.core.ApiFuture;
2121
import com.google.api.core.ApiFutures;
22+
import com.google.api.gax.core.NoCredentialsProvider;
2223
import com.google.api.gax.longrunning.OperationFuture;
2324
import com.google.api.gax.rpc.OperationCallable;
2425
import com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata;
@@ -174,7 +175,7 @@ public void testAwaitOptimizeRestoredTable_NoOp() throws Exception {
174175
public void testCreateClientWithSettings() throws Exception {
175176
BaseBigtableTableAdminSettings settings =
176177
BaseBigtableTableAdminSettings.newBuilder()
177-
.setCredentialsProvider(com.google.api.gax.core.NoCredentialsProvider.create())
178+
.setCredentialsProvider(NoCredentialsProvider.create())
178179
.setEndpoint("localhost:8080")
179180
.build();
180181
try (BigtableTableAdminClientV2 settingsClient = BigtableTableAdminClientV2.create(settings)) {

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/stub/AwaitConsistencyCallableV2Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.google.api.core.ApiFuture;
2121
import com.google.api.core.ApiFutures;
22+
import com.google.api.core.NanoClock;
2223
import com.google.api.gax.retrying.PollException;
2324
import com.google.api.gax.retrying.RetrySettings;
2425
import com.google.api.gax.rpc.ApiCallContext;
@@ -87,7 +88,7 @@ public void setUp() {
8788
AwaitConsistencyCallableV2.create(
8889
mockGenerateConsistencyTokenCallable,
8990
mockCheckConsistencyCallable,
90-
com.google.api.core.NanoClock.getDefaultClock(),
91+
NanoClock.getDefaultClock(),
9192
java.util.concurrent.Executors.newSingleThreadScheduledExecutor(),
9293
retrySettings);
9394
}

0 commit comments

Comments
 (0)