From 0f13e6f12dbf73c02a58a06189434526a0dac8b1 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Sun, 17 Dec 2017 16:28:06 +0100 Subject: [PATCH] HBASE-19539 Removed unnecessary semicolons in hbase-common --- .../src/main/java/org/apache/hadoop/hbase/HConstants.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ProcedureState.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/codec/Codec.java | 2 +- .../java/org/apache/hadoop/hbase/io/TagCompressionContext.java | 2 +- .../hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java | 2 -- .../src/test/java/org/apache/hadoop/hbase/ClassFinder.java | 10 +++++----- .../src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java | 6 +++--- .../src/test/java/org/apache/hadoop/hbase/TestCellUtil.java | 4 ++-- .../src/test/java/org/apache/hadoop/hbase/TestClassFinder.java | 2 +- .../apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java | 3 +-- 10 files changed, 16 insertions(+), 19 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 0adce072b6..bc6f975a5e 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -90,7 +90,7 @@ public final class HConstants { SUCCESS, BAD_FAMILY, SANITY_CHECK_FAILURE, - FAILURE; + FAILURE } /** long constant for zero */ diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java index fba5181571..18bdf73343 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java @@ -24,5 +24,5 @@ import org.apache.yetus.audience.InterfaceAudience; */ @InterfaceAudience.Public public enum ProcedureState { - INITIALIZING, RUNNABLE, WAITING, WAITING_TIMEOUT, ROLLEDBACK, SUCCESS, FAILED; + INITIALIZING, RUNNABLE, WAITING, WAITING_TIMEOUT, ROLLEDBACK, SUCCESS, FAILED } diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java index 01359eab2d..2d6ac825c3 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java @@ -48,7 +48,7 @@ public interface Codec { * Decoder/CellScanner runs off the end of the cell block. Do this rather than require the user * call close explicitly. */ - interface Decoder extends CellScanner {}; + interface Decoder extends CellScanner {} Decoder getDecoder(InputStream is); Decoder getDecoder(ByteBuff buf); diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java index d646250c6a..595434cbde 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java @@ -94,7 +94,7 @@ public class TagCompressionContext { while (pos < endOffset) { int tagLen = ByteBufferUtils.readAsInt(in, pos, Tag.TAG_LENGTH_SIZE); pos += Tag.TAG_LENGTH_SIZE; - Dictionary.write(out, in, pos, tagLen, tagDict);; + Dictionary.write(out, in, pos, tagLen, tagDict); pos += tagLen; } } diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java index bb2290f657..9b58a69316 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java @@ -79,7 +79,5 @@ public class CommonsCryptoAESDecryptor implements Decryptor { @Override public void reset() { - ; } - } diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassFinder.java index db203b80b7..cc0e9691d7 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassFinder.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassFinder.java @@ -52,15 +52,15 @@ public class ClassFinder { public interface ResourcePathFilter { boolean isCandidatePath(String resourcePath, boolean isJar); - }; + } public interface FileNameFilter { boolean isCandidateFile(String fileName, String absFilePath); - }; + } public interface ClassFilter { boolean isCandidateClass(Class c); - }; + } public static class Not implements ResourcePathFilter, FileNameFilter, ClassFilter { private ResourcePathFilter resourcePathFilter; @@ -301,5 +301,5 @@ public class ClassFinder { && (null == nameFilter || nameFilter.isCandidateFile(file.getName(), file.getAbsolutePath()))); } - }; -}; + } +} diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java index 9d5618b287..85824e92f9 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java @@ -64,7 +64,7 @@ public class ClassTestFinder extends ClassFinder { public boolean isCandidatePath(String resourcePath, boolean isJar) { return !hadoopCompactRe.matcher(resourcePath).find(); } - }; + } /* * A class is considered as a test class if: @@ -116,5 +116,5 @@ public class ClassTestFinder extends ClassFinder { } return false; } - }; -}; + } +} diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java index 0395c0906e..581e99a6f2 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java @@ -54,7 +54,7 @@ public class TestCellUtil { public CellScanner cellScanner() { return new TestCellScanner(this.cellsCount); } - }; + } /** * CellScanner used in test. @@ -198,7 +198,7 @@ public class TestCellUtil { // TODO Auto-generated method stub return 0; } - }; + } /** * Was overflowing if 100k or so lists of cellscanners to return. diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java index 3a6d9350fc..d37d731161 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java @@ -419,4 +419,4 @@ public class TestClassFinder { method.invoke(urlClassLoader, new Object[] { jarFile.toURI().toURL() }); return jarFile.getAbsolutePath(); } -}; +} diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java index 9b45d0996a..7f0a060e97 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java @@ -36,9 +36,8 @@ public class KeyProviderForTesting implements KeyProvider { public Key[] getKeys(String[] aliases) { Key[] result = new Key[aliases.length]; for (int i = 0; i < aliases.length; i++) { - result[i] = new SecretKeySpec(Encryption.hash128(aliases[i]), "AES");; + result[i] = new SecretKeySpec(Encryption.hash128(aliases[i]), "AES"); } return result; } - } -- 2.14.3 (Apple Git-98)