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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 5fcb8cc No need to allocate empty String arrays over and over.
5fcb8cc is described below
commit 5fcb8cc0a5047e14a7cb4acf8bb13fd323bdc1c5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 25 11:41:15 2019 -0500
No need to allocate empty String arrays over and over.
---
src/main/java/org/apache/commons/io/FilenameUtils.java | 6 ++++--
src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java | 2 ++
src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java | 2 +-
.../java/org/apache/commons/io/filefilter/PrefixFileFilter.java | 2 +-
.../java/org/apache/commons/io/filefilter/SuffixFileFilter.java | 2 +-
.../java/org/apache/commons/io/filefilter/WildcardFileFilter.java | 2 +-
src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java | 2 +-
7 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java
b/src/main/java/org/apache/commons/io/FilenameUtils.java
index bb94cc6..5ec726f 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -86,6 +86,8 @@ import java.util.regex.Pattern;
*/
public class FilenameUtils {
+ private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
private static final String EMPTY_STRING = "";
private static final int NOT_FOUND = -1;
@@ -1494,7 +1496,7 @@ public class FilenameUtils {
list.add(buffer.toString());
}
- return list.toArray(new String[0]);
+ return list.toArray(EMPTY_STRING_ARRAY);
}
/**
@@ -1577,7 +1579,7 @@ public class FilenameUtils {
} else if (inet6Address.startsWith("::") && !octetList.isEmpty()) {
octetList.remove(0);
}
- octets = octetList.toArray(new String[0]);
+ octets = octetList.toArray(EMPTY_STRING_ARRAY);
}
if (octets.length > IPV6_MAX_HEX_GROUPS) {
return false;
diff --git a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
index 40c9592..70fdb30 100644
--- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
@@ -29,6 +29,8 @@ import java.io.FilenameFilter;
*/
public interface IOFileFilter extends FileFilter, FilenameFilter {
+ String[] EMPTY_STRING_ARRAY = new String[0];
+
/**
* Checks to see if the File should be accepted by this filter.
* <p>
diff --git a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
index 8f5de20..4661438 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
@@ -126,7 +126,7 @@ public class NameFileFilter extends AbstractFileFilter
implements Serializable {
if (names == null) {
throw new IllegalArgumentException("The list of names must not be
null");
}
- this.names = names.toArray(new String[0]);
+ this.names = names.toArray(EMPTY_STRING_ARRAY);
this.caseSensitivity = caseSensitivity == null ? IOCase.SENSITIVE :
caseSensitivity;
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
index c1327a2..1a715f4 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -134,7 +134,7 @@ public class PrefixFileFilter extends AbstractFileFilter
implements Serializable
if (prefixes == null) {
throw new IllegalArgumentException("The list of prefixes must not
be null");
}
- this.prefixes = prefixes.toArray(new String[0]);
+ this.prefixes = prefixes.toArray(EMPTY_STRING_ARRAY);
this.caseSensitivity = caseSensitivity == null ? IOCase.SENSITIVE :
caseSensitivity;
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
index 0f548b6..ff3c153 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -135,7 +135,7 @@ public class SuffixFileFilter extends AbstractFileFilter
implements Serializable
if (suffixes == null) {
throw new IllegalArgumentException("The list of suffixes must not
be null");
}
- this.suffixes = suffixes.toArray(new String[0]);
+ this.suffixes = suffixes.toArray(EMPTY_STRING_ARRAY);
this.caseSensitivity = caseSensitivity == null ? IOCase.SENSITIVE :
caseSensitivity;
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
index b8486a3..d5b6cee 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
@@ -134,7 +134,7 @@ public class WildcardFileFilter extends AbstractFileFilter
implements Serializab
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard list must not be
null");
}
- this.wildcards = wildcards.toArray(new String[0]);
+ this.wildcards = wildcards.toArray(EMPTY_STRING_ARRAY);
this.caseSensitivity = caseSensitivity == null ? IOCase.SENSITIVE :
caseSensitivity;
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
b/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
index 1603652..3be0d3e 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
@@ -93,7 +93,7 @@ public class WildcardFilter extends AbstractFileFilter
implements Serializable {
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard list must not be
null");
}
- this.wildcards = wildcards.toArray(new String[0]);
+ this.wildcards = wildcards.toArray(EMPTY_STRING_ARRAY);
}
//-----------------------------------------------------------------------
