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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new b7391964 Use Arrays.copyOf() and copyOfRange()
b7391964 is described below
commit b7391964e4f503295b5bc19ac64825fd0a7bc08a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 28 16:51:02 2022 -0500
Use Arrays.copyOf() and copyOfRange()
---
.../java/org/apache/commons/compress/archivers/cpio/CpioUtil.java | 5 +++--
.../org/apache/commons/compress/archivers/jar/JarArchiveEntry.java | 5 ++---
.../org/apache/commons/compress/archivers/sevenz/SevenZMethod.java | 5 +----
.../apache/commons/compress/archivers/tar/TarArchiveInputStream.java | 5 ++---
src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java | 5 ++---
.../commons/compress/archivers/zip/AbstractUnicodeExtraField.java | 4 ++--
6 files changed, 12 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
index ca0b3a80..2468fc84 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.compress.archivers.cpio;
+import java.util.Arrays;
+
/**
* Package private utility class for Cpio
*
@@ -43,8 +45,7 @@ class CpioUtil {
long ret;
int pos = 0;
- final byte[] tmp_number = new byte[number.length];
- System.arraycopy(number, 0, tmp_number, 0, number.length);
+ final byte[] tmp_number = Arrays.copyOf(number, number.length);
if (!swapHalfWord) {
byte tmp = 0;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
index d89f68d5..a2118a6a 100644
---
a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
@@ -19,6 +19,7 @@
package org.apache.commons.compress.archivers.jar;
import java.security.cert.Certificate;
+import java.util.Arrays;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.zip.ZipEntry;
@@ -63,9 +64,7 @@ public class JarArchiveEntry extends ZipArchiveEntry {
@Deprecated
public Certificate[] getCertificates() {
if (certificates != null) { // never true currently // NOSONAR
- final Certificate[] certs = new Certificate[certificates.length];
- System.arraycopy(certificates, 0, certs, 0, certs.length);
- return certs;
+ return Arrays.copyOf(certificates, certificates.length);
}
/*
* Note, the method
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java
index 8f0aa6ce..76a2abef 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java
@@ -106,9 +106,6 @@ public enum SevenZMethod {
}
byte[] getId() {
- final int idLength = id.length;
- final byte[] copy = new byte[idLength];
- System.arraycopy(id, 0, copy, 0, idLength);
- return copy;
+ return Arrays.copyOf(id, id.length);
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
index 50243a39..621a4780 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -28,6 +28,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -409,9 +410,7 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
--length;
}
if (length != longNameData.length) {
- final byte[] l = new byte[length];
- System.arraycopy(longNameData, 0, l, 0, length);
- longNameData = l;
+ longNameData = Arrays.copyOf(longNameData, length);
}
return longNameData;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
index e39a544d..aa91c16d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
@@ -27,6 +27,7 @@ import java.nio.channels.SeekableByteChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -443,9 +444,7 @@ public class TarFile implements Closeable {
--length;
}
if (length != longNameData.length) {
- final byte[] l = new byte[length];
- System.arraycopy(longNameData, 0, l, 0, length);
- longNameData = l;
+ longNameData = Arrays.copyOf(longNameData, length);
}
return longNameData;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
index 2edf099b..ac9b2629 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.archivers.zip;
import static java.nio.charset.StandardCharsets.UTF_8;
+import java.util.Arrays;
import java.util.zip.CRC32;
import java.util.zip.ZipException;
@@ -86,8 +87,7 @@ public abstract class AbstractUnicodeExtraField implements
ZipExtraField {
}
byte[] b = null;
if (data != null) {
- b = new byte[data.length];
- System.arraycopy(data, 0, b, 0, b.length);
+ b = Arrays.copyOf(data, data.length);
}
return b;
}
