Skip to content

Commit 4ddf436

Browse files
author
Gary Gregory
committed
Use blocks for if statements.
1 parent e0a85c7 commit 4ddf436

5 files changed

Lines changed: 21 additions & 17 deletions

File tree

src/main/java/org/apache/commons/codec/digest/MurmurHash3.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,9 @@ public final void start(int hash) {
545545
}
546546

547547
public final void add(byte[] data, int offset, int length) {
548-
if (length == 0)
549-
return;
548+
if (length == 0) {
549+
return;
550+
}
550551
totalLen += length;
551552
if (tailLen + length < 4) {
552553
System.arraycopy(data, offset, tail, tailLen, length);
@@ -595,8 +596,9 @@ public final void add(byte[] data, int offset, int length) {
595596

596597
int consumed = (nblocks << 2);
597598
tailLen = length2 - consumed;
598-
if (consumed == length2)
599-
return;
599+
if (consumed == length2) {
600+
return;
601+
}
600602
System.arraycopy(data, offset + consumed, tail, 0, tailLen);
601603
}
602604

src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public void testSha512() {
314314
DigestUtils.sha512Hex("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" +
315315
"hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"));
316316
}
317-
317+
318318
@Test
319319
public void testSha3_224() {
320320
assumeJava9();
@@ -325,7 +325,7 @@ public void testSha3_224() {
325325
"6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7",
326326
DigestUtils.sha3_224Hex(""));
327327
}
328-
328+
329329
@Test
330330
public void testSha3_256() {
331331
assumeJava9();
@@ -336,7 +336,7 @@ public void testSha3_256() {
336336
"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a",
337337
DigestUtils.sha3_256Hex(""));
338338
}
339-
339+
340340
@Test
341341
public void testSha3_384() {
342342
assumeJava9();
@@ -347,7 +347,7 @@ public void testSha3_384() {
347347
"0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004",
348348
DigestUtils.sha3_384Hex(""));
349349
}
350-
350+
351351
@Test
352352
public void testSha3_512() {
353353
assumeJava9();
@@ -358,7 +358,7 @@ public void testSha3_512() {
358358
"a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26",
359359
DigestUtils.sha3_512Hex(""));
360360
}
361-
361+
362362
@Test
363363
public void testSha256HexInputStream() throws IOException {
364364
assertEquals(DigestUtils.sha256Hex(testData),

src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,21 @@ public class MurmurHash2Test {
8484
public void testHash32ByteArrayIntInt() {
8585
for (int i = 0; i < input.length; i++) {
8686
int hash = MurmurHash2.hash32(input[i], input[i].length, 0x71b4954d);
87-
if (hash != results32_seed[i])
88-
fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
87+
if (hash != results32_seed[i]) {
88+
fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
8989
results32_seed[i]));
90+
}
9091
}
9192
}
9293

9394
@Test
9495
public void testHash32ByteArrayInt() {
9596
for (int i = 0; i < input.length; i++) {
9697
int hash = MurmurHash2.hash32(input[i], input[i].length);
97-
if (hash != results32_standard[i])
98-
fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
98+
if (hash != results32_standard[i]) {
99+
fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
99100
results32_standard[i]));
101+
}
100102
}
101103
}
102104

src/test/java/org/apache/commons/codec/digest/MurmurHash3Test.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public class MurmurHash3Test {
3434
public void test32_String() {
3535
// Arrange
3636
String origin = TEST;
37-
37+
3838
// Act
3939
int result = MurmurHash3.hash32(origin);
4040

4141
// Assert
4242
assertEquals(-436507231, result);
4343
}
44-
44+
4545
@Test
4646
public void testHashCodeM3_64() {
4747
byte[] origin =TEST.getBytes();
@@ -145,7 +145,7 @@ public void test128_Double() {
145145
public void test128_String() {
146146
// Arrange
147147
String origin = TEST;
148-
148+
149149
// Act
150150
long[] result = MurmurHash3.hash128(origin);
151151

src/test/java/org/apache/commons/codec/net/BCodecTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void testDecodeObjects() throws Exception {
153153
// Exception expected, test segment passes.
154154
}
155155
}
156-
156+
157157
@Test
158158
public void testBase64ImpossibleSamples() {
159159
BCodec codec = new BCodec();

0 commit comments

Comments
 (0)