From e598905de57759707a1736bfc65f704fd68dff8f Mon Sep 17 00:00:00 2001 From: David Georg Reichelt Date: Wed, 10 Oct 2018 12:09:03 +0200 Subject: [PATCH] Performance Enhancement: Call toArray with Zero Array Size --- src/main/java/org/apache/commons/io/FileUtils.java | 2 +- src/main/java/org/apache/commons/io/FilenameUtils.java | 4 ++-- .../apache/commons/io/comparator/CompositeFileComparator.java | 2 +- .../org/apache/commons/io/filefilter/FileFilterUtils.java | 4 ++-- .../java/org/apache/commons/io/filefilter/NameFileFilter.java | 2 +- .../org/apache/commons/io/filefilter/PrefixFileFilter.java | 2 +- .../org/apache/commons/io/filefilter/SuffixFileFilter.java | 2 +- .../org/apache/commons/io/filefilter/WildcardFileFilter.java | 2 +- .../java/org/apache/commons/io/filefilter/WildcardFilter.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java index efbd3bec126..642028e627c 100644 --- a/src/main/java/org/apache/commons/io/FileUtils.java +++ b/src/main/java/org/apache/commons/io/FileUtils.java @@ -454,7 +454,7 @@ public static void touch(final File file) throws IOException { * @return an array of java.io.File */ public static File[] convertFileCollectionToFileArray(final Collection files) { - return files.toArray(new File[files.size()]); + return files.toArray(new File[0]); } //----------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java index 5bb415b49b8..afa4b0ded10 100644 --- a/src/main/java/org/apache/commons/io/FilenameUtils.java +++ b/src/main/java/org/apache/commons/io/FilenameUtils.java @@ -1493,7 +1493,7 @@ static String[] splitOnTokens(final String text) { list.add(buffer.toString()); } - return list.toArray( new String[ list.size() ] ); + return list.toArray( new String[ 0 ] ); } /** @@ -1576,7 +1576,7 @@ private static boolean isIPv6Address(final String inet6Address) { } else if (inet6Address.startsWith("::") && !octetList.isEmpty()) { octetList.remove(0); } - octets = octetList.toArray(new String[octetList.size()]); + octets = octetList.toArray(new String[0]); } if (octets.length > IPV6_MAX_HEX_GROUPS) { return false; diff --git a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java index 7bfaa269918..18d385048b1 100644 --- a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java @@ -76,7 +76,7 @@ public CompositeFileComparator(final Iterable> delegates) { for (final Comparator comparator : delegates) { list.add(comparator); } - this.delegates = (Comparator[]) list.toArray(new Comparator[list.size()]); //2 + this.delegates = (Comparator[]) list.toArray(new Comparator[0]); //2 } } diff --git a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java index f9a08186267..ee33693aa98 100644 --- a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java +++ b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java @@ -89,7 +89,7 @@ public static File[] filter(final IOFileFilter filter, final File... files) { acceptedFiles.add(file); } } - return acceptedFiles.toArray(new File[acceptedFiles.size()]); + return acceptedFiles.toArray(new File[0]); } /** @@ -120,7 +120,7 @@ public static File[] filter(final IOFileFilter filter, final File... files) { */ public static File[] filter(final IOFileFilter filter, final Iterable files) { final List acceptedFiles = filterList(filter, files); - return acceptedFiles.toArray(new File[acceptedFiles.size()]); + return acceptedFiles.toArray(new File[0]); } /** 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 bd409c19026..65a29c5a9b1 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 NameFileFilter(final List names, final IOCase caseSensitivity) { if (names == null) { throw new IllegalArgumentException("The list of names must not be null"); } - this.names = names.toArray(new String[names.size()]); + this.names = names.toArray(new String[0]); 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 b1ec2e5b112..94189a112f4 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 PrefixFileFilter(final List prefixes, final IOCase caseSensitivit if (prefixes == null) { throw new IllegalArgumentException("The list of prefixes must not be null"); } - this.prefixes = prefixes.toArray(new String[prefixes.size()]); + this.prefixes = prefixes.toArray(new String[0]); 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 5c7a2a38c98..573e679f49d 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 SuffixFileFilter(final List suffixes, final IOCase caseSensitivit if (suffixes == null) { throw new IllegalArgumentException("The list of suffixes must not be null"); } - this.suffixes = suffixes.toArray(new String[suffixes.size()]); + this.suffixes = suffixes.toArray(new String[0]); 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 e6f695c02a2..39745e61dcb 100644 --- a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java @@ -131,7 +131,7 @@ public WildcardFileFilter(final List wildcards, final IOCase caseSensiti if (wildcards == null) { throw new IllegalArgumentException("The wildcard list must not be null"); } - this.wildcards = wildcards.toArray(new String[wildcards.size()]); + this.wildcards = wildcards.toArray(new String[0]); 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 dbcdda0f006..4cd7eb88633 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 WildcardFilter(final List wildcards) { if (wildcards == null) { throw new IllegalArgumentException("The wildcard list must not be null"); } - this.wildcards = wildcards.toArray(new String[wildcards.size()]); + this.wildcards = wildcards.toArray(new String[0]); } //-----------------------------------------------------------------------