Skip to content

Commit b79a90b

Browse files
committed
javadoc indentation fixes.
1 parent c24ea9d commit b79a90b

5 files changed

Lines changed: 17 additions & 20 deletions

File tree

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
6060
* CreateTable createTableReq =
6161
* TableAdminRequests.createTable("tableId")
62-
* .addColumnFamily("cf1")
63-
* .addColumnFamily("cf2", GCRULES.maxVersions(10))
62+
* .addFamily("cf1")
63+
* .addFamily("cf2", GCRULES.maxVersions(10))
6464
* .addSplit(ByteString.copyFromUtf8("b"))
6565
* .addSplit(ByteString.copyFromUtf8("q"));
6666
* client.createTable(createTableReq);
@@ -80,9 +80,9 @@
8080
* BigtableTableAdminSettings bigtableTableAdminSettings =
8181
* BigtableTableAdminSettings.newBuilder()
8282
* .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
83-
* .build();
83+
* .build();
8484
* TableAdminClient client =
85-
* TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
85+
* TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
8686
* }</pre>
8787
*
8888
* To customize the endpoint:
@@ -91,7 +91,7 @@
9191
* BigtableTableAdminSettings bigtableTableAdminSettings =
9292
* BigtableTableAdminSettings.newBuilder().setEndpoint(myEndpoint).build();
9393
* TableAdminClient client =
94-
* TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
94+
* TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"), bigtableTableAdminSettings);
9595
* }</pre>
9696
*/
9797
@BetaApi
@@ -173,7 +173,7 @@ public void close() {
173173
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
174174
* CreateTable createTableReq =
175175
* TableAdminRequests.createTable("tableId")
176-
* .addColumnFamily("cf2", GCRULES.maxVersions(10))
176+
* .addFamily("cf2", GCRULES.maxVersions(10))
177177
* client.createTable(createTableReq);
178178
* }
179179
* }</pre>
@@ -197,8 +197,7 @@ public Table createTable(CreateTable createTable) {
197197
* try(TableAdminClient client = TableAdminClient.create(InstanceName.of("[PROJECT]", "[INSTANCE]"))) {
198198
* CreateTable createTableReq =
199199
* TableAdminRequests.createTable("tableId")
200-
* .addColumnFamily("cf2", GCRULES.maxVersions(10))
201-
*
200+
* .addFamily("cf2", GCRULES.maxVersions(10))
202201
* client.createTableAsync(createTableReq);
203202
* }
204203
* }</pre>
@@ -612,11 +611,11 @@ public boolean isConsistent(String tableId, ConsistencyToken token) {
612611
* @return ApiFuture<Boolean>
613612
*/
614613
public ApiFuture<Boolean> isConsistentAsync(String tableId, ConsistencyToken token) {
615-
ApiFuture<CheckConsistencyResponse> CheckConsResp =
614+
ApiFuture<CheckConsistencyResponse> checkConsResp =
616615
stub.checkConsistencyCallable().futureCall(token.toProto(getTableName(tableId)));
617616

618617
return ApiFutures.transform(
619-
CheckConsResp,
618+
checkConsResp,
620619
new ApiFunction<CheckConsistencyResponse, Boolean>() {
621620
@Override
622621
public Boolean apply(CheckConsistencyResponse input) {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private VersionRule(int maxVersion) {
208208

209209
/** Gets the configured maximum versions */
210210
public int getMaxVersions() {
211-
return toProto().getMaxNumVersions();
211+
return builder.getMaxNumVersions();
212212
}
213213

214214
@Override
@@ -240,9 +240,7 @@ private DurationRule(Duration duration) {
240240
* @return Duration
241241
*/
242242
public Duration getMaxAge() {
243-
long seconds = toProto().getMaxAge().getSeconds();
244-
int nanos = toProto().getMaxAge().getNanos();
245-
return Duration.ofSeconds(seconds, nanos);
243+
return Duration.ofSeconds(builder.getSeconds(), builder.getNanos());
246244
}
247245

248246
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private CreateTable(String tableId) {
8383
*
8484
* @param familyId
8585
*/
86-
public CreateTable addColumnFamily(String familyId) {
86+
public CreateTable addFamily(String familyId) {
8787
Preconditions.checkNotNull(familyId);
8888
tableRequest.putColumnFamilies(familyId, ColumnFamily.newBuilder().build());
8989
return this;
@@ -95,7 +95,7 @@ public CreateTable addColumnFamily(String familyId) {
9595
* @param familyId
9696
* @param gcRule
9797
*/
98-
public CreateTable addColumnFamily(String familyId, GCRule gcRule) {
98+
public CreateTable addFamily(String familyId, GCRule gcRule) {
9999
Preconditions.checkNotNull(familyId);
100100
tableRequest.putColumnFamilies(
101101
familyId, ColumnFamily.newBuilder().setGcRule(gcRule.toProto()).build());

google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/TableAdminClientIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public void createTable() throws Exception {
5858
String tableId = "adminCreateTest";
5959
CreateTable createTableReq =
6060
TableAdminRequests.createTable(tableId)
61-
.addColumnFamily("cf1")
62-
.addColumnFamily("cf2", GCRULES.maxVersions(10))
61+
.addFamily("cf1")
62+
.addFamily("cf2", GCRULES.maxVersions(10))
6363
.addSplit(ByteString.copyFromUtf8("b"))
6464
.addSplit(ByteString.copyFromUtf8("q"));
6565

google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/TableAdminRequestsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public class TableAdminRequestsTest {
3838
public void createTable() {
3939
CreateTableRequest actual =
4040
TableAdminRequests.createTable("tableId")
41-
.addColumnFamily("cf1")
42-
.addColumnFamily("cf2", GCRules.GCRULES.maxVersions(1))
41+
.addFamily("cf1")
42+
.addFamily("cf2", GCRules.GCRULES.maxVersions(1))
4343
.addSplit(ByteString.copyFromUtf8("c"))
4444
.toProto(instanceName);
4545

0 commit comments

Comments
 (0)