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 01bfe33566113d07f6ff4fce953222b09846dc99 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Dec 11 01:34:04 2022 -0500 Remove unused imports No star imports Order imports --- .../compress/archivers/arj/ArjArchiveEntry.java | 1 + .../compress/archivers/sevenz/AES256Options.java | 1 + .../archivers/sevenz/SevenZArchiveEntry.java | 2 +- .../archivers/sevenz/SevenZOutputFile.java | 1 + .../commons/compress/archivers/zip/X000A_NTFS.java | 4 ++-- .../commons/compress/archivers/SevenZTestCase.java | 6 ++++-- .../compress/archivers/sevenz/SevenZFileTest.java | 11 ++++++++++- .../archivers/sevenz/SevenZOutputFileTest.java | 7 +++---- .../compress/archivers/zip/DataDescriptorTest.java | 2 -- .../commons/compress/utils/TimeUtilsTest.java | 22 ++++++++++++++-------- 10 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java index 165e4855..5c966faf 100644 --- a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java @@ -19,6 +19,7 @@ package org.apache.commons.compress.archivers.arj; import java.io.File; import java.util.Date; + import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipUtil; diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256Options.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256Options.java index ba23a135..fbfb00b6 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256Options.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256Options.java @@ -20,6 +20,7 @@ package org.apache.commons.compress.archivers.sevenz; import java.security.GeneralSecurityException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; + import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java index 356628dd..70ff3b14 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java @@ -17,8 +17,8 @@ */ package org.apache.commons.compress.archivers.sevenz; -import java.util.Arrays; import java.nio.file.attribute.FileTime; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.Iterator; 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 14080640..89461f49 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 @@ -51,6 +51,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; import java.util.zip.CRC32; + import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.utils.CountingOutputStream; import org.apache.commons.compress.utils.TimeUtils; diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java index 2185edd9..af36e778 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java @@ -17,13 +17,13 @@ */ package org.apache.commons.compress.archivers.zip; -import org.apache.commons.compress.utils.TimeUtils; - import java.nio.file.attribute.FileTime; import java.util.Date; import java.util.Objects; import java.util.zip.ZipException; +import org.apache.commons.compress.utils.TimeUtils; + /** * NTFS extra field that was thought to store various attributes but * in reality only stores timestamps. 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 704addc8..c25b4d2d 100644 --- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java @@ -17,6 +17,10 @@ */ package org.apache.commons.compress.archivers; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -36,8 +40,6 @@ import org.junit.Assume; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; - public class SevenZTestCase extends AbstractTestCase { private File output; diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java index 94767466..90da9a3f 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java @@ -38,8 +38,17 @@ import java.nio.file.Path; import java.nio.file.attribute.FileTime; import java.security.NoSuchAlgorithmException; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.function.Function; + import javax.crypto.Cipher; import org.apache.commons.compress.AbstractTestCase; 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 53b16543..c3199040 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 @@ -26,9 +26,6 @@ import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.apache.commons.compress.utils.TimeUtils; -import org.junit.jupiter.api.Test; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -36,8 +33,8 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; import java.time.Instant; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.Date; @@ -47,6 +44,8 @@ import org.apache.commons.compress.AbstractTestCase; import org.apache.commons.compress.PasswordRequiredException; import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; +import org.apache.commons.compress.utils.TimeUtils; +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/zip/DataDescriptorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/DataDescriptorTest.java index 0b5596a8..9a602efb 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 @@ -27,12 +27,10 @@ import static org.junit.Assert.assertNotEquals; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.util.Arrays; -import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java index c65c93b4..d94c26fb 100644 --- a/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/utils/TimeUtilsTest.java @@ -17,20 +17,26 @@ */ package org.apache.commons.compress.utils; -import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; -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; +import static org.apache.commons.compress.utils.TimeUtils.HUNDRED_NANOS_PER_MILLISECOND; +import static org.apache.commons.compress.utils.TimeUtils.WINDOWS_EPOCH_OFFSET; +import static org.apache.commons.compress.utils.TimeUtils.ntfsTimeToDate; +import static org.apache.commons.compress.utils.TimeUtils.ntfsTimeToFileTime; +import static org.apache.commons.compress.utils.TimeUtils.toDate; +import static org.apache.commons.compress.utils.TimeUtils.toFileTime; +import static org.apache.commons.compress.utils.TimeUtils.toNtfsTime; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.nio.file.attribute.FileTime; import java.time.Instant; import java.util.Date; import java.util.stream.Stream; -import static org.apache.commons.compress.utils.TimeUtils.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; +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; public class TimeUtilsTest {