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 8381e95 Simplify copying arrays.
8381e95 is described below
commit 8381e957f53777530555da51c059adcb7af5625a
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue Sep 21 13:40:19 2021 -0400
Simplify copying arrays.
---
src/main/java/org/apache/commons/io/ByteOrderMark.java | 3 +--
.../commons/io/comparator/CompositeFileComparator.java | 3 +--
.../apache/commons/io/filefilter/MagicNumberFileFilter.java | 12 ++++++------
.../org/apache/commons/io/filefilter/NameFileFilter.java | 3 +--
.../org/apache/commons/io/filefilter/PrefixFileFilter.java | 3 +--
.../org/apache/commons/io/filefilter/SuffixFileFilter.java | 3 +--
.../org/apache/commons/io/filefilter/WildcardFileFilter.java | 3 +--
.../org/apache/commons/io/filefilter/WildcardFilter.java | 3 +--
src/test/java/org/apache/commons/io/HexDumpTest.java | 3 +--
9 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/ByteOrderMark.java
b/src/main/java/org/apache/commons/io/ByteOrderMark.java
index 62b4c97..d2fbbfd 100644
--- a/src/main/java/org/apache/commons/io/ByteOrderMark.java
+++ b/src/main/java/org/apache/commons/io/ByteOrderMark.java
@@ -84,8 +84,7 @@ public class ByteOrderMark implements Serializable {
throw new IllegalArgumentException("No bytes specified");
}
this.charsetName = charsetName;
- this.bytes = new int[bytes.length];
- System.arraycopy(bytes, 0, this.bytes, 0, bytes.length);
+ this.bytes = bytes.clone();
}
/**
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 a32d7a7..0c79831 100644
---
a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java
+++
b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java
@@ -58,8 +58,7 @@ public class CompositeFileComparator extends
AbstractFileComparator implements S
if (delegates == null) {
this.delegates = (Comparator<File>[]) EMPTY_COMPARATOR_ARRAY;//1
} else {
- this.delegates = (Comparator<File>[]) new
Comparator<?>[delegates.length];//2
- System.arraycopy(delegates, 0, this.delegates, 0,
delegates.length);
+ this.delegates = delegates.clone();//2
}
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
index 42acfdb..d096598 100644
--- a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
@@ -156,26 +156,26 @@ public class MagicNumberFileFilter extends
AbstractFileFilter implements
* MagicNumberFileFilter(new byte[] {0xCA, 0xFE, 0xBA, 0xBE}, 0);
* </pre>
*
- * @param magicNumber the magic number to look for in the file.
+ * @param magicNumbers the magic number to look for in the file.
* @param offset the byte offset in the file to start comparing bytes.
*
* @throws IllegalArgumentException if {@code magicNumber} is
* {@code null}, or contains no bytes, or {@code offset}
* is a negative number.
*/
- public MagicNumberFileFilter(final byte[] magicNumber, final long offset) {
- if (magicNumber == null) {
+ public MagicNumberFileFilter(final byte[] magicNumbers, final long offset)
{
+ if (magicNumbers == null) {
throw new IllegalArgumentException("The magic number cannot be
null");
}
- if (magicNumber.length == 0) {
+ if (magicNumbers.length == 0) {
throw new IllegalArgumentException("The magic number must contain
at least one byte");
}
if (offset < 0) {
throw new IllegalArgumentException("The offset cannot be
negative");
}
- this.magicNumbers = IOUtils.byteArray(magicNumber.length);
- System.arraycopy(magicNumber, 0, this.magicNumbers, 0,
magicNumber.length);
+ this.magicNumbers = IOUtils.byteArray(magicNumbers.length);
+ System.arraycopy(magicNumbers, 0, this.magicNumbers, 0,
magicNumbers.length);
this.byteOffset = offset;
}
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 880830f..1e86799 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
@@ -151,8 +151,7 @@ public class NameFileFilter extends AbstractFileFilter
implements Serializable {
if (names == null) {
throw new IllegalArgumentException("The array of names must not be
null");
}
- this.names = new String[names.length];
- System.arraycopy(names, 0, this.names, 0, names.length);
+ this.names = names.clone();
this.ioCase = toIOCase(ioCase);
}
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 9420306..56e408c 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -155,8 +155,7 @@ public class PrefixFileFilter extends AbstractFileFilter
implements Serializable
if (prefixes == null) {
throw new IllegalArgumentException("The array of prefixes must not
be null");
}
- this.prefixes = new String[prefixes.length];
- System.arraycopy(prefixes, 0, this.prefixes, 0, prefixes.length);
+ this.prefixes = prefixes.clone();
this.isCase = IOCase.value(ioCase, IOCase.SENSITIVE);
}
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 18cf4c9..887e811 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -157,8 +157,7 @@ public class SuffixFileFilter extends AbstractFileFilter
implements Serializable
if (suffixes == null) {
throw new IllegalArgumentException("The array of suffixes must not
be null");
}
- this.suffixes = new String[suffixes.length];
- System.arraycopy(suffixes, 0, this.suffixes, 0, suffixes.length);
+ this.suffixes = suffixes.clone();
this.ioCase = IOCase.value(ioCase, IOCase.SENSITIVE);
}
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 b8c57b4..0c336ed 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
@@ -158,8 +158,7 @@ public class WildcardFileFilter extends AbstractFileFilter
implements Serializab
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard array must not be
null");
}
- this.wildcards = new String[wildcards.length];
- System.arraycopy(wildcards, 0, this.wildcards, 0, wildcards.length);
+ this.wildcards = wildcards.clone();
this.ioCase = IOCase.value(ioCase, IOCase.SENSITIVE);
}
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 3b031cc..f13df28 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
@@ -121,8 +121,7 @@ public class WildcardFilter extends AbstractFileFilter
implements Serializable {
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard array must not be
null");
}
- this.wildcards = new String[wildcards.length];
- System.arraycopy(wildcards, 0, this.wildcards, 0, wildcards.length);
+ this.wildcards = wildcards.clone();
}
/**
diff --git a/src/test/java/org/apache/commons/io/HexDumpTest.java
b/src/test/java/org/apache/commons/io/HexDumpTest.java
index 3f915d0..36a042a 100644
--- a/src/test/java/org/apache/commons/io/HexDumpTest.java
+++ b/src/test/java/org/apache/commons/io/HexDumpTest.java
@@ -63,8 +63,7 @@ public class HexDumpTest {
for (int k = 0; k < 16; k++) {
outputArray[offset++] = (byte) toAscii((j * 16) + k);
}
- System.arraycopy(HexDump.EOL.getBytes(), 0, outputArray, offset,
- HexDump.EOL.getBytes().length);
+ System.arraycopy(HexDump.EOL.getBytes(), 0, outputArray, offset,
HexDump.EOL.getBytes().length);
}
byte[] actualOutput = stream.toByteArray();
