Repository: hbase Updated Branches: refs/heads/master f46a6d163 -> 0f8ea39a5
HBASE-19539 Removed unnecessary semicolons in hbase-common Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f8ea39a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f8ea39a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f8ea39a Branch: refs/heads/master Commit: 0f8ea39a5b88b830ca6280e3262e7aa5fcb6280a Parents: f46a6d1 Author: Jan Hentschel <jan.hentsc...@ultratendency.com> Authored: Sun Dec 17 16:28:06 2017 +0100 Committer: Jan Hentschel <jan.hentsc...@ultratendency.com> Committed: Tue Dec 19 20:22:05 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/HConstants.java | 2 +- .../main/java/org/apache/hadoop/hbase/ProcedureState.java | 2 +- .../main/java/org/apache/hadoop/hbase/codec/Codec.java | 2 +- .../org/apache/hadoop/hbase/io/TagCompressionContext.java | 2 +- .../hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java | 2 -- .../test/java/org/apache/hadoop/hbase/ClassFinder.java | 10 +++++----- .../java/org/apache/hadoop/hbase/ClassTestFinder.java | 6 +++--- .../test/java/org/apache/hadoop/hbase/TestCellUtil.java | 4 ++-- .../java/org/apache/hadoop/hbase/TestClassFinder.java | 2 +- .../hadoop/hbase/io/crypto/KeyProviderForTesting.java | 3 +-- 10 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java ---------------------------------------------------------------------- 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 0adce07..bc6f975 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 */ http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java ---------------------------------------------------------------------- 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 fba5181..18bdf73 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 } http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/main/java/org/apache/hadoop/hbase/codec/Codec.java ---------------------------------------------------------------------- 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 01359ea..2d6ac82 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); http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/TagCompressionContext.java ---------------------------------------------------------------------- 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 d646250..595434c 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; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/aes/CommonsCryptoAESDecryptor.java ---------------------------------------------------------------------- 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 bb2290f..9b58a69 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() { - ; } - } http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassFinder.java ---------------------------------------------------------------------- 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 db203b8..cc0e969 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()))); } - }; -}; + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java ---------------------------------------------------------------------- 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 9d5618b..85824e9 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; } - }; -}; + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java ---------------------------------------------------------------------- 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 4ab6bce..aad0929 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. @@ -203,7 +203,7 @@ public class TestCellUtil { public DataType getType() { return PrivateCellUtil.toDataType(getTypeByte()); } - }; + } /** * Was overflowing if 100k or so lists of cellscanners to return. http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java ---------------------------------------------------------------------- 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 3a6d935..d37d731 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(); } -}; +} http://git-wip-us.apache.org/repos/asf/hbase/blob/0f8ea39a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/KeyProviderForTesting.java ---------------------------------------------------------------------- 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 9b45d09..7f0a060 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; } - }