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 2018/06/12 22:02:56 UTC
commons-io git commit: Use final.
Repository: commons-io
Updated Branches:
refs/heads/master 23cc15832 -> 44c5c5618
Use final.
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/44c5c561
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/44c5c561
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/44c5c561
Branch: refs/heads/master
Commit: 44c5c5618d924a06fb9adae7856f31e75228d987
Parents: 23cc158
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Jun 12 16:02:50 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Jun 12 16:02:50 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/commons/io/FileUtils.java | 2 +-
.../org/apache/commons/io/FilenameUtils.java | 34 ++++++++++----------
.../commons/io/FileUtilsCopyToFileTestCase.java | 2 +-
.../commons/io/FilenameUtilsTestCase.java | 4 +--
.../monitor/FileAlterationMonitorTestCase.java | 4 +--
5 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/44c5c561/src/main/java/org/apache/commons/io/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
index 5d0d669..efbd3be 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -597,7 +597,7 @@ public class FileUtils {
*/
private static Collection<File> innerListFilesOrDirectories(
final File directory, final IOFileFilter fileFilter, final IOFileFilter dirFilter,
- boolean includeSubDirectories) {
+ final boolean includeSubDirectories) {
validateListFilesParameters(directory, fileFilter);
final IOFileFilter effFileFilter = setUpEffectiveFileFilter(fileFilter);
http://git-wip-us.apache.org/repos/asf/commons-io/blob/44c5c561/src/main/java/org/apache/commons/io/FilenameUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java
index 517450c..e533c1b 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -680,8 +680,8 @@ public class FilenameUtils {
}
posUnix = posUnix == NOT_FOUND ? posWin : posUnix;
posWin = posWin == NOT_FOUND ? posUnix : posWin;
- int pos = Math.min(posUnix, posWin) + 1;
- String hostnamePart = fileName.substring(2, pos - 1);
+ final int pos = Math.min(posUnix, posWin) + 1;
+ final String hostnamePart = fileName.substring(2, pos - 1);
return isValidHostName(hostnamePart) ? pos : NOT_FOUND;
} else {
return isSeparator(ch0) ? 1 : 0;
@@ -1075,10 +1075,10 @@ public class FilenameUtils {
* @param fileName a file name
* @return ADS offsets.
*/
- private static int getAdsCriticalOffset(String fileName) {
+ private static int getAdsCriticalOffset(final String fileName) {
// Step 1: Remove leading path segments.
- int offset1 = fileName.lastIndexOf(SYSTEM_SEPARATOR);
- int offset2 = fileName.lastIndexOf(OTHER_SEPARATOR);
+ final int offset1 = fileName.lastIndexOf(SYSTEM_SEPARATOR);
+ final int offset2 = fileName.lastIndexOf(OTHER_SEPARATOR);
if (offset1 == -1) {
if (offset2 == -1) {
return 0;
@@ -1508,7 +1508,7 @@ public class FilenameUtils {
* @param name the hostname to validate
* @return true if the given name is a valid host name
*/
- private static boolean isValidHostName(String name) {
+ private static boolean isValidHostName(final String name) {
return isIPv6Address(name) || isRFC3986HostName(name);
}
@@ -1523,16 +1523,16 @@ public class FilenameUtils {
* @return true if the given name is a valid IPv4 address
*/
// mostly copied from org.apache.commons.validator.routines.InetAddressValidator#isValidInet4Address
- private static boolean isIPv4Address(String name) {
- Matcher m = IPV4_PATTERN.matcher(name);
+ private static boolean isIPv4Address(final String name) {
+ final Matcher m = IPV4_PATTERN.matcher(name);
if (!m.matches() || m.groupCount() != 4) {
return false;
}
// verify that address subgroups are legal
for (int i = 1; i <= 4; i++) {
- String ipSegment = m.group(i);
- int iIpSegment = Integer.parseInt(ipSegment);
+ final String ipSegment = m.group(i);
+ final int iIpSegment = Integer.parseInt(ipSegment);
if (iIpSegment > IPV4_MAX_OCTET_VALUE) {
return false;
}
@@ -1558,8 +1558,8 @@ public class FilenameUtils {
* @param inet6Address the name to validate
* @return true if the given name is a valid IPv6 address
*/
- private static boolean isIPv6Address(String inet6Address) {
- boolean containsCompressedZeroes = inet6Address.contains("::");
+ private static boolean isIPv6Address(final String inet6Address) {
+ final boolean containsCompressedZeroes = inet6Address.contains("::");
if (containsCompressedZeroes && (inet6Address.indexOf("::") != inet6Address.lastIndexOf("::"))) {
return false;
}
@@ -1569,7 +1569,7 @@ public class FilenameUtils {
}
String[] octets = inet6Address.split(":");
if (containsCompressedZeroes) {
- List<String> octetList = new ArrayList<>(Arrays.asList(octets));
+ final List<String> octetList = new ArrayList<>(Arrays.asList(octets));
if (inet6Address.endsWith("::")) {
// String.split() drops ending empty segments
octetList.add("");
@@ -1584,7 +1584,7 @@ public class FilenameUtils {
int validOctets = 0;
int emptyOctets = 0; // consecutive empty chunks
for (int index = 0; index < octets.length; index++) {
- String octet = octets[index];
+ final String octet = octets[index];
if (octet.length() == 0) {
emptyOctets++;
if (emptyOctets > 1) {
@@ -1606,7 +1606,7 @@ public class FilenameUtils {
int octetInt = 0;
try {
octetInt = Integer.parseInt(octet, BASE_16);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
return false;
}
if (octetInt < 0 || octetInt > MAX_UNSIGNED_SHORT) {
@@ -1631,8 +1631,8 @@ public class FilenameUtils {
* @param name the hostname to validate
* @return true if the given name is a valid host name
*/
- private static boolean isRFC3986HostName(String name) {
- String[] parts = name.split("\\.", -1);
+ private static boolean isRFC3986HostName(final String name) {
+ final String[] parts = name.split("\\.", -1);
for (int i = 0; i < parts.length; i++) {
if (parts[i].length() == 0) {
// trailing dot is legal, otherwise we've hit a .. sequence
http://git-wip-us.apache.org/repos/asf/commons-io/blob/44c5c561/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTestCase.java
index 76dfc22..60c6672 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTestCase.java
@@ -84,7 +84,7 @@ public class FileUtilsCopyToFileTestCase {
private class CheckingInputStream extends ByteArrayInputStream {
private boolean closed;
- public CheckingInputStream(byte[] data) {
+ public CheckingInputStream(final byte[] data) {
super(data);
closed = false;
}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/44c5c561/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java b/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
index d87a255..3901f24 100644
--- a/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
@@ -624,7 +624,7 @@ public class FilenameUtilsTestCase {
try {
FilenameUtils.indexOfExtension("foo.exe:bar.txt");
throw new AssertionError("Expected Exception");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
assertEquals("NTFS ADS separator (':') in file name is forbidden.", e.getMessage());
}
} else {
@@ -920,7 +920,7 @@ public class FilenameUtilsTestCase {
try {
FilenameUtils.getExtension("foo.exe:bar.txt");
throw new AssertionError("Expected Exception");
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
assertEquals("NTFS ADS separator (':') in file name is forbidden.", e.getMessage());
}
} else {
http://git-wip-us.apache.org/repos/asf/commons-io/blob/44c5c561/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
index 1d1037b..13e5116 100644
--- a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
@@ -191,7 +191,7 @@ public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
private final ThreadFactory delegate = Executors.defaultThreadFactory();
@Override
- public Thread newThread(Runnable r) {
+ public Thread newThread(final Runnable r) {
final Thread thread = delegate.newThread(r);
thread.setDaemon(true); //do not leak threads if the test fails
createdThreads.add(thread);
@@ -208,7 +208,7 @@ public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
Thread.sleep(10); // wait until the watcher thread enters Thread.sleep()
monitor.stop(100);
- for (Thread thread : createdThreads) {
+ for (final Thread thread : createdThreads) {
assertFalse("The FileAlterationMonitor did not stop the threads it created.", thread.isAlive());
}
}