You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/10/06 15:19:35 UTC
svn commit: r1811343 - in /commons/proper/codec/trunk/src:
main/java/org/apache/commons/codec/binary/
main/java/org/apache/commons/codec/cli/
main/java/org/apache/commons/codec/digest/
main/java/org/apache/commons/codec/language/ test/java/org/apache/c...
Author: ggregory
Date: Fri Oct 6 15:19:35 2017
New Revision: 1811343
URL: http://svn.apache.org/viewvc?rev=1811343&view=rev
Log:
Add final modifier to method parameters
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base32Test.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base64Test.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/SoundexTest.java
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java Fri Oct 6 15:19:35 2017
@@ -483,7 +483,7 @@ public abstract class BaseNCodec impleme
* <code>false</code>, otherwise
*/
public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) {
- for (byte octet : arrayOctet) {
+ for (final byte octet : arrayOctet) {
if (!isInAlphabet(octet) &&
(!allowWSPad || (octet != pad) && !isWhiteSpace(octet))) {
return false;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java Fri Oct 6 15:19:35 2017
@@ -102,7 +102,7 @@ public class Digest {
}
private void run(String[] digestAlgorithms) throws IOException {
- for (String messageDigestAlgorithm : digestAlgorithms) {
+ for (final String messageDigestAlgorithm : digestAlgorithms) {
if (DigestUtils.isAvailable(messageDigestAlgorithm)) {
run(messageDigestAlgorithm + " ", messageDigestAlgorithm);
}
@@ -114,7 +114,7 @@ public class Digest {
println(prefix, DigestUtils.digest(messageDigest, System.in));
return;
}
- for(String source : inputs) {
+ for(final String source : inputs) {
final File file = new File(source);
if (file.isFile()) {
println(prefix, DigestUtils.digest(messageDigest, file), source);
@@ -132,7 +132,7 @@ public class Digest {
}
private void run(String prefix, MessageDigest messageDigest, File[] files) throws IOException {
- for (File file : files) {
+ for (final File file : files) {
if (file.isFile()) {
println(prefix, DigestUtils.digest(messageDigest, file), file.getName());
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java Fri Oct 6 15:19:35 2017
@@ -69,7 +69,7 @@ public final class HmacUtils {
try {
Mac.getInstance(name);
return true;
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
return false;
}
}
@@ -85,7 +85,7 @@ public final class HmacUtils {
try {
Mac.getInstance(name.getName());
return true;
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
return false;
}
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java Fri Oct 6 15:19:35 2017
@@ -47,7 +47,7 @@ public class PureJavaCrc32C implements C
@Override
public long getValue() {
- long ret = crc;
+ final long ret = crc;
return (~ret) & 0xffffffffL;
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java Fri Oct 6 15:19:35 2017
@@ -160,7 +160,7 @@ public class Soundex implements StringEn
}
private boolean hasMarker(char[] mapping) {
- for(char ch : mapping) {
+ for(final char ch : mapping) {
if (ch == SILENT_MARKER) {
return true;
}
@@ -318,11 +318,11 @@ public class Soundex implements StringEn
out[count++] = first;
char lastDigit = map(first); // previous digit
for(int i = 1; i < str.length() && count < out.length ; i++) {
- char ch = str.charAt(i);
+ final char ch = str.charAt(i);
if ((this.specialCaseHW) && (ch == 'H' || ch == 'W')) { // these are ignored completely
continue;
}
- char digit = map(ch);
+ final char digit = map(ch);
if (digit == SILENT_MARKER) {
continue;
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base32Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base32Test.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base32Test.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base32Test.java Fri Oct 6 15:19:35 2017
@@ -52,7 +52,7 @@ public class Base32Test {
// BASE32_BINARY_TEST_CASES[2][0] = new Hex().decode("739ce739ce");
static {
- Hex hex = new Hex();
+ final Hex hex = new Hex();
try {
BASE32_BINARY_TEST_CASES = new Object[][] {
new Object[] { hex.decode("623a01735836e9a126e12fbf95e013ee6892997c"),
@@ -62,7 +62,7 @@ public class Base32Test {
new Object[] { hex.decode("739ce42108"),
"OOOOIIII" }
};
- } catch (DecoderException de) {
+ } catch (final DecoderException de) {
throw new Error(":(", de);
}
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base64Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base64Test.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base64Test.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/binary/Base64Test.java Fri Oct 6 15:19:35 2017
@@ -130,7 +130,7 @@ public class Base64Test {
final byte[] bytesUtf8 = StringUtils.getBytesUtf8(content);
byte[] buffer = ArrayUtils.addAll(bytesUtf8, new byte[endPadSize]);
buffer = ArrayUtils.addAll(new byte[startPasSize], buffer);
- byte[] encodedBytes = new Base64().encode(buffer, startPasSize, bytesUtf8.length);
+ final byte[] encodedBytes = new Base64().encode(buffer, startPasSize, bytesUtf8.length);
encodedContent = StringUtils.newStringUtf8(encodedBytes);
assertEquals("encoding hello world", "SGVsbG8gV29ybGQ=", encodedContent);
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java Fri Oct 6 15:19:35 2017
@@ -64,7 +64,7 @@ public class DigestUtilsTest {
public void setUp() throws Exception {
new Random().nextBytes(testData);
testFile = File.createTempFile(DigestUtilsTest.class.getName(), ".dat");
- FileOutputStream fos = new FileOutputStream(testFile);
+ final FileOutputStream fos = new FileOutputStream(testFile);
fos.write(testData);
fos.close();
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmsTest.java Fri Oct 6 15:19:35 2017
@@ -49,7 +49,7 @@ public class MessageDigestAlgorithmsTest
}
private static boolean contains(String key) {
- for(String s : MessageDigestAlgorithms.values()) {
+ for(final String s : MessageDigestAlgorithms.values()) {
if (s.equals(key)) {
return true;
}
@@ -59,10 +59,10 @@ public class MessageDigestAlgorithmsTest
@BeforeClass
public static void checkValues() throws Exception {
- Field [] fields = MessageDigestAlgorithms.class.getDeclaredFields();
+ final Field [] fields = MessageDigestAlgorithms.class.getDeclaredFields();
boolean ok = true;
int psf = 0;
- for(Field f : fields) {
+ for(final Field f : fields) {
// Only interested in public fields
final int modifiers = f.getModifiers();
if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)) {
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32CTest.java Fri Oct 6 15:19:35 2017
@@ -66,7 +66,7 @@ public class PureJavaCrc32CTest {
private void check(int expected) {
crc.reset();
crc.update(data, 0, data.length);
- int actual = (int) crc.getValue();
+ final int actual = (int) crc.getValue();
Assert.assertEquals(Integer.toHexString(expected), Integer.toHexString(actual));
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java Fri Oct 6 15:19:35 2017
@@ -57,7 +57,7 @@ public class PureJavaCrc32Test {
final Random random1 = new Random();
final Random random2 = new Random();
for (int i = 0; i < 10000; i++) {
- byte randomBytes[] = new byte[random1.nextInt(2048)];
+ final byte randomBytes[] = new byte[random1.nextInt(2048)];
random2.nextBytes(randomBytes);
checkOnBytes(randomBytes, false);
}
@@ -175,7 +175,7 @@ public class PureJavaCrc32Test {
}
b.append(" private static final int[] T = new int[] {");
- for(String s : toStrings(tableFormat)) {
+ for(final String s : toStrings(tableFormat)) {
b.append("\n");
b.append(s);
}
@@ -191,9 +191,9 @@ public class PureJavaCrc32Test {
" <polynomial>");
System.exit(1);
}
- long polynomial = Long.parseLong(args[0], 16);
+ final long polynomial = Long.parseLong(args[0], 16);
- int i = 8;
+ final int i = 8;
final Table t = new Table(i, 16, polynomial);
final String s = t.toString();
System.out.println(s);
@@ -250,7 +250,7 @@ public class PureJavaCrc32Test {
out.printf("\nPerformance Table (The unit is MB/sec; #T = #Theads)\n");
// Warm up implementations to get jit going.
- for (Class<? extends Checksum> c : crcs) {
+ for (final Class<? extends Checksum> c : crcs) {
doBench(c, 1, bytes, 2);
doBench(c, 1, bytes, 2101);
}
@@ -287,7 +287,7 @@ public class PureJavaCrc32Test {
BenchResult expected = null;
final List<BenchResult> previous = new ArrayList<BenchResult>();
- for(Class<? extends Checksum> c : crcs) {
+ for(final Class<? extends Checksum> c : crcs) {
System.gc();
final BenchResult result = doBench(c, numThreads, bytes, size);
@@ -305,7 +305,7 @@ public class PureJavaCrc32Test {
}
//compare result with previous
- for(BenchResult p : previous) {
+ for(final BenchResult p : previous) {
final double diff = (result.mbps - p.mbps) / p.mbps * 100;
printCell(String.format("%5.1f%%", diff), diffStr.length(), out);
}
@@ -340,7 +340,7 @@ public class PureJavaCrc32Test {
crc.update(bytes, 0, size);
}
final long et = System.nanoTime();
- double secsElapsed = (et - st) / 1000000000.0d;
+ final double secsElapsed = (et - st) / 1000000000.0d;
results[index] = new BenchResult(crc.getValue(), mbProcessed/secsElapsed);
}
};
@@ -392,7 +392,7 @@ public class PureJavaCrc32Test {
"os.version"
};
final Properties p = System.getProperties();
- for(String n : names) {
+ for(final String n : names) {
out.println(n + " = " + p.getProperty(n));
}
}
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java Fri Oct 6 15:19:35 2017
@@ -68,10 +68,10 @@ public class XXHash32Test {
@Test
public void verifyChecksum() throws IOException {
- XXHash32 h = new XXHash32();
- FileInputStream s = new FileInputStream(file);
+ final XXHash32 h = new XXHash32();
+ final FileInputStream s = new FileInputStream(file);
try {
- byte[] b = toByteArray(s);
+ final byte[] b = toByteArray(s);
h.update(b, 0, b.length);
} finally {
s.close();
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/SoundexTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/SoundexTest.java?rev=1811343&r1=1811342&r2=1811343&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/SoundexTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/SoundexTest.java Fri Oct 6 15:19:35 2017
@@ -407,7 +407,7 @@ public class SoundexTest extends StringE
@Test
// examples and algorithm rules from: http://www.genealogy.com/articles/research/00000060.html
public void testGenealogy() { // treat vowels and HW as silent
- Soundex s = Soundex.US_ENGLISH_GENEALOGY;
+ final Soundex s = Soundex.US_ENGLISH_GENEALOGY;
Assert.assertEquals("H251", s.encode("Heggenburger"));
Assert.assertEquals("B425", s.encode("Blackman"));
Assert.assertEquals("S530", s.encode("Schmidt"));
@@ -421,7 +421,7 @@ public class SoundexTest extends StringE
@Test
// examples and algorithm rules from: http://west-penwith.org.uk/misc/soundex.htm
public void testSimplifiedSoundex() { // treat vowels and HW as separators
- Soundex s = Soundex.US_ENGLISH_SIMPLIFIED;
+ final Soundex s = Soundex.US_ENGLISH_SIMPLIFIED;
Assert.assertEquals("W452", s.encode("WILLIAMS"));
Assert.assertEquals("B625", s.encode("BARAGWANATH"));
Assert.assertEquals("D540", s.encode("DONNELL"));