From dd00081c26fb4222e223b510e58923118cf9df43 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 17 Dec 2017 16:15:20 +0100 Subject: [PATCH] HBASE-19538 Removed unnecessary semicolons in hbase-client --- .../src/main/java/org/apache/hadoop/hbase/ClusterStatus.java | 2 +- .../main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 2 +- .../java/org/apache/hadoop/hbase/client/CompactionState.java | 3 ++- .../main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 4 ++-- .../java/org/apache/hadoop/hbase/client/SnapshotType.java | 3 ++- .../hadoop/hbase/client/security/SecurityCapability.java | 3 +-- .../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java | 2 +- .../org/apache/hadoop/hbase/quotas/ThrottlingException.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestAsyncProcess.java | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index f06d9b9f7a3..6b4c03abc54 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -483,6 +483,6 @@ public class ClusterStatus { BACKUP_MASTERS, /** status about backup masters */ MASTER_COPROCESSORS, /** status about master coprocessors */ REGIONS_IN_TRANSITION, /** status about regions in transition */ - MASTER_INFO_PORT; /** master info port **/ + MASTER_INFO_PORT /** master info port **/ } } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index e184f7ca028..077494509c3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -332,7 +332,7 @@ public class MetaTableAccessor { parsedInfo = parseRegionInfoFromRegionName(regionName); row = getMetaKeyForRegion(parsedInfo); } catch (Exception parseEx) { - ; // Ignore. This is used with tableName passed as regionName. + // Ignore. This is used with tableName passed as regionName. } Get get = new Get(row); get.addFamily(HConstants.CATALOG_FAMILY); diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CompactionState.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CompactionState.java index 09a76e053fe..51f7d071e4a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CompactionState.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/CompactionState.java @@ -16,6 +16,7 @@ * limitations under the License. */ package org.apache.hadoop.hbase.client; + import org.apache.yetus.audience.InterfaceAudience; /** @@ -23,5 +24,5 @@ import org.apache.yetus.audience.InterfaceAudience; */ @InterfaceAudience.Public public enum CompactionState { - NONE, MINOR, MAJOR, MAJOR_AND_MINOR; + NONE, MINOR, MAJOR, MAJOR_AND_MINOR } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index ef054b6a466..207d28b912b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -3082,7 +3082,7 @@ public class HBaseAdmin implements Admin { CoprocessorRpcUtils.getCoprocessorServiceRequest(method, request); return this.master.execMasterService(getRpcController(), csr); } - };) { + }) { // TODO: Are we retrying here? Does not seem so. We should use RetryingRpcCaller callable.prepare(false); int operationTimeout = connection.getConnectionConfiguration().getOperationTimeout(); @@ -3619,7 +3619,7 @@ public class HBaseAdmin implements Admin { return "Operation: " + getOperationType() + ", " + "Table Name: " + tableName.getNameWithNamespaceInclAsString(); - }; + } protected abstract class TableWaitForStateCallable implements WaitForStateCallable { @Override diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SnapshotType.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SnapshotType.java index 9e162b4838c..a4e4cc08be7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SnapshotType.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/SnapshotType.java @@ -16,6 +16,7 @@ * limitations under the License. */ package org.apache.hadoop.hbase.client; + import org.apache.yetus.audience.InterfaceAudience; /** @@ -23,5 +24,5 @@ import org.apache.yetus.audience.InterfaceAudience; */ @InterfaceAudience.Public public enum SnapshotType { - DISABLED, FLUSH, SKIPFLUSH; + DISABLED, FLUSH, SKIPFLUSH } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/security/SecurityCapability.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/security/SecurityCapability.java index 37a3135add3..c410e2d6054 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/security/SecurityCapability.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/security/SecurityCapability.java @@ -57,5 +57,4 @@ public enum SecurityCapability { throw new IllegalArgumentException("Unknown SecurityCapability value " + value); } } -}; - +} diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java index 8d70f444303..aad83a78f09 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java @@ -41,5 +41,5 @@ public enum SpaceViolationPolicy { /** * Disallows any updates (but allows deletes and compactions) on the table(s). */ - NO_INSERTS; + NO_INSERTS } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java index 5890805e5b1..357ef89ee11 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/ThrottlingException.java @@ -67,7 +67,7 @@ public class ThrottlingException extends QuotaExceededException { int index = msg.indexOf(MSG_TYPE[i]); if (index >= 0) { String waitTimeStr = msg.substring(index + MSG_TYPE[i].length() + MSG_WAIT.length()); - type = Type.values()[i];; + type = Type.values()[i]; waitInterval = timeFromString(waitTimeStr); break; } diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java index ea75ac8c73b..f487568edfb 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java @@ -659,7 +659,7 @@ public class TestAsyncProcess { MyAsyncProcess ap = new MyAsyncProcess(conn, CONF, true); BufferedMutatorParams bufferParam = createBufferedMutatorParams(ap, DUMMY_TABLE); - try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap);) { + try (BufferedMutatorImpl mutator = new BufferedMutatorImpl(conn, bufferParam, ap)) { mutator.mutate(puts); mutator.flush(); List reqs = ap.allReqs;