This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git
The following commit(s) were added to refs/heads/master by this push:
new 4ddf436 Use blocks for if statements.
4ddf436 is described below
commit 4ddf436b19e0c44221c849d3a5f94feab6ca0a85
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Jul 12 15:55:35 2019 -0400
Use blocks for if statements.
---
src/main/java/org/apache/commons/codec/digest/MurmurHash3.java | 10 ++++++----
.../java/org/apache/commons/codec/digest/DigestUtilsTest.java | 10 +++++-----
.../java/org/apache/commons/codec/digest/MurmurHash2Test.java | 10 ++++++----
.../java/org/apache/commons/codec/digest/MurmurHash3Test.java | 6 +++---
src/test/java/org/apache/commons/codec/net/BCodecTest.java | 2 +-
5 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index 8af4620..1a1c312 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -545,8 +545,9 @@ public final class MurmurHash3 {
}
public final void add(byte[] data, int offset, int length) {
- if (length == 0)
- return;
+ if (length == 0) {
+ return;
+ }
totalLen += length;
if (tailLen + length < 4) {
System.arraycopy(data, offset, tail, tailLen,
length);
@@ -595,8 +596,9 @@ public final class MurmurHash3 {
int consumed = (nblocks << 2);
tailLen = length2 - consumed;
- if (consumed == length2)
- return;
+ if (consumed == length2) {
+ return;
+ }
System.arraycopy(data, offset + consumed, tail, 0,
tailLen);
}
diff --git a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
index 296e1f0..6416220 100644
--- a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
@@ -314,7 +314,7 @@ public class DigestUtilsTest {
DigestUtils.sha512Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+
"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
}
-
+
@Test
public void testSha3_224() {
assumeJava9();
@@ -325,7 +325,7 @@ public class DigestUtilsTest {
"6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7",
DigestUtils.sha3_224Hex(""));
}
-
+
@Test
public void testSha3_256() {
assumeJava9();
@@ -336,7 +336,7 @@ public class DigestUtilsTest {
"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a",
DigestUtils.sha3_256Hex(""));
}
-
+
@Test
public void testSha3_384() {
assumeJava9();
@@ -347,7 +347,7 @@ public class DigestUtilsTest {
"0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004",
DigestUtils.sha3_384Hex(""));
}
-
+
@Test
public void testSha3_512() {
assumeJava9();
@@ -358,7 +358,7 @@ public class DigestUtilsTest {
"a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26",
DigestUtils.sha3_512Hex(""));
}
-
+
@Test
public void testSha256HexInputStream() throws IOException {
assertEquals(DigestUtils.sha256Hex(testData),
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
index 1c4b002..1682870 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java
@@ -84,9 +84,10 @@ public class MurmurHash2Test {
public void testHash32ByteArrayIntInt() {
for (int i = 0; i < input.length; i++) {
int hash = MurmurHash2.hash32(input[i],
input[i].length, 0x71b4954d);
- if (hash != results32_seed[i])
- fail(String.format("Unexpected hash32 result
for example %d: 0x%08x instead of 0x%08x", i, hash,
+ if (hash != results32_seed[i]) {
+ fail(String.format("Unexpected hash32 result for example %d:
0x%08x instead of 0x%08x", i, hash,
results32_seed[i]));
+ }
}
}
@@ -94,9 +95,10 @@ public class MurmurHash2Test {
public void testHash32ByteArrayInt() {
for (int i = 0; i < input.length; i++) {
int hash = MurmurHash2.hash32(input[i],
input[i].length);
- if (hash != results32_standard[i])
- fail(String.format("Unexpected hash32 result
for example %d: 0x%08x instead of 0x%08x", i, hash,
+ if (hash != results32_standard[i]) {
+ fail(String.format("Unexpected hash32 result for example %d:
0x%08x instead of 0x%08x", i, hash,
results32_standard[i]));
+ }
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
index 8d5c813..674f077 100644
--- a/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java
@@ -34,14 +34,14 @@ public class MurmurHash3Test {
public void test32_String() {
// Arrange
String origin = TEST;
-
+
// Act
int result = MurmurHash3.hash32(origin);
// Assert
assertEquals(-436507231, result);
}
-
+
@Test
public void testHashCodeM3_64() {
byte[] origin =TEST.getBytes();
@@ -145,7 +145,7 @@ public class MurmurHash3Test {
public void test128_String() {
// Arrange
String origin = TEST;
-
+
// Act
long[] result = MurmurHash3.hash128(origin);
diff --git a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
index f9b730c..c44b20a 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -153,7 +153,7 @@ public class BCodecTest {
// Exception expected, test segment passes.
}
}
-
+
@Test
public void testBase64ImpossibleSamples() {
BCodec codec = new BCodec();
