You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/09/30 15:28:07 UTC
[commons-compress] branch master updated (2fb4724c -> f435b581)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
from 2fb4724c Better exception message
new 673c67e7 Don't use star imports
new 082e8d08 Format tweak
new 57340b34 Use generics
new 59cab3e7 Some input streams are not closed in org.apache.commons.compress.harmony.pack200.PackingUtils.
new f435b581 Use try-with-resources
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 3 +
.../apache/commons/compress/archivers/Lister.java | 2 +-
.../archivers/ar/ArArchiveOutputStream.java | 4 +-
.../compress/archivers/dump/DumpArchiveEntry.java | 1 +
.../archivers/dump/DumpArchiveInputStream.java | 13 +--
.../compress/archivers/dump/DumpArchiveUtil.java | 1 +
.../compress/archivers/dump/TapeInputStream.java | 1 -
.../archivers/sevenz/AES256SHA256Decoder.java | 2 +
.../commons/compress/archivers/sevenz/Coders.java | 1 +
.../compress/archivers/sevenz/DeltaDecoder.java | 1 +
.../compress/archivers/sevenz/LZMA2Decoder.java | 2 +-
.../compress/archivers/sevenz/SevenZFile.java | 1 -
.../archivers/sevenz/SevenZOutputFile.java | 4 +-
.../archivers/tar/TarArchiveOutputStream.java | 4 +-
.../commons/compress/archivers/tar/TarFile.java | 2 +-
.../archivers/zip/AbstractUnicodeExtraField.java | 4 +-
.../compress/archivers/zip/AsiExtraField.java | 6 +-
.../commons/compress/archivers/zip/BitStream.java | 3 +-
.../zip/InflaterInputStreamWithStatistics.java | 4 +-
.../archivers/zip/ScatterZipOutputStream.java | 8 +-
.../compress/archivers/zip/StreamCompressor.java | 4 +-
.../compress/archivers/zip/X7875_NewUnix.java | 8 +-
.../zip/Zip64ExtendedInformationExtraField.java | 6 +-
.../archivers/zip/ZipArchiveEntryRequest.java | 4 +-
.../archivers/zip/ZipEightByteInteger.java | 4 +-
.../compress/archivers/zip/ZipEncodingHelper.java | 4 +-
.../commons/compress/archivers/zip/ZipFile.java | 14 +--
.../commons/compress/archivers/zip/ZipLong.java | 4 +-
.../archivers/zip/ZipSplitOutputStream.java | 4 +-
.../zip/ZipSplitReadOnlySeekableByteChannel.java | 8 +-
.../compress/compressors/bzip2/BZip2Utils.java | 1 +
.../deflate64/Deflate64CompressorInputStream.java | 4 +-
.../gzip/GzipCompressorInputStream.java | 14 +--
.../gzip/GzipCompressorOutputStream.java | 4 +-
.../compress/compressors/gzip/GzipUtils.java | 1 +
.../commons/compress/compressors/lz4/XXHash32.java | 3 +-
.../lzma/LZMACompressorInputStream.java | 3 +-
.../lzma/LZMACompressorOutputStream.java | 4 +-
.../compress/compressors/lzma/LZMAUtils.java | 1 +
.../pack200/Pack200CompressorOutputStream.java | 2 +-
.../compress/compressors/pack200/Pack200Utils.java | 1 +
.../compressors/xz/XZCompressorInputStream.java | 7 +-
.../compressors/xz/XZCompressorOutputStream.java | 4 +-
.../commons/compress/compressors/xz/XZUtils.java | 1 +
.../zstandard/ZstdCompressorInputStream.java | 5 +-
.../zstandard/ZstdCompressorOutputStream.java | 3 +-
.../commons/compress/harmony/pack200/Archive.java | 8 +-
.../compress/harmony/pack200/ClassBands.java | 1 -
.../commons/compress/harmony/pack200/CpBands.java | 1 -
.../compress/harmony/pack200/PackingUtils.java | 123 ++++++++++-----------
.../commons/compress/utils/ArchiveUtils.java | 4 +-
.../commons/compress/archivers/SevenZTestCase.java | 1 +
.../commons/compress/archivers/TarTestCase.java | 16 +--
.../compress/archivers/cpio/CpioUtilTest.java | 4 +-
.../compress/archivers/examples/ExpanderTest.java | 2 -
.../examples/ParameterizedExpanderTest.java | 2 -
.../archivers/jar/JarArchiveOutputStreamTest.java | 2 +-
.../compress/archivers/jar/JarMarkerTest.java | 2 -
.../archivers/sevenz/AES256SHA256DecoderTest.java | 6 +-
.../compress/archivers/sevenz/FolderTest.java | 4 +-
.../archivers/sevenz/SevenZArchiveEntryTest.java | 2 -
.../archivers/sevenz/SevenZNativeHeapTest.java | 1 +
.../archivers/sevenz/SevenZOutputFileTest.java | 6 +-
.../commons/compress/archivers/tar/BigFilesIT.java | 8 +-
.../compress/archivers/tar/FileTimesIT.java | 9 +-
.../compress/archivers/tar/SparseFilesTest.java | 10 +-
.../archivers/tar/TarMemoryFileSystemTest.java | 17 +--
...fd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java | 1 +
.../compress/archivers/zip/DataDescriptorTest.java | 14 +--
.../archivers/zip/EncryptedArchiveTest.java | 4 +-
.../archivers/zip/ExtraFieldUtilsTest.java | 4 +-
.../archivers/zip/Maven221MultiVolumeTest.java | 1 -
.../compress/archivers/zip/NioZipEncodingTest.java | 7 +-
.../compress/archivers/zip/ScatterSample.java | 4 +-
.../compress/archivers/zip/ScatterSampleTest.java | 8 +-
.../archivers/zip/ScatterZipOutputStreamTest.java | 16 +--
.../archivers/zip/StreamCompressorTest.java | 1 +
.../compress/archivers/zip/UTF8ZipFilesTest.java | 3 +-
.../compress/archivers/zip/X000A_NTFSTest.java | 6 +-
.../archivers/zip/X5455_ExtendedTimestampTest.java | 30 ++---
.../compress/archivers/zip/X7875_NewUnixTest.java | 16 +--
.../archivers/zip/ZipArchiveEntryTest.java | 2 -
.../archivers/zip/ZipArchiveInputStreamTest.java | 2 -
.../archivers/zip/ZipClassCoverageTest.java | 3 +-
.../compress/archivers/zip/ZipEncodingTest.java | 3 +-
.../zip/ZipFileIgnoringLocalFileHeaderTest.java | 15 ++-
.../compress/archivers/zip/ZipLongTest.java | 4 +-
.../archivers/zip/ZipMemoryFileSystemTest.java | 39 ++++---
.../compress/archivers/zip/ZipShortTest.java | 4 +-
.../bzip2/BZip2NSelectorsOverflowTest.java | 6 +-
.../compress/compressors/bzip2/BlockSortTest.java | 4 +-
.../bzip2/PythonTruncatedBzip2Test.java | 3 +-
.../deflate/DeflateCompressorOutputStreamTest.java | 6 +-
.../compressors/deflate/DeflateParametersTest.java | 2 -
.../compressors/deflate64/HuffmanDecoderTest.java | 6 +-
.../compress/compressors/lz4/XXHash32Test.java | 2 -
.../lz77support/LZ77CompressorTest.java | 10 +-
.../compressors/lz77support/ParametersTest.java | 4 +-
.../compressors/snappy/SnappyRoundtripTest.java | 1 +
.../xz/XZCompressorOutputStreamTest.java | 4 +-
.../compressors/z/ZCompressorInputStreamTest.java | 10 +-
.../zstandard/ZstdCompressorInputStreamTest.java | 5 +-
.../harmony/pack200/tests/ArchiveTest.java | 5 +-
.../harmony/pack200/tests/BHSDCodecTest.java | 4 +-
.../harmony/pack200/tests/CodecEncodingTest.java | 4 +-
.../compress/harmony/pack200/tests/CodecTest.java | 4 +-
.../harmony/pack200/tests/PackingOptionsTest.java | 4 +-
.../harmony/pack200/tests/PopulationCodecTest.java | 4 +-
.../harmony/pack200/tests/RunCodecTest.java | 4 +-
.../unpack200/tests/AbstractBandsTestCase.java | 4 +-
.../harmony/unpack200/tests/ArchiveTest.java | 4 +-
.../unpack200/tests/AttributeLayoutMapTest.java | 4 +-
.../unpack200/tests/AttributeLayoutTest.java | 4 +-
.../harmony/unpack200/tests/BandSetTest.java | 4 +-
.../harmony/unpack200/tests/CPUTF8Test.java | 4 +-
.../harmony/unpack200/tests/CodeAttributeTest.java | 4 +-
.../harmony/unpack200/tests/ICTupleTest.java | 4 +-
.../tests/SegmentConstantPoolArrayCacheTest.java | 4 +-
.../unpack200/tests/SegmentConstantPoolTest.java | 4 +-
.../unpack200/tests/SegmentOptionsTest.java | 4 +-
.../harmony/unpack200/tests/SegmentTest.java | 4 +-
.../harmony/unpack200/tests/SegmentUtilsTest.java | 4 +-
.../unpack200/tests/bytecode/ByteCodeTest.java | 4 +-
.../tests/bytecode/ClassFileEntryTest.java | 4 +-
.../unpack200/tests/bytecode/ConstantPoolTest.java | 4 +-
.../BoundedSeekableByteChannelInputStreamTest.java | 8 +-
.../utils/ChecksumCalculatingInputStreamTest.java | 8 +-
.../utils/ChecksumVerifyingInputStreamTest.java | 8 +-
.../commons/compress/utils/CountingStreamTest.java | 4 +-
.../utils/FixedLengthBlockOutputStreamTest.java | 2 +-
.../apache/commons/compress/utils/IOUtilsTest.java | 2 +-
.../utils/SeekableInMemoryByteChannelTest.java | 14 +--
.../utils/SkipShieldingInputStreamTest.java | 1 +
133 files changed, 409 insertions(+), 395 deletions(-)
[commons-compress] 04/05: Some input streams are not closed in org.apache.commons.compress.harmony.pack200.PackingUtils.
Posted by gg...@apache.org.
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 59cab3e7b65b10d9cbef1206eabdbcf46e350ee2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Sep 30 11:22:24 2022 -0400
Some input streams are not closed in
org.apache.commons.compress.harmony.pack200.PackingUtils.
---
src/changes/changes.xml | 3 +
.../compress/harmony/pack200/PackingUtils.java | 79 +++++++++++-----------
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2ad3ad6b..932fe92f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -115,6 +115,9 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="COMPRESS-626" type="fix" dev="ggregory" due-to="Andrii Hudz, Gary Gregory">
OutOfMemoryError on malformed pack200 attributes.
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Some input streams are not closed in org.apache.commons.compress.harmony.pack200.PackingUtils.
+ </action>
<!-- ADD -->
<action issue="COMPRESS-602" type="add" dev="ggregory" due-to="Postelnicu George, Gary Gregory">
Migrate zip package to use NIO #236.
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index 402719d8..5d7a5187 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -119,27 +119,26 @@ public class PackingUtils {
* @param outputStream the jar output stream
* @throws IOException If an I/O error occurs.
*/
- public static void copyThroughJar(final JarFile jarFile, final OutputStream outputStream) throws IOException {
- final JarOutputStream jarOutputStream = new JarOutputStream(outputStream);
- jarOutputStream.setComment("PACK200");
- final byte[] bytes = new byte[16384];
- final Enumeration entries = jarFile.entries();
- InputStream inputStream;
- JarEntry jarEntry;
- int bytesRead;
- while (entries.hasMoreElements()) {
- jarEntry = (JarEntry) entries.nextElement();
- jarOutputStream.putNextEntry(jarEntry);
- inputStream = jarFile.getInputStream(jarEntry);
- while ((bytesRead = inputStream.read(bytes)) != -1) {
- jarOutputStream.write(bytes, 0, bytesRead);
- }
- jarOutputStream.closeEntry();
- log("Packed " + jarEntry.getName());
- }
- jarFile.close();
- jarOutputStream.close();
- }
+ public static void copyThroughJar(final JarFile jarFile, final OutputStream outputStream) throws IOException {
+ final JarOutputStream jarOutputStream = new JarOutputStream(outputStream);
+ jarOutputStream.setComment("PACK200");
+ final byte[] bytes = new byte[16384];
+ final Enumeration<JarEntry> entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry jarEntry = entries.nextElement();
+ jarOutputStream.putNextEntry(jarEntry);
+ try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
+ int bytesRead;
+ while ((bytesRead = inputStream.read(bytes)) != -1) {
+ jarOutputStream.write(bytes, 0, bytesRead);
+ }
+ jarOutputStream.closeEntry();
+ log("Packed " + jarEntry.getName());
+ }
+ }
+ jarFile.close();
+ jarOutputStream.close();
+ }
public static List<PackingFile> getPackingFileListFromJar(final JarInputStream jarInputStream, final boolean keepFileOrder)
throws IOException {
@@ -169,23 +168,23 @@ public class PackingUtils {
}
public static List<PackingFile> getPackingFileListFromJar(final JarFile jarFile, final boolean keepFileOrder)
- throws IOException {
- final List<PackingFile> packingFileList = new ArrayList<>();
- final Enumeration<JarEntry> jarEntries = jarFile.entries();
- JarEntry jarEntry;
- byte[] bytes;
- while (jarEntries.hasMoreElements()) {
- jarEntry = jarEntries.nextElement();
- bytes = readJarEntry(jarEntry, new BufferedInputStream(jarFile.getInputStream(jarEntry)));
- packingFileList.add(new PackingFile(bytes, jarEntry));
- }
-
- // check whether it need reorder packing file list
- if (!keepFileOrder) {
- reorderPackingFiles(packingFileList);
- }
- return packingFileList;
- }
+ throws IOException {
+ final List<PackingFile> packingFileList = new ArrayList<>();
+ final Enumeration<JarEntry> jarEntries = jarFile.entries();
+ while (jarEntries.hasMoreElements()) {
+ final JarEntry jarEntry = jarEntries.nextElement();
+ try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
+ final byte[] bytes = readJarEntry(jarEntry, new BufferedInputStream(inputStream));
+ packingFileList.add(new PackingFile(bytes, jarEntry));
+ }
+ }
+
+ // check whether it need reorder packing file list
+ if (!keepFileOrder) {
+ reorderPackingFiles(packingFileList);
+ }
+ return packingFileList;
+ }
private static byte[] readJarEntry(final JarEntry jarEntry, final InputStream inputStream) throws IOException {
long size = jarEntry.getSize();
@@ -217,8 +216,8 @@ public class PackingUtils {
// position
packingFileList.sort((arg0, arg1) -> {
if (arg0 instanceof PackingFile && arg1 instanceof PackingFile) {
- final String fileName0 = ((PackingFile) arg0).getName();
- final String fileName1 = ((PackingFile) arg1).getName();
+ final String fileName0 = arg0.getName();
+ final String fileName1 = arg1.getName();
if (fileName0.equals(fileName1)) {
return 0;
}
[commons-compress] 03/05: Use generics
Posted by gg...@apache.org.
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 57340b34fe144bf225658fe9ba0d1df668148b7b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Sep 30 11:20:18 2022 -0400
Use generics
---
.../java/org/apache/commons/compress/harmony/pack200/Archive.java | 8 ++++----
.../org/apache/commons/compress/harmony/pack200/PackingUtils.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
index 3e799c82..963e01a6 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
@@ -117,14 +117,14 @@ public class Archive {
packingFileList = PackingUtils.getPackingFileListFromJar(jarFile, options.isKeepFileOrder());
}
- final List segmentUnitList = splitIntoSegments(packingFileList);
+ final List<SegmentUnit> segmentUnitList = splitIntoSegments(packingFileList);
int previousByteAmount = 0;
int packedByteAmount = 0;
final int segmentSize = segmentUnitList.size();
SegmentUnit segmentUnit;
for (int index = 0; index < segmentSize; index++) {
- segmentUnit = (SegmentUnit) segmentUnitList.get(index);
+ segmentUnit = segmentUnitList.get(index);
new Segment().pack(segmentUnit, outputStream, options);
previousByteAmount += segmentUnit.getByteAmount();
packedByteAmount += segmentUnit.getPackedByteAmount();
@@ -136,8 +136,8 @@ public class Archive {
outputStream.close();
}
- private List splitIntoSegments(final List packingFileList) {
- final List segmentUnitList = new ArrayList();
+ private List<SegmentUnit> splitIntoSegments(final List packingFileList) {
+ final List<SegmentUnit> segmentUnitList = new ArrayList<>();
List classes = new ArrayList();
List files = new ArrayList();
final long segmentLimit = options.getSegmentLimit();
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index e9ad068c..402719d8 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -141,7 +141,7 @@ public class PackingUtils {
jarOutputStream.close();
}
- public static List getPackingFileListFromJar(final JarInputStream jarInputStream, final boolean keepFileOrder)
+ public static List<PackingFile> getPackingFileListFromJar(final JarInputStream jarInputStream, final boolean keepFileOrder)
throws IOException {
final List<PackingFile> packingFileList = new ArrayList<>();
@@ -168,14 +168,14 @@ public class PackingUtils {
return packingFileList;
}
- public static List getPackingFileListFromJar(final JarFile jarFile, final boolean keepFileOrder)
+ public static List<PackingFile> getPackingFileListFromJar(final JarFile jarFile, final boolean keepFileOrder)
throws IOException {
final List<PackingFile> packingFileList = new ArrayList<>();
- final Enumeration jarEntries = jarFile.entries();
+ final Enumeration<JarEntry> jarEntries = jarFile.entries();
JarEntry jarEntry;
byte[] bytes;
while (jarEntries.hasMoreElements()) {
- jarEntry = (JarEntry) jarEntries.nextElement();
+ jarEntry = jarEntries.nextElement();
bytes = readJarEntry(jarEntry, new BufferedInputStream(jarFile.getInputStream(jarEntry)));
packingFileList.add(new PackingFile(bytes, jarEntry));
}
[commons-compress] 02/05: Format tweak
Posted by gg...@apache.org.
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 082e8d0820285a20db189bc287c55de1c8beb7a6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Sep 30 11:11:34 2022 -0400
Format tweak
---
src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index 2e22461e..be6a6b0e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -149,6 +149,7 @@ class Coders {
new ByteArrayInputStream(ONE_ZERO_BYTE)), inflater);
return new DeflateDecoderInputStream(inflaterInputStream, inflater);
}
+
@Override
OutputStream encode(final OutputStream out, final Object options) {
final int level = numberOptionOrDefault(options, 9);
[commons-compress] 01/05: Don't use star imports
Posted by gg...@apache.org.
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 673c67e7a9303afa0bd0a4ff099e05539d656c26
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Sep 30 11:11:26 2022 -0400
Don't use star imports
Remove unused imports
import in AB order
static imports come first
---
.../apache/commons/compress/archivers/Lister.java | 2 +-
.../archivers/ar/ArArchiveOutputStream.java | 4 +--
.../compress/archivers/dump/DumpArchiveEntry.java | 1 +
.../archivers/dump/DumpArchiveInputStream.java | 13 ++++----
.../compress/archivers/dump/DumpArchiveUtil.java | 1 +
.../compress/archivers/dump/TapeInputStream.java | 1 -
.../archivers/sevenz/AES256SHA256Decoder.java | 2 ++
.../compress/archivers/sevenz/DeltaDecoder.java | 1 +
.../compress/archivers/sevenz/LZMA2Decoder.java | 2 +-
.../compress/archivers/sevenz/SevenZFile.java | 1 -
.../archivers/sevenz/SevenZOutputFile.java | 4 +--
.../archivers/tar/TarArchiveOutputStream.java | 4 +--
.../commons/compress/archivers/tar/TarFile.java | 2 +-
.../archivers/zip/AbstractUnicodeExtraField.java | 4 +--
.../compress/archivers/zip/AsiExtraField.java | 6 ++--
.../commons/compress/archivers/zip/BitStream.java | 3 +-
.../zip/InflaterInputStreamWithStatistics.java | 4 +--
.../archivers/zip/ScatterZipOutputStream.java | 8 ++---
.../compress/archivers/zip/StreamCompressor.java | 4 +--
.../compress/archivers/zip/X7875_NewUnix.java | 8 ++---
.../zip/Zip64ExtendedInformationExtraField.java | 6 ++--
.../archivers/zip/ZipArchiveEntryRequest.java | 4 +--
.../archivers/zip/ZipEightByteInteger.java | 4 +--
.../compress/archivers/zip/ZipEncodingHelper.java | 4 +--
.../commons/compress/archivers/zip/ZipFile.java | 14 ++++----
.../commons/compress/archivers/zip/ZipLong.java | 4 +--
.../archivers/zip/ZipSplitOutputStream.java | 4 +--
.../zip/ZipSplitReadOnlySeekableByteChannel.java | 8 ++---
.../compress/compressors/bzip2/BZip2Utils.java | 1 +
.../deflate64/Deflate64CompressorInputStream.java | 4 +--
.../gzip/GzipCompressorInputStream.java | 14 ++++----
.../gzip/GzipCompressorOutputStream.java | 4 +--
.../compress/compressors/gzip/GzipUtils.java | 1 +
.../commons/compress/compressors/lz4/XXHash32.java | 3 +-
.../lzma/LZMACompressorInputStream.java | 3 +-
.../lzma/LZMACompressorOutputStream.java | 4 +--
.../compress/compressors/lzma/LZMAUtils.java | 1 +
.../pack200/Pack200CompressorOutputStream.java | 2 +-
.../compress/compressors/pack200/Pack200Utils.java | 1 +
.../compressors/xz/XZCompressorInputStream.java | 7 ++--
.../compressors/xz/XZCompressorOutputStream.java | 4 +--
.../commons/compress/compressors/xz/XZUtils.java | 1 +
.../zstandard/ZstdCompressorInputStream.java | 5 +--
.../zstandard/ZstdCompressorOutputStream.java | 3 +-
.../compress/harmony/pack200/ClassBands.java | 1 -
.../commons/compress/harmony/pack200/CpBands.java | 1 -
.../commons/compress/utils/ArchiveUtils.java | 4 +--
.../commons/compress/archivers/SevenZTestCase.java | 1 +
.../commons/compress/archivers/TarTestCase.java | 16 ++++-----
.../compress/archivers/cpio/CpioUtilTest.java | 4 +--
.../compress/archivers/examples/ExpanderTest.java | 2 --
.../examples/ParameterizedExpanderTest.java | 2 --
.../archivers/jar/JarArchiveOutputStreamTest.java | 2 +-
.../compress/archivers/jar/JarMarkerTest.java | 2 --
.../archivers/sevenz/AES256SHA256DecoderTest.java | 6 ++--
.../compress/archivers/sevenz/FolderTest.java | 4 +--
.../archivers/sevenz/SevenZArchiveEntryTest.java | 2 --
.../archivers/sevenz/SevenZNativeHeapTest.java | 1 +
.../archivers/sevenz/SevenZOutputFileTest.java | 6 ++--
.../commons/compress/archivers/tar/BigFilesIT.java | 8 ++---
.../compress/archivers/tar/FileTimesIT.java | 9 +++--
.../compress/archivers/tar/SparseFilesTest.java | 10 +++---
.../archivers/tar/TarMemoryFileSystemTest.java | 17 +++++-----
...fd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java | 1 +
.../compress/archivers/zip/DataDescriptorTest.java | 14 ++++----
.../archivers/zip/EncryptedArchiveTest.java | 4 +--
.../archivers/zip/ExtraFieldUtilsTest.java | 4 +--
.../archivers/zip/Maven221MultiVolumeTest.java | 1 -
.../compress/archivers/zip/NioZipEncodingTest.java | 7 ++--
.../compress/archivers/zip/ScatterSample.java | 4 +--
.../compress/archivers/zip/ScatterSampleTest.java | 8 ++---
.../archivers/zip/ScatterZipOutputStreamTest.java | 16 ++++-----
.../archivers/zip/StreamCompressorTest.java | 1 +
.../compress/archivers/zip/UTF8ZipFilesTest.java | 3 +-
.../compress/archivers/zip/X000A_NTFSTest.java | 6 ++--
.../archivers/zip/X5455_ExtendedTimestampTest.java | 30 ++++++++---------
.../compress/archivers/zip/X7875_NewUnixTest.java | 16 ++++-----
.../archivers/zip/ZipArchiveEntryTest.java | 2 --
.../archivers/zip/ZipArchiveInputStreamTest.java | 2 --
.../archivers/zip/ZipClassCoverageTest.java | 3 +-
.../compress/archivers/zip/ZipEncodingTest.java | 3 +-
.../zip/ZipFileIgnoringLocalFileHeaderTest.java | 15 ++++-----
.../compress/archivers/zip/ZipLongTest.java | 4 +--
.../archivers/zip/ZipMemoryFileSystemTest.java | 39 +++++++++++++---------
.../compress/archivers/zip/ZipShortTest.java | 4 +--
.../bzip2/BZip2NSelectorsOverflowTest.java | 6 ++--
.../compress/compressors/bzip2/BlockSortTest.java | 4 +--
.../bzip2/PythonTruncatedBzip2Test.java | 3 +-
.../deflate/DeflateCompressorOutputStreamTest.java | 6 ++--
.../compressors/deflate/DeflateParametersTest.java | 2 --
.../compressors/deflate64/HuffmanDecoderTest.java | 6 ++--
.../compress/compressors/lz4/XXHash32Test.java | 2 --
.../lz77support/LZ77CompressorTest.java | 10 +++---
.../compressors/lz77support/ParametersTest.java | 4 +--
.../compressors/snappy/SnappyRoundtripTest.java | 1 +
.../xz/XZCompressorOutputStreamTest.java | 4 +--
.../compressors/z/ZCompressorInputStreamTest.java | 10 +++---
.../zstandard/ZstdCompressorInputStreamTest.java | 5 +--
.../harmony/pack200/tests/ArchiveTest.java | 5 ++-
.../harmony/pack200/tests/BHSDCodecTest.java | 4 +--
.../harmony/pack200/tests/CodecEncodingTest.java | 4 +--
.../compress/harmony/pack200/tests/CodecTest.java | 4 +--
.../harmony/pack200/tests/PackingOptionsTest.java | 4 +--
.../harmony/pack200/tests/PopulationCodecTest.java | 4 +--
.../harmony/pack200/tests/RunCodecTest.java | 4 +--
.../unpack200/tests/AbstractBandsTestCase.java | 4 +--
.../harmony/unpack200/tests/ArchiveTest.java | 4 +--
.../unpack200/tests/AttributeLayoutMapTest.java | 4 +--
.../unpack200/tests/AttributeLayoutTest.java | 4 +--
.../harmony/unpack200/tests/BandSetTest.java | 4 +--
.../harmony/unpack200/tests/CPUTF8Test.java | 4 +--
.../harmony/unpack200/tests/CodeAttributeTest.java | 4 +--
.../harmony/unpack200/tests/ICTupleTest.java | 4 +--
.../tests/SegmentConstantPoolArrayCacheTest.java | 4 +--
.../unpack200/tests/SegmentConstantPoolTest.java | 4 +--
.../unpack200/tests/SegmentOptionsTest.java | 4 +--
.../harmony/unpack200/tests/SegmentTest.java | 4 +--
.../harmony/unpack200/tests/SegmentUtilsTest.java | 4 +--
.../unpack200/tests/bytecode/ByteCodeTest.java | 4 +--
.../tests/bytecode/ClassFileEntryTest.java | 4 +--
.../unpack200/tests/bytecode/ConstantPoolTest.java | 4 +--
.../BoundedSeekableByteChannelInputStreamTest.java | 8 ++---
.../utils/ChecksumCalculatingInputStreamTest.java | 8 ++---
.../utils/ChecksumVerifyingInputStreamTest.java | 8 ++---
.../commons/compress/utils/CountingStreamTest.java | 4 +--
.../utils/FixedLengthBlockOutputStreamTest.java | 2 +-
.../apache/commons/compress/utils/IOUtilsTest.java | 2 +-
.../utils/SeekableInMemoryByteChannelTest.java | 14 ++++----
.../utils/SkipShieldingInputStreamTest.java | 1 +
129 files changed, 340 insertions(+), 329 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/Lister.java b/src/main/java/org/apache/commons/compress/archivers/Lister.java
index 2c6cf906..b709cbb5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/Lister.java
+++ b/src/main/java/org/apache/commons/compress/archivers/Lister.java
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.Enumeration;
+
import org.apache.commons.compress.archivers.sevenz.SevenZFile;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarFile;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
index 72eab020..62c07631 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.compress.archivers.ar;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,8 +30,6 @@ import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.utils.ArchiveUtils;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Implements the "ar" archive format as an output stream.
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
index fb339a63..abea9995 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.commons.compress.archivers.ArchiveEntry;
/**
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
index 0774f310..cc5a5b94 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
@@ -18,16 +18,9 @@
*/
package org.apache.commons.compress.archivers.dump;
-import org.apache.commons.compress.archivers.ArchiveException;
-import org.apache.commons.compress.archivers.ArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipEncoding;
-import org.apache.commons.compress.archivers.zip.ZipEncodingHelper;
-import org.apache.commons.compress.utils.IOUtils;
-
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -35,6 +28,12 @@ import java.util.PriorityQueue;
import java.util.Queue;
import java.util.Stack;
+import org.apache.commons.compress.archivers.ArchiveException;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipEncoding;
+import org.apache.commons.compress.archivers.zip.ZipEncodingHelper;
+import org.apache.commons.compress.utils.IOUtils;
+
/**
* The DumpArchiveInputStream reads a UNIX dump archive as an InputStream.
* Methods are provided to position at each successive entry in
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
index 20e1eb3f..7647b504 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.archivers.dump;
import java.io.IOException;
import java.util.Arrays;
+
import org.apache.commons.compress.archivers.zip.ZipEncoding;
import org.apache.commons.compress.utils.ByteUtils;
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
index 8585a17e..a0df524f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
@@ -21,7 +21,6 @@ package org.apache.commons.compress.archivers.dump;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-
import java.util.Arrays;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
index e6bb12c3..dde14ee2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
@@ -22,11 +22,13 @@ import java.io.InputStream;
import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
+
import org.apache.commons.compress.PasswordRequiredException;
class AES256SHA256Decoder extends CoderBase {
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
index de947ac2..c2747f8e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.archivers.sevenz;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import org.tukaani.xz.DeltaOptions;
import org.tukaani.xz.FinishableWrapperOutputStream;
import org.tukaani.xz.UnsupportedOptionsException;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
index 1716dc8a..13e498f7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.commons.compress.MemoryLimitException;
-import org.tukaani.xz.FinishableWrapperOutputStream;
import org.tukaani.xz.FinishableOutputStream;
+import org.tukaani.xz.FinishableWrapperOutputStream;
import org.tukaani.xz.LZMA2InputStream;
import org.tukaani.xz.LZMA2Options;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 9b678b44..dd6f06b5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -44,7 +44,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Collectors;
import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
index bfa32026..a8e70d5f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
@@ -17,6 +17,8 @@
*/
package org.apache.commons.compress.archivers.sevenz;
+import static java.nio.charset.StandardCharsets.UTF_16LE;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -48,8 +50,6 @@ import java.util.zip.CRC32;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.utils.CountingOutputStream;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Writes a 7z file.
* @since 1.6
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index 0a2f4e46..e616ac56 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.compress.archivers.tar;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -42,8 +44,6 @@ import org.apache.commons.compress.utils.CountingOutputStream;
import org.apache.commons.compress.utils.ExactMath;
import org.apache.commons.compress.utils.FixedLengthBlockOutputStream;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* The TarOutputStream writes a UNIX tar archive as an OutputStream. Methods are provided to put
* entries, and then write their contents by writing to this stream using write().
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 ec9359fb..ce1ef0c4 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
@@ -35,8 +35,8 @@ import java.util.Map;
import org.apache.commons.compress.archivers.zip.ZipEncoding;
import org.apache.commons.compress.archivers.zip.ZipEncodingHelper;
import org.apache.commons.compress.utils.ArchiveUtils;
-import org.apache.commons.compress.utils.BoundedInputStream;
import org.apache.commons.compress.utils.BoundedArchiveInputStream;
+import org.apache.commons.compress.utils.BoundedInputStream;
import org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream;
import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
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 27a438b6..54a2acd5 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
@@ -18,11 +18,11 @@
package org.apache.commons.compress.archivers.zip;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.util.zip.CRC32;
import java.util.zip.ZipException;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* A common base class for Unicode extra information extra fields.
* @NotThreadSafe
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
index 6f6a1b76..b3c6ca70 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
@@ -18,12 +18,12 @@
*/
package org.apache.commons.compress.archivers.zip;
-import java.util.zip.CRC32;
-import java.util.zip.ZipException;
-
import static org.apache.commons.compress.archivers.zip.ZipConstants.SHORT;
import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
+import java.util.zip.CRC32;
+import java.util.zip.ZipException;
+
/**
* Adds Unix file permission and UID/GID fields as well as symbolic
* link handling.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
index 904f1534..e826a515 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
@@ -21,9 +21,10 @@ package org.apache.commons.compress.archivers.zip;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.compress.utils.BitInputStream;
import java.nio.ByteOrder;
+import org.apache.commons.compress.utils.BitInputStream;
+
/**
* Iterates over the bits of an InputStream. For each byte the bits
* are read from the right to the left.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java b/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
index 6a5ceab1..6ba0df39 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
@@ -18,13 +18,13 @@
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.utils.InputStreamStatistics;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+import org.apache.commons.compress.utils.InputStreamStatistics;
+
/**
* Helper class to provide statistics
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
index 5e78ac9d..50f5d24b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
@@ -18,10 +18,6 @@
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.FileBasedScatterGatherBackingStore;
-import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
-import org.apache.commons.compress.utils.BoundedInputStream;
-
import java.io.Closeable;
import java.io.File;
import java.io.FileNotFoundException;
@@ -34,6 +30,10 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.zip.Deflater;
+import org.apache.commons.compress.parallel.FileBasedScatterGatherBackingStore;
+import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
+import org.apache.commons.compress.utils.BoundedInputStream;
+
/**
* A zip output stream that is optimized for multi-threaded scatter/gather construction of zip files.
* <p>
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
index afcc8104..bc015678 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
@@ -17,8 +17,6 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
-
import java.io.Closeable;
import java.io.DataOutput;
import java.io.IOException;
@@ -30,6 +28,8 @@ import java.util.zip.CRC32;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
+import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
+
/**
* Encapsulates a {@link Deflater} and crc calculator, handling multiple types of output streams.
* Currently {@link java.util.zip.ZipEntry#DEFLATED} and {@link java.util.zip.ZipEntry#STORED} are the only
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
index d225454e..a8afb6b4 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
@@ -18,6 +18,10 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static org.apache.commons.compress.archivers.zip.ZipUtil.reverse;
+import static org.apache.commons.compress.archivers.zip.ZipUtil.signedByteToUnsignedInt;
+import static org.apache.commons.compress.archivers.zip.ZipUtil.unsignedIntToSignedByte;
+
import java.io.Serializable;
import java.math.BigInteger;
import java.util.Arrays;
@@ -25,10 +29,6 @@ import java.util.zip.ZipException;
import org.apache.commons.compress.utils.ByteUtils;
-import static org.apache.commons.compress.archivers.zip.ZipUtil.reverse;
-import static org.apache.commons.compress.archivers.zip.ZipUtil.signedByteToUnsignedInt;
-import static org.apache.commons.compress.archivers.zip.ZipUtil.unsignedIntToSignedByte;
-
/**
* An extra field that stores UNIX UID/GID data (owner & group ownership) for a given
* zip entry. We're using the field definition given in Info-Zip's source archive:
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
index 8dafc7a4..92a9aaf1 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
@@ -18,13 +18,13 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.DWORD;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
+
import java.util.zip.ZipException;
import org.apache.commons.compress.utils.ByteUtils;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.DWORD;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
-
/**
* Holds size and other extended information for entries that use Zip64
* features.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java
index 3cd2ca26..3c9010b5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java
@@ -17,10 +17,10 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.InputStreamSupplier;
-
import java.io.InputStream;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+
/**
* A Thread-safe representation of a ZipArchiveEntry that is used to add entries to parallel archives.
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
index a91468c6..c9e0237d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
@@ -17,11 +17,11 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.BYTE_MASK;
+
import java.io.Serializable;
import java.math.BigInteger;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.BYTE_MASK;
-
/**
* Utility class that represents an eight byte integer with conversion
* rules for the little endian byte order of ZIP files.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
index 658ee174..3902f174 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
@@ -18,12 +18,12 @@
package org.apache.commons.compress.archivers.zip;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Static helper functions for robustly encoding file names in zip files.
*/
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index 152b4189..b893df97 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -17,6 +17,12 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.DWORD;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.SHORT;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.ZIP64_MAGIC;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.ZIP64_MAGIC_SHORT;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
@@ -34,8 +40,8 @@ import java.nio.file.StandardOpenOption;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Enumeration;
import java.util.EnumSet;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -52,12 +58,6 @@ import org.apache.commons.compress.utils.CountingInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.DWORD;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.SHORT;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.ZIP64_MAGIC;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.ZIP64_MAGIC_SHORT;
-
/**
* Replacement for {@code java.util.ZipFile}.
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
index 0b179eff..67362cff 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
@@ -17,11 +17,11 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.utils.ByteUtils;
+import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
import java.io.Serializable;
-import static org.apache.commons.compress.archivers.zip.ZipConstants.WORD;
+import org.apache.commons.compress.utils.ByteUtils;
/**
* Utility class that represents a four byte integer with conversion
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
index 5b48fcab..ea8a3333 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
@@ -17,8 +17,6 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.utils.FileNameUtils;
-
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,6 +25,8 @@ import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.Objects;
+import org.apache.commons.compress.utils.FileNameUtils;
+
/**
* Used internally by {@link ZipArchiveOutputStream} when creating a split archive.
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
index 4cf3c635..2f3c0a0f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
@@ -18,10 +18,6 @@
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.apache.commons.compress.utils.FileNameUtils;
-import org.apache.commons.compress.utils.MultiReadOnlySeekableByteChannel;
-
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
@@ -39,6 +35,10 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.apache.commons.compress.utils.FileNameUtils;
+import org.apache.commons.compress.utils.MultiReadOnlySeekableByteChannel;
+
/**
* {@link MultiReadOnlySeekableByteChannel} that knows what a split ZIP archive should look like.
*
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
index a20073d1..950e1814 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2Utils.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.compressors.bzip2;
import java.util.LinkedHashMap;
import java.util.Map;
+
import org.apache.commons.compress.compressors.FileNameUtil;
/**
diff --git a/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java
index db7e5e9e..31ccbeb3 100644
--- a/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStream.java
@@ -17,14 +17,14 @@
*/
package org.apache.commons.compress.compressors.deflate64;
+import static org.apache.commons.compress.utils.IOUtils.closeQuietly;
+
import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import static org.apache.commons.compress.utils.IOUtils.closeQuietly;
-
/**
* Deflate64 decompressor.
*
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
index 693ee34d..322e5bfb 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
@@ -18,17 +18,19 @@
*/
package org.apache.commons.compress.compressors.gzip;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+
+import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.EOFException;
-import java.io.InputStream;
import java.io.DataInput;
import java.io.DataInputStream;
-import java.io.BufferedInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.CRC32;
import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import java.util.zip.CRC32;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.ByteUtils;
@@ -36,8 +38,6 @@ import org.apache.commons.compress.utils.CountingInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Input stream that decompresses .gz files.
*
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
index 4b2b42a5..79df02a5 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
@@ -18,6 +18,8 @@
*/
package org.apache.commons.compress.compressors.gzip;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
@@ -29,8 +31,6 @@ import java.util.zip.GZIPOutputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Compressed output stream using the gzip format. This implementation improves
* over the standard {@link GZIPOutputStream} class by allowing
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
index b75a469c..cb8a0b09 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.compressors.gzip;
import java.util.LinkedHashMap;
import java.util.Map;
+
import org.apache.commons.compress.compressors.FileNameUtil;
/**
diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java b/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
index e4d9341c..05589864 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lz4/XXHash32.java
@@ -19,11 +19,10 @@
package org.apache.commons.compress.compressors.lz4;
import static java.lang.Integer.rotateLeft;
+import static org.apache.commons.compress.utils.ByteUtils.fromLittleEndian;
import java.util.zip.Checksum;
-import static org.apache.commons.compress.utils.ByteUtils.fromLittleEndian;
-
/**
* Implementation of the xxhash32 hash algorithm.
*
diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
index 4bb140af..8a1ebf3e 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
@@ -22,12 +22,11 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.compress.MemoryLimitException;
-import org.tukaani.xz.LZMAInputStream;
-
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.CountingInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
+import org.tukaani.xz.LZMAInputStream;
/**
* LZMA decompressor.
diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
index e6bdfa45..490572cf 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
@@ -20,10 +20,10 @@ package org.apache.commons.compress.compressors.lzma;
import java.io.IOException;
import java.io.OutputStream;
-import org.tukaani.xz.LZMA2Options;
-import org.tukaani.xz.LZMAOutputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.LZMAOutputStream;
/**
* LZMA compressor.
diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
index 4f07d419..4ccb6d32 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.compressors.lzma;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.commons.compress.compressors.FileNameUtil;
import org.apache.commons.compress.utils.OsgiUtils;
diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
index 374b89a5..566d8d1a 100644
--- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
import java.util.jar.JarInputStream;
-import org.apache.commons.compress.java.util.jar.Pack200;
import org.apache.commons.compress.compressors.CompressorOutputStream;
+import org.apache.commons.compress.java.util.jar.Pack200;
/**
* An output stream that compresses using the Pack200 format.
diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java
index 94b52359..0681fb81 100644
--- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
+
import org.apache.commons.compress.java.util.jar.Pack200;
/**
diff --git a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
index 86e2a845..1554c4e3 100644
--- a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
@@ -21,15 +21,14 @@ package org.apache.commons.compress.compressors.xz;
import java.io.IOException;
import java.io.InputStream;
-import org.tukaani.xz.XZ;
-import org.tukaani.xz.SingleXZInputStream;
-import org.tukaani.xz.XZInputStream;
-
import org.apache.commons.compress.MemoryLimitException;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.CountingInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
+import org.tukaani.xz.SingleXZInputStream;
+import org.tukaani.xz.XZ;
+import org.tukaani.xz.XZInputStream;
/**
* XZ decompressor.
diff --git a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
index d2674e78..25b0b9b8 100644
--- a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
@@ -20,10 +20,10 @@ package org.apache.commons.compress.compressors.xz;
import java.io.IOException;
import java.io.OutputStream;
-import org.tukaani.xz.LZMA2Options;
-import org.tukaani.xz.XZOutputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.XZOutputStream;
/**
* XZ compressor.
diff --git a/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java b/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
index b85411d3..e3ba663c 100644
--- a/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
+++ b/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
@@ -20,6 +20,7 @@ package org.apache.commons.compress.compressors.xz;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.commons.compress.compressors.FileNameUtil;
import org.apache.commons.compress.utils.OsgiUtils;
diff --git a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
index 6361dac4..c850dd9b 100644
--- a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStream.java
@@ -21,13 +21,14 @@ package org.apache.commons.compress.compressors.zstandard;
import java.io.IOException;
import java.io.InputStream;
-import com.github.luben.zstd.BufferPool;
-import com.github.luben.zstd.ZstdInputStream;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.utils.CountingInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.utils.InputStreamStatistics;
+import com.github.luben.zstd.BufferPool;
+import com.github.luben.zstd.ZstdInputStream;
+
/**
* {@link CompressorInputStream} implementation to decode Zstandard encoded stream.
* Library relies on <a href="https://github.com/luben/zstd-jni/">Zstandard JNI</a>
diff --git a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorOutputStream.java
index 8fdc8b52..95add715 100644
--- a/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorOutputStream.java
@@ -21,9 +21,10 @@ package org.apache.commons.compress.compressors.zstandard;
import java.io.IOException;
import java.io.OutputStream;
-import com.github.luben.zstd.ZstdOutputStream;
import org.apache.commons.compress.compressors.CompressorOutputStream;
+import com.github.luben.zstd.ZstdOutputStream;
+
/**
* {@link CompressorOutputStream} implementation to create Zstandard encoded stream.
* Library relies on <a href="https://github.com/luben/zstd-jni/">Zstandard JNI</a>
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
index 3a830444..0dccf6da 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
@@ -19,7 +19,6 @@ package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
index 1ebd199b..5fbfbf76 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
index f5c6e6d3..c464c8cb 100644
--- a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
@@ -18,12 +18,12 @@
package org.apache.commons.compress.utils;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
import java.util.Arrays;
import org.apache.commons.compress.archivers.ArchiveEntry;
-import static java.nio.charset.StandardCharsets.*;
-
/**
* Generic Archive utilities
*/
diff --git a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
index 5003a033..1f6535de 100644
--- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.security.NoSuchAlgorithmException;
+
import javax.crypto.Cipher;
import org.apache.commons.compress.AbstractTestCase;
diff --git a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
index d32b0de0..5e09689f 100644
--- a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
@@ -18,6 +18,14 @@
*/
package org.apache.commons.compress.archivers;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -38,14 +46,6 @@ import org.apache.commons.compress.utils.CharsetNames;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.jupiter.api.Test;
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
public final class TarTestCase extends AbstractTestCase {
@Test
diff --git a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioUtilTest.java b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioUtilTest.java
index 18ad6d4d..8d167f35 100644
--- a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioUtilTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioUtilTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.commons.compress.archivers.cpio;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class CpioUtilTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
index c7de3d65..31c22bef 100644
--- a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java
@@ -43,9 +43,7 @@ import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
import org.junit.Assume;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.rules.ExpectedException;
public class ExpanderTest extends AbstractTestCase {
diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
index 3742a335..de21a0d5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java
@@ -32,13 +32,11 @@ import java.nio.file.StandardOpenOption;
import java.util.stream.Stream;
import org.apache.commons.compress.AbstractTestCase;
-import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
diff --git a/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java
index 5f3c893d..1301d6d5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java
@@ -26,12 +26,12 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import org.junit.jupiter.api.Test;
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.archivers.zip.JarMarker;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipExtraField;
import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.junit.jupiter.api.Test;
public class JarArchiveOutputStreamTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/jar/JarMarkerTest.java b/src/test/java/org/apache/commons/compress/archivers/jar/JarMarkerTest.java
index 840ff509..953bddd8 100644
--- a/src/test/java/org/apache/commons/compress/archivers/jar/JarMarkerTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/jar/JarMarkerTest.java
@@ -19,11 +19,9 @@
package org.apache.commons.compress.archivers.jar;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
import java.util.zip.ZipException;
-import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.zip.JarMarker;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256DecoderTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256DecoderTest.java
index 2813f04e..8a1aeb6d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256DecoderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256DecoderTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.commons.compress.archivers.sevenz;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.io.ObjectInputStream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/FolderTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/FolderTest.java
index b3ceecee..cfa72cc6 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/FolderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/FolderTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.commons.compress.archivers.sevenz;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for class {@link Folder}.
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntryTest.java
index 6e606768..77c9b3c1 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntryTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntryTest.java
@@ -21,8 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.util.Arrays;
-
import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
index f99e7398..77dd1980 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
+
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.archivers.sevenz.Coders.DeflateDecoder;
import org.apache.commons.compress.archivers.sevenz.Coders.DeflateDecoder.DeflateDecoderInputStream;
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java
index b17027d1..4dcd2d85 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java
@@ -23,22 +23,22 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.junit.jupiter.api.Test;
-
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
+
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
+import org.junit.jupiter.api.Test;
import org.tukaani.xz.LZMA2Options;
public class SevenZOutputFileTest extends AbstractTestCase {
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
index 0d352f21..c857537d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
@@ -18,6 +18,10 @@
package org.apache.commons.compress.archivers.tar;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.nio.file.Files;
@@ -30,10 +34,6 @@ import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
public class BigFilesIT extends AbstractTestCase {
@Test
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java b/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java
index 1ba3023b..5a4831bc 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java
@@ -18,8 +18,10 @@
package org.apache.commons.compress.archivers.tar;
-import org.apache.commons.compress.AbstractTestCase;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.io.BufferedInputStream;
import java.io.InputStream;
@@ -27,7 +29,8 @@ import java.nio.file.Files;
import java.nio.file.attribute.FileTime;
import java.time.Instant;
-import static org.junit.Assert.*;
+import org.apache.commons.compress.AbstractTestCase;
+import org.junit.jupiter.api.Test;
public class FileTimesIT extends AbstractTestCase {
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
index 1a29043c..d66a623f 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
@@ -26,11 +26,6 @@ import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
-import org.apache.commons.compress.AbstractTestCase;
-import org.apache.commons.compress.utils.IOUtils;
-import org.junit.Assume;
-import org.junit.jupiter.api.Test;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
@@ -40,6 +35,11 @@ import java.nio.file.Path;
import java.util.List;
import java.util.Locale;
+import org.apache.commons.compress.AbstractTestCase;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.Assume;
+import org.junit.jupiter.api.Test;
+
public class SparseFilesTest extends AbstractTestCase {
private final boolean isOnWindows = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows");
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
index 3c08162a..3da9522e 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
@@ -18,11 +18,9 @@
package org.apache.commons.compress.archivers.tar;
-import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
-import org.apache.commons.compress.archivers.ArchiveException;
-import org.apache.commons.compress.archivers.ArchiveOutputStream;
-import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.junit.jupiter.api.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -34,9 +32,12 @@ import java.nio.file.Path;
import java.nio.file.attribute.GroupPrincipal;
import java.nio.file.attribute.UserPrincipal;
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.commons.compress.archivers.ArchiveException;
+import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.junit.jupiter.api.Test;
+
+import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
public class TarMemoryFileSystemTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Crash_f2efd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java b/src/test/java/org/apache/commons/compress/archivers/zip/Crash_f2efd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java
index 8fedd32e..c317d39c 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/Crash_f2efd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/Crash_f2efd9eaeb86cda597d07b5e3c3d81363633c2da_Test.java
@@ -19,6 +19,7 @@
package org.apache.commons.compress.archivers.zip;
import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/DataDescriptorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/DataDescriptorTest.java
index 033fe5d3..dfaa9100 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/DataDescriptorTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/DataDescriptorTest.java
@@ -17,6 +17,13 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.compress.AbstractTestCase.mkdir;
+import static org.apache.commons.compress.AbstractTestCase.rmdir;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -30,13 +37,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static java.nio.charset.StandardCharsets.*;
-import static org.apache.commons.compress.AbstractTestCase.mkdir;
-import static org.apache.commons.compress.AbstractTestCase.rmdir;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
public class DataDescriptorTest {
private File dir;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
index 7cf7e85e..04c804f3 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
@@ -18,8 +18,6 @@
package org.apache.commons.compress.archivers.zip;
-import org.junit.jupiter.api.Test;
-
import static org.apache.commons.compress.AbstractTestCase.getFile;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,6 +29,8 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import org.junit.jupiter.api.Test;
+
public class EncryptedArchiveTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
index b9e5c57b..1a44acfc 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
@@ -22,11 +22,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.zip.ZipException;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.zip.ZipException;
-
/**
* JUnit testcases for org.apache.commons.compress.archivers.zip.ExtraFieldUtils.
*
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java
index b80a4675..cfca6884 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.fail;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/NioZipEncodingTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/NioZipEncodingTest.java
index 953a15ec..11e13a0a 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/NioZipEncodingTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/NioZipEncodingTest.java
@@ -19,14 +19,17 @@
package org.apache.commons.compress.archivers.zip;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.nio.charset.StandardCharsets.UTF_16BE;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
-import static java.nio.charset.StandardCharsets.*;
-
public class NioZipEncodingTest {
private static final String UMLAUTS = "\u00e4\u00f6\u00fc";
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java
index 2ee14a3e..631d75e8 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSample.java
@@ -17,12 +17,12 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.InputStreamSupplier;
-
import java.io.File;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+
public class ScatterSample {
final ParallelScatterZipCreator scatterZipCreator = new ParallelScatterZipCreator();
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
index 1ddb8bbe..8f833f7d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterSampleTest.java
@@ -17,9 +17,7 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.InputStreamSupplier;
-import org.apache.commons.compress.utils.IOUtils;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -28,7 +26,9 @@ import java.io.InputStream;
import java.util.concurrent.ExecutionException;
import java.util.zip.ZipEntry;
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.jupiter.api.Test;
public class ScatterSampleTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
index a40ee770..0dbca662 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java
@@ -17,19 +17,19 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.parallel.InputStreamSupplier;
-import org.apache.commons.compress.utils.IOUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
+import static org.apache.commons.compress.AbstractTestCase.tryHardToDelete;
+import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.util.zip.ZipEntry;
-import static org.apache.commons.compress.AbstractTestCase.tryHardToDelete;
-import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
public class ScatterZipOutputStreamTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/StreamCompressorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/StreamCompressorTest.java
index c7de0b52..40bf2658 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/StreamCompressorTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/StreamCompressorTest.java
@@ -28,6 +28,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
+
import org.junit.jupiter.api.Test;
public class StreamCompressorTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
index 34031087..918f3c82 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
@@ -18,7 +18,8 @@
package org.apache.commons.compress.archivers.zip;
-import static java.nio.charset.StandardCharsets.*;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
index bae2acca..6521f9bb 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
@@ -17,12 +17,12 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.util.Date;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.Test;
public class X000A_NTFSTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
index 5dafc7cc..bdd54b3a 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
@@ -17,21 +17,6 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.TimeZone;
-import java.util.zip.ZipException;
-
import static org.apache.commons.compress.AbstractTestCase.getFile;
import static org.apache.commons.compress.AbstractTestCase.mkdir;
import static org.apache.commons.compress.AbstractTestCase.rmdir;
@@ -47,6 +32,21 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.TimeZone;
+import java.util.zip.ZipException;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class X5455_ExtendedTimestampTest {
private final static ZipShort X5455 = new ZipShort(0x5455);
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
index e43736c0..24eaef4b 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
@@ -18,14 +18,6 @@
*/
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.utils.ByteUtils;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.zip.ZipException;
-
import static org.apache.commons.compress.AbstractTestCase.getFile;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -33,6 +25,14 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.zip.ZipException;
+
+import org.apache.commons.compress.utils.ByteUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class X7875_NewUnixTest {
private final static ZipShort X7875 = new ZipShort(0x7875);
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
index 0d825f8a..7c47eb32 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
@@ -32,9 +32,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import org.apache.commons.compress.utils.ByteUtils;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.rules.ExpectedException;
/**
* JUnit testcases for org.apache.commons.compress.archivers.zip.ZipEntry.
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
index fe8ee996..740a984c 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
@@ -48,9 +48,7 @@ import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.jupiter.api.Test;
-import org.junit.rules.ExpectedException;
public class ZipArchiveInputStreamTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipClassCoverageTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipClassCoverageTest.java
index 2afb248f..cd366b2b 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipClassCoverageTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipClassCoverageTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.commons.compress.archivers.zip;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.hamcrest.MatcherAssert.assertThat;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+
import org.hamcrest.core.IsInstanceOf;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
index 41ddbdb3..25a926d0 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
@@ -19,14 +19,15 @@
package org.apache.commons.compress.archivers.zip;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+
import org.hamcrest.core.IsInstanceOf;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
index 91056d61..e99c635b 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
@@ -18,20 +18,19 @@
package org.apache.commons.compress.archivers.zip;
-import org.apache.commons.compress.AbstractTestCase;
-import org.apache.commons.compress.utils.IOUtils;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.util.Enumeration;
+import org.apache.commons.compress.AbstractTestCase;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
public class ZipFileIgnoringLocalFileHeaderTest {
private File dir;
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
index 9a470b3f..d0540bdb 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
@@ -18,12 +18,12 @@
package org.apache.commons.compress.archivers.zip;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotSame;
+import org.junit.jupiter.api.Test;
+
/**
* JUnit testcases for org.apache.commons.compress.archivers.zip.ZipLong.
*
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
index 7f1d9060..ac969621 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
@@ -18,16 +18,12 @@
package org.apache.commons.compress.archivers.zip;
-import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
-import org.apache.commons.compress.archivers.ArchiveException;
-import org.apache.commons.compress.archivers.ArchiveOutputStream;
-import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.apache.commons.compress.parallel.InputStreamSupplier;
-import org.apache.commons.compress.utils.IOUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.compress.AbstractTestCase.getPath;
+import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -39,17 +35,28 @@ import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.zip.Deflater;
import java.util.zip.ZipEntry;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.compress.AbstractTestCase.getPath;
-import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertArrayEquals;
+import org.apache.commons.compress.archivers.ArchiveException;
+import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
public class ZipMemoryFileSystemTest {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
index 4b219e80..29c5ca08 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
@@ -18,12 +18,12 @@
package org.apache.commons.compress.archivers.zip;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotSame;
+import org.junit.jupiter.api.Test;
+
/**
* JUnit testcases for org.apache.commons.compress.archivers.zip.ZipShort.
*
diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java
index f8b253f8..a722d3a9 100644
--- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.commons.compress.compressors.bzip2;
-import org.apache.commons.compress.AbstractTestCase;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Files;
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.compress.AbstractTestCase;
+import org.junit.jupiter.api.Test;
public class BZip2NSelectorsOverflowTest extends AbstractTestCase {
diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
index 941b1e0e..4ae6fdcc 100644
--- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.commons.compress.compressors.bzip2;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class BlockSortTest {
private static final byte[] FIXTURE = { 0, 1, (byte) 252, (byte) 253, (byte) 255,
diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java
index f6f80963..61c50442 100644
--- a/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java
+++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/PythonTruncatedBzip2Test.java
@@ -29,8 +29,9 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
-import org.junit.jupiter.api.AfterEach;
+
import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStreamTest.java
index 4d51e35c..4d7fa241 100644
--- a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStreamTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.commons.compress.compressors.deflate;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+
public class DeflateCompressorOutputStreamTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateParametersTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateParametersTest.java
index 7d80efb4..3a4d5fe0 100644
--- a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateParametersTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateParametersTest.java
@@ -20,8 +20,6 @@ package org.apache.commons.compress.compressors.deflate;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import java.io.IOException;
-
import org.junit.Assert;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoderTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoderTest.java
index 5490112a..21236a9d 100644
--- a/src/test/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoderTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoderTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.commons.compress.compressors.deflate64;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.jupiter.api.Test;
public class HuffmanDecoderTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java b/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java
index 51beb1ac..37fe05fe 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java
@@ -22,13 +22,11 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
-import java.util.Arrays;
import java.util.stream.Stream;
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java b/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
index 3bba056d..6bd1b84c 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.commons.compress.compressors.lz77support;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,11 +30,6 @@ import java.util.List;
import org.junit.jupiter.api.Test;
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
public class LZ77CompressorTest {
private static final byte[] BLA, SAM, ONE_TO_TEN;
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz77support/ParametersTest.java b/src/test/java/org/apache/commons/compress/compressors/lz77support/ParametersTest.java
index 49d6f4ca..cc81bb0b 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz77support/ParametersTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz77support/ParametersTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.commons.compress.compressors.lz77support;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class ParametersTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
index 5f5f9fc3..576de871 100644
--- a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.util.Random;
+
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.compressors.lz77support.Parameters;
import org.apache.commons.compress.utils.IOUtils;
diff --git a/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStreamTest.java
index 22b38906..f0cf69df 100644
--- a/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStreamTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.commons.compress.compressors.xz;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
index 145bf723..614637a1 100644
--- a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.commons.compress.compressors.z;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
+import static org.apache.commons.compress.AbstractTestCase.getFile;
+import static org.junit.Assert.assertThrows;
import java.io.File;
import java.io.IOException;
@@ -27,10 +27,10 @@ import java.io.InputStream;
import java.io.SequenceInputStream;
import java.nio.file.Files;
import java.util.Collections;
-import org.apache.commons.compress.utils.IOUtils;
-import static org.apache.commons.compress.AbstractTestCase.getFile;
-import static org.junit.Assert.assertThrows;
+import org.apache.commons.compress.utils.IOUtils;
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for class {@link ZCompressorInputStream}.
diff --git a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
index 6331665b..a1e4f15c 100644
--- a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
@@ -27,8 +27,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
-import com.github.luben.zstd.NoPool;
-import com.github.luben.zstd.RecyclingBufferPool;
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.compressors.CompressorInputStream;
import org.apache.commons.compress.compressors.CompressorStreamFactory;
@@ -36,6 +34,9 @@ import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
+import com.github.luben.zstd.NoPool;
+import com.github.luben.zstd.RecyclingBufferPool;
+
public class ZstdCompressorInputStreamTest extends AbstractTestCase {
/**
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
index e3813989..b7b4c8b1 100755
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
@@ -19,7 +19,6 @@ package org.apache.commons.compress.harmony.pack200.tests;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,13 +31,13 @@ import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Archive;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.pack200.PackingOptions;
import org.apache.commons.compress.harmony.unpack200.Segment;
+import junit.framework.TestCase;
+
public class ArchiveTest extends TestCase {
JarFile in;
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java
index c1ed06cb..037cf7b3 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java
@@ -20,13 +20,13 @@ import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.CodecEncoding;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import junit.framework.TestCase;
+
/**
* Tests for BHSDCodec
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java
index d050ec30..9617afd5 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java
@@ -22,8 +22,6 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.CodecEncoding;
@@ -31,6 +29,8 @@ import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.pack200.PopulationCodec;
import org.apache.commons.compress.harmony.pack200.RunCodec;
+import junit.framework.TestCase;
+
/**
*
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java
index f71df8e5..bc8b9fa0 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java
@@ -20,13 +20,13 @@ import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.CanonicalCodecFamilies;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import junit.framework.TestCase;
+
/**
*
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java
index b29b68be..f9ad89fa 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java
@@ -31,12 +31,12 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Archive;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.pack200.PackingOptions;
+import junit.framework.TestCase;
+
/**
* Test different options for packing a Jar file
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java
index 1185b8e9..13c960b2 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java
@@ -20,13 +20,13 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.pack200.PopulationCodec;
+import junit.framework.TestCase;
+
public class PopulationCodecTest extends TestCase {
public void testPopulationCodec() throws IOException, Pack200Exception {
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java
index baa2df24..278b6289 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java
@@ -18,14 +18,14 @@ package org.apache.commons.compress.harmony.pack200.tests;
import java.io.ByteArrayInputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.pack200.PopulationCodec;
import org.apache.commons.compress.harmony.pack200.RunCodec;
+import junit.framework.TestCase;
+
/**
* Test for RunCodec
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java
index 5ccc9413..5ee7b887 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.unpack200.AttrDefinitionBands;
import org.apache.commons.compress.harmony.unpack200.AttributeLayoutMap;
@@ -25,6 +23,8 @@ import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.compress.harmony.unpack200.SegmentHeader;
import org.apache.commons.compress.harmony.unpack200.SegmentOptions;
+import junit.framework.TestCase;
+
/**
*
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
index 75218b71..60af73bb 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
@@ -32,10 +32,10 @@ import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.Archive;
+import junit.framework.TestCase;
+
/**
* Tests for org.apache.commons.compress.harmony.unpack200.Archive, which is the main class for
* unpack200.
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
index 168e1306..ec6bd4c9 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.unpack200.AttributeLayout;
import org.apache.commons.compress.harmony.unpack200.AttributeLayoutMap;
+import junit.framework.TestCase;
+
public class AttributeLayoutMapTest extends TestCase {
public void testRepeatable() throws Pack200Exception {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
index 6f8693af..484ecb45 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.unpack200.AttributeLayout;
@@ -26,6 +24,8 @@ import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import junit.framework.TestCase;
+
public class AttributeLayoutTest extends TestCase {
public class TestSegment extends Segment {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
index ef2f6d75..a3ea6e70 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
@@ -20,8 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
@@ -29,6 +27,8 @@ import org.apache.commons.compress.harmony.unpack200.BandSet;
import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.compress.harmony.unpack200.SegmentHeader;
+import junit.framework.TestCase;
+
public class BandSetTest extends TestCase {
public class MockSegment extends Segment {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
index 3739139b..084c00cb 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
+import junit.framework.TestCase;
+
public class CPUTF8Test extends TestCase {
public void testEquality() {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
index b8f8e5c8..0bcdb5eb 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
@@ -19,8 +19,6 @@ package org.apache.commons.compress.harmony.unpack200.tests;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.CpBands;
import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
@@ -33,6 +31,8 @@ import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
import org.apache.commons.compress.harmony.unpack200.bytecode.LocalVariableTableAttribute;
import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
+import junit.framework.TestCase;
+
/**
* Tests for CodeAttribute
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
index 47e58126..42c57644 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.IcTuple;
+import junit.framework.TestCase;
+
public class ICTupleTest extends TestCase {
public void testPredictedClassTupleParsing() {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
index dfce9365..232c1057 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
@@ -19,10 +19,10 @@ package org.apache.commons.compress.harmony.unpack200.tests;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.SegmentConstantPoolArrayCache;
+import junit.framework.TestCase;
+
public class SegmentConstantPoolArrayCacheTest extends TestCase {
public void testSingleSimpleArray() {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
index e2599f89..56aa4b3f 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.CpBands;
import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import junit.framework.TestCase;
+
/**
* Tests for org.apache.commons.compress.harmony.unpack200.SegmentConstantPool.
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
index a7883713..28f1cdbe 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.unpack200.SegmentOptions;
+import junit.framework.TestCase;
+
/**
*
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
index aad32ddb..c873fa33 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
@@ -26,10 +26,10 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.Segment;
+import junit.framework.TestCase;
+
/**
* Tests for org.apache.commons.compress.harmony.unpack200.Segment.
*/
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
index 3f3ef406..7a370735 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.IMatcher;
import org.apache.commons.compress.harmony.unpack200.SegmentUtils;
+import junit.framework.TestCase;
+
public class SegmentUtilsTest extends TestCase {
private static class MultipleMatches implements IMatcher {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
index 743b3844..9d5873e0 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import junit.framework.TestCase;
+
public class ByteCodeTest extends TestCase {
public void testByteCode() {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
index c71e5fe6..a603a1d0 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
@@ -27,6 +25,8 @@ import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
import org.apache.commons.compress.harmony.unpack200.bytecode.SourceFileAttribute;
+import junit.framework.TestCase;
+
public class ClassFileEntryTest extends TestCase {
public void testUTF8() {
diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
index 92ac8a51..c3ff144b 100644
--- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPMember;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
import org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool;
+import junit.framework.TestCase;
+
public class ConstantPoolTest extends TestCase {
private ClassConstantPool pool;
diff --git a/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
index 73a3210c..f1381a15 100644
--- a/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
@@ -17,13 +17,13 @@
*/
package org.apache.commons.compress.utils;
-import org.junit.jupiter.api.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class BoundedSeekableByteChannelInputStreamTest {
diff --git a/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
index 565b04af..c937ed3d 100644
--- a/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.compress.utils;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -24,9 +26,7 @@ import java.io.IOException;
import java.util.zip.Adler32;
import java.util.zip.CRC32;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThrows;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for class {@link ChecksumCalculatingInputStream org.apache.commons.compress.utils.ChecksumCalculatingInputStream}.
diff --git a/src/test/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStreamTest.java
index 96c60013..efaeb2cd 100644
--- a/src/test/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStreamTest.java
@@ -16,16 +16,16 @@
*/
package org.apache.commons.compress.utils;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.zip.Adler32;
import java.util.zip.CRC32;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for class {@link ChecksumVerifyingInputStream org.apache.commons.compress.utils.ChecksumVerifyingInputStream}.
diff --git a/src/test/java/org/apache/commons/compress/utils/CountingStreamTest.java b/src/test/java/org/apache/commons/compress/utils/CountingStreamTest.java
index 13049fe9..853d432b 100644
--- a/src/test/java/org/apache/commons/compress/utils/CountingStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/CountingStreamTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.commons.compress.utils;
-import org.junit.jupiter.api.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import org.junit.jupiter.api.Test;
+
public class CountingStreamTest {
@Test
diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
index d32d335a..57a16b07 100644
--- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.commons.compress.utils;
-import static java.nio.charset.StandardCharsets.*;
+import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
index 49fa601b..2ada639a 100644
--- a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
@@ -23,8 +23,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.FilterInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.ByteBuffer;
import java.nio.channels.ReadableByteChannel;
diff --git a/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java b/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
index 6fd0381a..821dadea 100644
--- a/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
@@ -18,8 +18,11 @@
*/
package org.apache.commons.compress.utils;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -27,11 +30,8 @@ import java.nio.channels.ClosedChannelException;
import java.nio.channels.SeekableByteChannel;
import java.util.Arrays;
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class SeekableInMemoryByteChannelTest {
diff --git a/src/test/java/org/apache/commons/compress/utils/SkipShieldingInputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/SkipShieldingInputStreamTest.java
index 3d09a62a..3f504868 100644
--- a/src/test/java/org/apache/commons/compress/utils/SkipShieldingInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/SkipShieldingInputStreamTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.compress.utils;
import java.io.IOException;
import java.io.InputStream;
+
import org.junit.Assert;
import org.junit.jupiter.api.Test;
[commons-compress] 05/05: Use try-with-resources
Posted by gg...@apache.org.
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 f435b58156ec1c2fe68623fd964f6cb50ca07b7f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Sep 30 11:27:57 2022 -0400
Use try-with-resources
---
.../compress/harmony/pack200/PackingUtils.java | 68 +++++++++++-----------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index 5d7a5187..3e029146 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -92,25 +92,25 @@ public class PackingUtils {
* @throws IOException If an I/O error occurs.
*/
public static void copyThroughJar(final JarInputStream jarInputStream, final OutputStream outputStream)
- throws IOException {
- final Manifest manifest = jarInputStream.getManifest();
- final JarOutputStream jarOutputStream = new JarOutputStream(outputStream, manifest);
- jarOutputStream.setComment("PACK200");
- log("Packed " + JarFile.MANIFEST_NAME);
-
- final byte[] bytes = new byte[16384];
- JarEntry jarEntry;
- int bytesRead;
- while ((jarEntry = jarInputStream.getNextJarEntry()) != null) {
- jarOutputStream.putNextEntry(jarEntry);
- while ((bytesRead = jarInputStream.read(bytes)) != -1) {
- jarOutputStream.write(bytes, 0, bytesRead);
- }
- log("Packed " + jarEntry.getName());
- }
- jarInputStream.close();
- jarOutputStream.close();
- }
+ throws IOException {
+ final Manifest manifest = jarInputStream.getManifest();
+ try (final JarOutputStream jarOutputStream = new JarOutputStream(outputStream, manifest)) {
+ jarOutputStream.setComment("PACK200");
+ log("Packed " + JarFile.MANIFEST_NAME);
+
+ final byte[] bytes = new byte[16384];
+ JarEntry jarEntry;
+ int bytesRead;
+ while ((jarEntry = jarInputStream.getNextJarEntry()) != null) {
+ jarOutputStream.putNextEntry(jarEntry);
+ while ((bytesRead = jarInputStream.read(bytes)) != -1) {
+ jarOutputStream.write(bytes, 0, bytesRead);
+ }
+ log("Packed " + jarEntry.getName());
+ }
+ jarInputStream.close();
+ }
+ }
/**
* When effort is 0, the packer copys through the original jar file without compression
@@ -120,24 +120,24 @@ public class PackingUtils {
* @throws IOException If an I/O error occurs.
*/
public static void copyThroughJar(final JarFile jarFile, final OutputStream outputStream) throws IOException {
- final JarOutputStream jarOutputStream = new JarOutputStream(outputStream);
- jarOutputStream.setComment("PACK200");
- final byte[] bytes = new byte[16384];
- final Enumeration<JarEntry> entries = jarFile.entries();
- while (entries.hasMoreElements()) {
- JarEntry jarEntry = entries.nextElement();
- jarOutputStream.putNextEntry(jarEntry);
- try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
- int bytesRead;
- while ((bytesRead = inputStream.read(bytes)) != -1) {
- jarOutputStream.write(bytes, 0, bytesRead);
+ try (final JarOutputStream jarOutputStream = new JarOutputStream(outputStream)) {
+ jarOutputStream.setComment("PACK200");
+ final byte[] bytes = new byte[16384];
+ final Enumeration<JarEntry> entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry jarEntry = entries.nextElement();
+ jarOutputStream.putNextEntry(jarEntry);
+ try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
+ int bytesRead;
+ while ((bytesRead = inputStream.read(bytes)) != -1) {
+ jarOutputStream.write(bytes, 0, bytesRead);
+ }
+ jarOutputStream.closeEntry();
+ log("Packed " + jarEntry.getName());
}
- jarOutputStream.closeEntry();
- log("Packed " + jarEntry.getName());
}
+ jarFile.close();
}
- jarFile.close();
- jarOutputStream.close();
}
public static List<PackingFile> getPackingFileListFromJar(final JarInputStream jarInputStream, final boolean keepFileOrder)