Skip to content

Commit 6fc8ee6

Browse files
igorbernstein2igorbernstein2
committed
update handwritten layer
1 parent c6e0423 commit 6fc8ee6

File tree

8 files changed

+65
-64
lines changed

8 files changed

+65
-64
lines changed

‎google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
6-
<version>0.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
6+
<version>0.21.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
77
<name>grpc-google-cloud-bigtable-admin-v2</name>
88
<description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.0.0-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.21.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

‎google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
6-
<version>0.0.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
6+
<version>0.21.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
77
<name>proto-google-cloud-bigtable-admin-v2</name>
88
<description>PROTO library for proto-google-cloud-bigtable-admin-v2</description>
99
<parent>
1010
<groupId>com.google.api.grpc</groupId>
1111
<artifactId>google-api-grpc</artifactId>
12-
<version>0.0.0-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
12+
<version>0.21.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
1313
</parent>
1414
<dependencies>
1515
<dependency>

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminClient.java renamed to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* <p>Sample code to get started:
5656
*
5757
* <pre>{@code
58-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
58+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
5959
* CreateTable createTableReq =
6060
* TableAdminRequests.createTable("tableId")
6161
* .addFamily("cf1")
@@ -69,51 +69,51 @@
6969
* <p>Note: close() needs to be called on the client object to clean up resources such as threads.
7070
* In the example above, try-with-resources is used, which automatically calls close().
7171
*
72-
* <p>This class can be customized by passing in a custom instance of TableAdminSettings to
72+
* <p>This class can be customized by passing in a custom instance of BigtableTableAdminSettings to
7373
* create(). For example:
7474
*
7575
* <p>To customize credentials:
7676
*
7777
* <pre>{@code
78-
* TableAdminSettings tableAdminSettings = TableAdminSettings.newBuilder()
78+
* BigtableTableAdminSettings tableAdminSettings = BigtableTableAdminSettings.newBuilder()
7979
* .setInstanceName(InstanceName.of("[PROJECT]", "[INSTANCE]"))
8080
* .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
8181
* .build();
8282
*
83-
* TableAdminClient client =
84-
* TableAdminClient.create(tableAdminSettings);
83+
* BigtableTableAdminClient client =
84+
* BigtableTableAdminClient.create(tableAdminSettings);
8585
* }</pre>
8686
*
8787
* To customize the endpoint:
8888
*
8989
* <pre>{@code
90-
* TableAdminSettings tableAdminSettings = TableAdminSettings.newBuilder()
90+
* BigtableTableAdminSettings tableAdminSettings = BigtableTableAdminSettings.newBuilder()
9191
* .setInstanceName(InstanceName.of("[PROJECT]", "[INSTANCE]"))
9292
* .setEndpoint(myEndpoint).build();
9393
*
94-
* TableAdminClient client = TableAdminClient.create(tableAdminSettings);
94+
* BigtableTableAdminClient client = BigtableTableAdminClient.create(tableAdminSettings);
9595
* }</pre>
9696
*/
97-
public class TableAdminClient implements AutoCloseable {
97+
public class BigtableTableAdminClient implements AutoCloseable {
9898
private final BigtableTableAdminStub stub;
9999
private final InstanceName instanceName;
100100

101-
/** Constructs an instance of TableAdminClient with the given instanceName. */
102-
public static TableAdminClient create(@Nonnull InstanceName instanceName) throws IOException {
103-
return create(TableAdminSettings.newBuilder().setInstanceName(instanceName).build());
101+
/** Constructs an instance of BigtableTableAdminClient with the given instanceName. */
102+
public static BigtableTableAdminClient create(@Nonnull InstanceName instanceName) throws IOException {
103+
return create(BigtableTableAdminSettings.newBuilder().setInstanceName(instanceName).build());
104104
}
105105

106-
/** Constructs an instance of TableAdminClient with the given settings. */
107-
public static TableAdminClient create(@Nonnull TableAdminSettings settings) throws IOException {
106+
/** Constructs an instance of BigtableTableAdminClient with the given settings. */
107+
public static BigtableTableAdminClient create(@Nonnull BigtableTableAdminSettings settings) throws IOException {
108108
return create(settings.getInstanceName(), settings.getStubSettings().createStub());
109109
}
110110

111-
/** Constructs an instance of TableAdminClient with the given instanceName and stub. */
112-
public static TableAdminClient create(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
113-
return new TableAdminClient(instanceName, stub);
111+
/** Constructs an instance of BigtableTableAdminClient with the given instanceName and stub. */
112+
public static BigtableTableAdminClient create(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
113+
return new BigtableTableAdminClient(instanceName, stub);
114114
}
115115

116-
private TableAdminClient(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
116+
private BigtableTableAdminClient(@Nonnull InstanceName instanceName, @Nonnull BigtableTableAdminStub stub) {
117117
Preconditions.checkNotNull(instanceName);
118118
Preconditions.checkNotNull(stub);
119119
this.instanceName = instanceName;
@@ -136,7 +136,7 @@ public void close() {
136136
* <p>Sample code:
137137
*
138138
* <pre>{@code
139-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
139+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
140140
* CreateTable createTableReq =
141141
* TableAdminRequests.createTable("tableId")
142142
* .addFamily("cf2", GCRULES.maxVersions(10))
@@ -160,7 +160,7 @@ public Table createTable(CreateTable createTable) {
160160
* <p>Sample code:
161161
*
162162
* <pre>{@code
163-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
163+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
164164
* CreateTable createTableReq =
165165
* TableAdminRequests.createTable("tableId")
166166
* .addFamily("cf2", GCRULES.maxVersions(10))
@@ -183,7 +183,7 @@ public ApiFuture<Table> createTableAsync(CreateTable createTable) {
183183
* <p>Sample code:
184184
*
185185
* <pre>{@code
186-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
186+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
187187
* ModifyFamilies modifyFamiliesReq = TableAdminRequests.modifyFamilies(tableId)
188188
* .addFamily("mf1")
189189
* .addFamily(
@@ -222,7 +222,7 @@ public Table modifyFamilies(ModifyFamilies modifyFamily) {
222222
* <p>Sample code:
223223
*
224224
* <pre>{@code
225-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
225+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
226226
* ModifyFamilies modifyFamiliesReq = TableAdminRequests.modifyFamilies(tableId)
227227
* .addFamily("mf1")
228228
* .addFamily(
@@ -259,7 +259,7 @@ public ApiFuture<Table> modifyFamiliesAsync(ModifyFamilies modifyFamily) {
259259
* <p>Sample code:
260260
*
261261
* <pre>{@code
262-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
262+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
263263
* client.deleteTable("tableId");
264264
* }
265265
* }</pre>
@@ -276,7 +276,7 @@ public void deleteTable(String tableId) {
276276
* <p>Sample code:
277277
*
278278
* <pre>{@code
279-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
279+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
280280
* client.deleteTableAsync("tableId");
281281
* }
282282
* }</pre>
@@ -294,7 +294,7 @@ public ApiFuture<Void> deleteTableAsync(String tableId) {
294294
* <p>Sample code:
295295
*
296296
* <pre>{@code
297-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
297+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
298298
* client.getTable("tableId");
299299
* }
300300
* }</pre>
@@ -313,7 +313,7 @@ public Table getTable(String tableId) {
313313
* <p>Sample code:
314314
*
315315
* <pre>{@code
316-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
316+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
317317
* client.getTableAsync("tableId");
318318
* }
319319
* }</pre>
@@ -331,7 +331,7 @@ public ApiFuture<Table> getTableAsync(String tableId) {
331331
* <p>Sample code:
332332
*
333333
* <pre>{@code
334-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
334+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
335335
* client.listTables();
336336
* }
337337
* }</pre>
@@ -347,7 +347,7 @@ public List<TableName> listTables() {
347347
* <p>Sample code:
348348
*
349349
* <pre>{@code
350-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
350+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
351351
* client.listTablesAsync();
352352
* }
353353
* }</pre>
@@ -372,7 +372,7 @@ public List<TableName> apply(ListTablesResponse input) {
372372
* <p>Sample code:
373373
*
374374
* <pre>{@code
375-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
375+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
376376
* client.dropRowRange("tableId");
377377
* }
378378
* }</pre>
@@ -390,7 +390,7 @@ public void dropRowRange(String tableId, String rowKeyPrefix) {
390390
* <p>Sample code:
391391
*
392392
* <pre>{@code
393-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
393+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
394394
* client.dropRowRangeAsync("tableId");
395395
* }
396396
* }</pre>
@@ -408,7 +408,7 @@ public ApiFuture<Void> dropRowRangeAsync(String tableId, String rowKeyPrefix) {
408408
* <p>Sample code:
409409
*
410410
* <pre>{@code
411-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
411+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
412412
* client.dropRowRange("tableId");
413413
* }
414414
* }</pre>
@@ -426,7 +426,7 @@ public void dropRowRange(String tableId, ByteString rowKeyPrefix) {
426426
* <p>Sample code:
427427
*
428428
* <pre>{@code
429-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
429+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
430430
* client.dropRowRangeAsync("tableId");
431431
* }
432432
* }</pre>
@@ -447,7 +447,7 @@ public ApiFuture<Void> dropRowRangeAsync(String tableId, ByteString rowKeyPrefix
447447
* <p>Sample code:
448448
*
449449
* <pre>{@code
450-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
450+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
451451
* client.dropAllRows("tableId");
452452
* }
453453
* }</pre>
@@ -464,7 +464,7 @@ public void dropAllRows(String tableId) {
464464
* <p>Sample code:
465465
*
466466
* <pre>{@code
467-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
467+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
468468
* client.dropAllRowsAsync("tableId");
469469
* }
470470
* }</pre>
@@ -485,7 +485,7 @@ public ApiFuture<Void> dropAllRowsAsync(String tableId) {
485485
* <p>Sample code:
486486
*
487487
* <pre>{@code
488-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
488+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
489489
* ConsistencyToken consistencyToken = client.generateConsistencyToken("tableId");
490490
* }
491491
* }</pre>
@@ -506,7 +506,7 @@ public ConsistencyToken generateConsistencyToken(String tableId) {
506506
* <p>Sample code:
507507
*
508508
* <pre>{@code
509-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
509+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
510510
* ConsistencyToken consistencyToken = client.generateConsistencyToken("tableId");
511511
* }
512512
* }</pre>
@@ -535,7 +535,7 @@ public ConsistencyToken apply(GenerateConsistencyTokenResponse input) {
535535
* <p>Sample code:
536536
*
537537
* <pre>{@code
538-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
538+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
539539
* boolean consistent = client.isConsistent("tableId", token);
540540
* }
541541
* }</pre>
@@ -555,7 +555,7 @@ public boolean isConsistent(String tableId, ConsistencyToken token) {
555555
* <p>Sample code:
556556
*
557557
* <pre>{@code
558-
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
558+
* try(BigtableTableAdminClient client = BigtableTableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
559559
* boolean consistent = client.isConsistentAsync("tableId", token);
560560
* }
561561
* }</pre>

google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/TableAdminSettings.java renamed to google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import javax.annotation.Nullable;
2525

2626
/**
27-
* Settings class to configure an instance of {@link TableAdminClient}.
27+
* Settings class to configure an instance of {@link BigtableTableAdminClient}.
2828
*
2929
* <p>It must be configured with an {@link InstanceName} and be used to change default RPC settings.
3030
*
3131
* <p>Example usage:
3232
*
3333
* <pre>{@code
34-
* TableAdminSettings.Builder tableAdminSettingsBuilder = TableAdminSettings.newBuilder()
34+
* BigtableTableAdminSettings.Builder tableAdminSettingsBuilder = BigtableTableAdminSettings.newBuilder()
3535
* .setInstanceName(InstanceName.of("my-project", "my-instance");
3636
*
3737
* tableAdminSettingsBuilder.stubSettings().createTableSettings()
@@ -43,11 +43,11 @@
4343
* BigtableTableAdminSettings tableAdminSettings = tableAdminSettingsBuilder.build();
4444
* }</pre>
4545
*/
46-
public final class TableAdminSettings {
46+
public final class BigtableTableAdminSettings {
4747
private final InstanceName instanceName;
4848
private final BigtableTableAdminStubSettings stubSettings;
4949

50-
private TableAdminSettings(Builder builder) throws IOException {
50+
private BigtableTableAdminSettings(Builder builder) throws IOException {
5151
this.instanceName = Preconditions.checkNotNull(builder.instanceName, "InstanceName must be set");
5252
this.stubSettings = Verify.verifyNotNull(builder.stubSettings, "stubSettings should never be null").build();
5353
}
@@ -73,7 +73,7 @@ public static Builder newBuilder() {
7373
return new Builder();
7474
}
7575

76-
/** Builder for TableAdminSettings. */
76+
/** Builder for BigtableTableAdminSettings. */
7777
public static final class Builder {
7878
@Nullable
7979
private InstanceName instanceName;
@@ -83,7 +83,7 @@ private Builder() {
8383
stubSettings = BigtableTableAdminStubSettings.newBuilder();
8484
}
8585

86-
private Builder(TableAdminSettings settings) {
86+
private Builder(BigtableTableAdminSettings settings) {
8787
this.instanceName = settings.instanceName;
8888
this.stubSettings = settings.stubSettings.toBuilder();
8989
}
@@ -112,8 +112,8 @@ public BigtableTableAdminStubSettings.Builder stubSettings() {
112112
}
113113

114114
/** Builds an instance of the settings. */
115-
public TableAdminSettings build() throws IOException {
116-
return new TableAdminSettings(this);
115+
public BigtableTableAdminSettings build() throws IOException {
116+
return new BigtableTableAdminSettings(this);
117117
}
118118
}
119119
}

‎google-cloud-clients/google-cloud-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/TableAdminResponses.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse;
3030
import com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState;
3131
import com.google.bigtable.admin.v2.TableName;
32-
import com.google.cloud.bigtable.admin.v2.TableAdminClient;
32+
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
3333
import com.google.cloud.bigtable.admin.v2.models.GCRules.GCRule;
3434
import com.google.cloud.bigtable.admin.v2.models.GCRules.IntersectionRule;
3535
import com.google.cloud.bigtable.admin.v2.models.GCRules.UnionRule;
@@ -269,7 +269,7 @@ private GCRule convertGcRule(GcRule source) {
269269
* Wrapper for {@link GenerateConsistencyTokenResponse#getConsistencyToken()}
270270
*
271271
* <p>Cannot be created. They are obtained by invoking {@link
272-
* TableAdminClient#generateConsistencyToken(String)}
272+
* BigtableTableAdminClient#generateConsistencyToken(String)}
273273
*/
274274
public static final class ConsistencyToken {
275275
private final String token;

0 commit comments

Comments
 (0)