Skip to content

Commit 15e6df0

Browse files
committed
remove unnecessary changes
1 parent e69b16c commit 15e6df0

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
public final class BigtableInstanceAdminClient implements AutoCloseable {
126126
private final String projectId;
127127
private final BigtableInstanceAdminStub stub;
128-
private final BigtableInstanceAdminClientV2 baseClient;
128+
private final BigtableInstanceAdminClientV2 v2Client;
129129

130130
/** Constructs an instance of BigtableInstanceAdminClient with the given project ID. */
131131
public static BigtableInstanceAdminClient create(@Nonnull String projectId) throws IOException {
@@ -148,7 +148,7 @@ private BigtableInstanceAdminClient(
148148
@Nonnull String projectId, @Nonnull BigtableInstanceAdminStub stub) {
149149
this.projectId = projectId;
150150
this.stub = stub;
151-
this.baseClient = BigtableInstanceAdminClientV2.create(stub);
151+
this.v2Client = new BigtableInstanceAdminClientV2(stub);
152152
}
153153

154154
/** Gets the project ID this client is associated with. */
@@ -161,7 +161,7 @@ public String getProjectId() {
161161
* methods.
162162
*/
163163
public BigtableInstanceAdminClientV2 getBaseClient() {
164-
return baseClient;
164+
return v2Client;
165165
}
166166

167167
/** Closes the client and frees all resources associated with it (like thread pools). */

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,4 @@ public static final BigtableInstanceAdminClientV2 create(
4040
BaseBigtableInstanceAdminSettings settings) throws IOException {
4141
return new BigtableInstanceAdminClientV2(settings);
4242
}
43-
44-
/** Constructs an instance of BigtableInstanceAdminClientV2 with the given stub. */
45-
public static final BigtableInstanceAdminClientV2 create(BigtableInstanceAdminStub stub) {
46-
return new BigtableInstanceAdminClientV2(stub);
47-
}
4843
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public final class BigtableTableAdminClient implements AutoCloseable {
171171
private final EnhancedBigtableTableAdminStub stub;
172172
private final String projectId;
173173
private final String instanceId;
174-
private BigtableTableAdminClientV2 baseClient;
174+
private BigtableTableAdminClientV2 v2Client;
175175

176176
/** Constructs an instance of BigtableTableAdminClient with the given project and instance IDs. */
177177
public static BigtableTableAdminClient create(
@@ -228,7 +228,7 @@ public String getInstanceId() {
228228
* methods.
229229
*/
230230
public synchronized BigtableTableAdminClientV2 getBaseClient() {
231-
if (baseClient == null) {
231+
if (v2Client == null) {
232232
ScheduledExecutorService backgroundExecutor =
233233
stub.getSettings().getBackgroundExecutorProvider().getExecutor();
234234
boolean shouldAutoClose =
@@ -238,15 +238,15 @@ public synchronized BigtableTableAdminClientV2 getBaseClient() {
238238
BigtableTableAdminClientV2.createAwaitConsistencyCallable(
239239
stub, stub.getSettings(), stub.getClientContext().getClock(), backgroundExecutor);
240240

241-
baseClient =
241+
v2Client =
242242
new BigtableTableAdminClientV2(
243243
stub,
244244
backgroundExecutor,
245245
shouldAutoClose,
246246
awaitConsistencyCallable,
247247
stub.awaitOptimizeRestoredTableCallable());
248248
}
249-
return baseClient;
249+
return v2Client;
250250
}
251251

252252
@Override

0 commit comments

Comments
 (0)