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
commit 99ffa3d0fa3b2d3f0c591ca3f22201dd3f393172
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Apr 11 16:01:07 2025 -0400
Refactor boilerplate into a package private method
---
.../commons/compress/archivers/zip/AbstractUnicodeExtraField.java | 4 +---
.../apache/commons/compress/archivers/zip/PKWareExtraHeader.java | 6 ++----
.../commons/compress/archivers/zip/UnparseableExtraFieldData.java | 4 +---
.../commons/compress/archivers/zip/UnrecognizedExtraField.java | 4 +---
.../java/org/apache/commons/compress/archivers/zip/ZipShort.java | 5 +++++
5 files changed, 10 insertions(+), 13 deletions(-)
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 dd74e203b..cebfc8076 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
@@ -25,8 +25,6 @@
import java.util.zip.CRC32;
import java.util.zip.ZipException;
-import org.apache.commons.lang3.ArrayUtils;
-
/**
* A common base class for Unicode extra information extra fields.
*
@@ -98,7 +96,7 @@ public ZipShort getCentralDirectoryLength() {
if (data == null) {
assembleData();
}
- return new ZipShort(ArrayUtils.getLength(data));
+ return ZipShort.lengthOf(data);
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
index 981f7e001..cada98d46 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java
@@ -24,8 +24,6 @@
import java.util.Map;
import java.util.zip.ZipException;
-import org.apache.commons.lang3.ArrayUtils;
-
/**
* Base class for all PKWare strong crypto extra headers.
*
@@ -333,11 +331,11 @@ public byte[] getLocalFileDataData() {
/**
* Gets the length of the local data.
*
- * @return the length of the local data
+ * @return the length of the local data.
*/
@Override
public ZipShort getLocalFileDataLength() {
- return new ZipShort(ArrayUtils.getLength(localData));
+ return ZipShort.lengthOf(localData);
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
index edece2c7d..b65218793 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java
@@ -20,8 +20,6 @@
import java.util.Arrays;
-import org.apache.commons.lang3.ArrayUtils;
-
/**
* Wrapper for extra field data that doesn't conform to the recommended format
of header-tag + size + data.
*
@@ -86,7 +84,7 @@ public byte[] getLocalFileDataData() {
*/
@Override
public ZipShort getLocalFileDataLength() {
- return new ZipShort(ArrayUtils.getLength(localFileData));
+ return ZipShort.lengthOf(localFileData);
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
index b46cf0aae..10c34e848 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java
@@ -20,8 +20,6 @@
import java.util.Arrays;
-import org.apache.commons.lang3.ArrayUtils;
-
/**
* Simple placeholder for all those extra fields we don't want to deal with.
*
@@ -101,7 +99,7 @@ public byte[] getLocalFileDataData() {
*/
@Override
public ZipShort getLocalFileDataLength() {
- return new ZipShort(ArrayUtils.getLength(localData));
+ return ZipShort.lengthOf(localData);
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
index add7cc4f6..f6b371f92 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
@@ -21,6 +21,7 @@
import java.io.Serializable;
import org.apache.commons.compress.utils.ByteUtils;
+import org.apache.commons.lang3.ArrayUtils;
/**
* Utility class that represents a two byte integer with conversion rules for
the little-endian byte order of ZIP files.
@@ -73,6 +74,10 @@ public static int getValue(final byte[] bytes, final int
offset) {
return (int) ByteUtils.fromLittleEndian(bytes, offset, SIZE);
}
+ static ZipShort lengthOf(final byte[] array) {
+ return new ZipShort(ArrayUtils.getLength(array));
+ }
+
/**
* put the value as two bytes in big-endian byte order.
*
