From 4aacc01d72b69872b48e76993b05869e9316f217 Mon Sep 17 00:00:00 2001 From: Rahul Kesharwani Date: Wed, 26 Jun 2019 21:10:57 +0530 Subject: [PATCH 1/3] To Test Bigtable CI failure My local master is failing with some wired issue: ``` Caused by: org.apache.maven.enforcer.rule.api.EnforcerRuleException: Failed while enforcing RequireUpperBoundDeps. The error(s) are [ Require upper bound dependencies error for com.google.guava:guava:27.1-android paths to dependency are: ``` --- .../com/google/cloud/bigtable/data/v2/BigtableDataClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java index 578842629b4a..9049d046f049 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java @@ -1151,6 +1151,7 @@ public ApiFuture readModifyWriteRowAsync(ReadModifyWriteRow mutation) { * } * } * } + * This is callable. */ public UnaryCallable readModifyWriteRowCallable() { return stub.readModifyWriteRowCallable(); From d55a6954b272a0e7aea4c6db2e67515464fdf912 Mon Sep 17 00:00:00 2001 From: Rahul Kesharwani Date: Wed, 26 Jun 2019 21:50:33 +0530 Subject: [PATCH 2/3] Adding some formatting related changes --- .../models/ModifyColumnFamiliesRequest.java | 36 +++---------------- .../bigtable/data/v2/BigtableDataClient.java | 1 - 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java index 35f02671e590..53ff3dd99d31 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java @@ -42,33 +42,18 @@ public static ModifyColumnFamiliesRequest of(String tableId) { return new ModifyColumnFamiliesRequest(tableId); } - /** - * Configures the tableId to execute the modifications - * - * @param tableId - */ + /** Configures the tableId to execute the modifications */ ModifyColumnFamiliesRequest(String tableId) { Preconditions.checkNotNull(tableId); this.tableId = tableId; } - /** - * Configures the name of the new ColumnFamily to be created - * - * @param familyId - * @return - */ + /** Configures the name of the new ColumnFamily to be created */ public ModifyColumnFamiliesRequest addFamily(String familyId) { return addFamily(familyId, GCRules.GCRULES.defaultRule()); } - /** - * Configures the name and GcRule of the new ColumnFamily to be created - * - * @param familyId - * @param gcRule - * @return - */ + /** Configures the name and GcRule of the new ColumnFamily to be created */ public ModifyColumnFamiliesRequest addFamily(String familyId, GCRule gcRule) { Preconditions.checkNotNull(gcRule); Modification.Builder modification = Modification.newBuilder().setId(familyId); @@ -77,13 +62,7 @@ public ModifyColumnFamiliesRequest addFamily(String familyId, GCRule gcRule) { return this; } - /** - * Updates the GCRule of existing ColumnFamily - * - * @param familyId - * @param gcRule - * @return - */ + /** Updates the GCRule of existing ColumnFamily */ public ModifyColumnFamiliesRequest updateFamily(String familyId, GCRule gcRule) { Preconditions.checkNotNull(gcRule); Modification.Builder modification = Modification.newBuilder().setId(familyId); @@ -92,12 +71,7 @@ public ModifyColumnFamiliesRequest updateFamily(String familyId, GCRule gcRule) return this; } - /** - * Drops the specified ColumnFamily - * - * @param familyId - * @return - */ + /** Drops the specified ColumnFamily */ public ModifyColumnFamiliesRequest dropFamily(String familyId) { Modification.Builder modification = Modification.newBuilder().setId(familyId).setDrop(true); modFamilyRequest.addModifications(modification.build()); diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java index 9049d046f049..578842629b4a 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java @@ -1151,7 +1151,6 @@ public ApiFuture readModifyWriteRowAsync(ReadModifyWriteRow mutation) { * } * } * } - * This is callable. */ public UnaryCallable readModifyWriteRowCallable() { return stub.readModifyWriteRowCallable(); From eb6dcded2292fe75f1afb7138d5e5a6efb76e6c0 Mon Sep 17 00:00:00 2001 From: Rahul Kesharwani Date: Thu, 27 Jun 2019 00:42:53 +0530 Subject: [PATCH 3/3] Added {@link ...} in the Javadoc --- .../admin/v2/models/ModifyColumnFamiliesRequest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java index 53ff3dd99d31..d4d0f2a9924b 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/ModifyColumnFamiliesRequest.java @@ -48,12 +48,12 @@ public static ModifyColumnFamiliesRequest of(String tableId) { this.tableId = tableId; } - /** Configures the name of the new ColumnFamily to be created */ + /** Configures the name of the new {@link ColumnFamily} to be created */ public ModifyColumnFamiliesRequest addFamily(String familyId) { return addFamily(familyId, GCRules.GCRULES.defaultRule()); } - /** Configures the name and GcRule of the new ColumnFamily to be created */ + /** Configures the name and {@link GCRule} of the new {@link ColumnFamily} to be created */ public ModifyColumnFamiliesRequest addFamily(String familyId, GCRule gcRule) { Preconditions.checkNotNull(gcRule); Modification.Builder modification = Modification.newBuilder().setId(familyId); @@ -62,7 +62,7 @@ public ModifyColumnFamiliesRequest addFamily(String familyId, GCRule gcRule) { return this; } - /** Updates the GCRule of existing ColumnFamily */ + /** Updates the {@link GCRule} of existing {@link ColumnFamily} */ public ModifyColumnFamiliesRequest updateFamily(String familyId, GCRule gcRule) { Preconditions.checkNotNull(gcRule); Modification.Builder modification = Modification.newBuilder().setId(familyId); @@ -71,7 +71,7 @@ public ModifyColumnFamiliesRequest updateFamily(String familyId, GCRule gcRule) return this; } - /** Drops the specified ColumnFamily */ + /** Drops the specified {@link ColumnFamily} */ public ModifyColumnFamiliesRequest dropFamily(String familyId) { Modification.Builder modification = Modification.newBuilder().setId(familyId).setDrop(true); modFamilyRequest.addModifications(modification.build());