diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java index 217212ba4..673eda8aa 100755 --- a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java @@ -284,17 +284,20 @@ public void setIncludeEmptyDirs(final boolean includeEmptyDirs) { } @Override + @Deprecated public void addDirectory(@Nonnull final File directory) throws ArchiverException { addFileSet(fileSet(directory).prefixed("").includeExclude(null, null).includeEmptyDirs(includeEmptyDirs)); } @Override + @Deprecated public void addDirectory(@Nonnull final File directory, final String prefix) throws ArchiverException { addFileSet( fileSet(directory).prefixed(prefix).includeExclude(null, null).includeEmptyDirs(includeEmptyDirs)); } @Override + @Deprecated public void addDirectory(@Nonnull final File directory, final String[] includes, final String[] excludes) throws ArchiverException { addFileSet(fileSet(directory) @@ -304,6 +307,7 @@ public void addDirectory(@Nonnull final File directory, final String[] includes, } @Override + @Deprecated public void addDirectory( @Nonnull final File directory, final String prefix, final String[] includes, final String[] excludes) throws ArchiverException { @@ -613,6 +617,7 @@ private static void closeQuietlyIfCloseable(Object resource) { } @Override + @Deprecated public Map getFiles() { try { final Map map = new HashMap<>(); @@ -719,6 +724,7 @@ public void addArchivedFileSet(final ArchivedFileSet fileSet, Charset charset) t * @since 1.0-alpha-7 */ @Override + @Deprecated public void addArchivedFileSet( @Nonnull final File archiveFile, final String prefix, final String[] includes, final String[] excludes) throws ArchiverException { @@ -732,6 +738,7 @@ public void addArchivedFileSet( * @since 1.0-alpha-7 */ @Override + @Deprecated public void addArchivedFileSet(@Nonnull final File archiveFile, final String prefix) throws ArchiverException { addArchivedFileSet(archivedFileSet(archiveFile).prefixed(prefix).includeEmptyDirs(includeEmptyDirs)); } @@ -740,6 +747,7 @@ public void addArchivedFileSet(@Nonnull final File archiveFile, final String pre * @since 1.0-alpha-7 */ @Override + @Deprecated public void addArchivedFileSet(@Nonnull final File archiveFile, final String[] includes, final String[] excludes) throws ArchiverException { addArchivedFileSet( @@ -750,6 +758,7 @@ public void addArchivedFileSet(@Nonnull final File archiveFile, final String[] i * @since 1.0-alpha-7 */ @Override + @Deprecated public void addArchivedFileSet(@Nonnull final File archiveFile) throws ArchiverException { addArchivedFileSet(archivedFileSet(archiveFile).includeEmptyDirs(includeEmptyDirs)); } @@ -960,6 +969,7 @@ protected void cleanUp() throws IOException { * @since 1.1 */ @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; } @@ -968,6 +978,7 @@ public boolean isUseJvmChmod() { * @since 1.1 */ @Override + @Deprecated public void setUseJvmChmod(final boolean useJvmChmod) { this.useJvmChmod = useJvmChmod; } diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java index 6588f822e..c61327c59 100644 --- a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java @@ -241,6 +241,7 @@ protected boolean isSelected(final String fileName, final PlexusIoResource fileI * @since 1.1 */ @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; } @@ -251,6 +252,7 @@ public boolean isUseJvmChmod() { * @since 1.1 */ @Override + @Deprecated public void setUseJvmChmod(final boolean useJvmChmod) { this.useJvmChmod = useJvmChmod; } diff --git a/src/main/java/org/codehaus/plexus/archiver/Archiver.java b/src/main/java/org/codehaus/plexus/archiver/Archiver.java index 7f8ae3e24..578a668d0 100644 --- a/src/main/java/org/codehaus/plexus/archiver/Archiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/Archiver.java @@ -128,6 +128,7 @@ void addDirectory(@Nonnull File directory, String prefix, String[] includes, Str * * @deprecated Will go away in next major version */ + @Deprecated void addArchivedFileSet(@Nonnull File archiveFile) throws ArchiverException; /** @@ -261,6 +262,7 @@ void addArchivedFileSet(@Nonnull File archiveFile, String prefix, String[] inclu /** * @deprecated Use {@link #getResources()} */ + @Deprecated Map getFiles(); /** diff --git a/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java index 728337fba..95ec15223 100644 --- a/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java @@ -7,7 +7,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; @@ -31,7 +30,7 @@ public class PlexusIoBzip2ResourceCollection extends PlexusIoCompressedFileResou @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + return new FileAttributes(file); } @Override diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java index fafdcd3f4..f081c5178 100644 --- a/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java @@ -222,6 +222,7 @@ public ResourceIterator getResources() throws ArchiverException { } @Override + @Deprecated public Map getFiles() { return target.getFiles(); } diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/DryRunArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/DryRunArchiver.java index bc984eb1d..8ecd4b5db 100644 --- a/src/main/java/org/codehaus/plexus/archiver/diags/DryRunArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/diags/DryRunArchiver.java @@ -64,6 +64,7 @@ private void debug(final String message) { * {@inheritDoc} */ @Override + @Deprecated public void addArchivedFileSet(final @Nonnull File archiveFile, final String prefix) throws ArchiverException { debug("DRY RUN: Skipping delegated call to: " + getMethodName()); } @@ -115,6 +116,7 @@ public void addSymlink(String symlinkName, int permissions, String symlinkDestin * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final @Nonnull File directory, final String prefix) throws ArchiverException { debug("DRY RUN: Skipping delegated call to: " + getMethodName()); } @@ -123,6 +125,7 @@ public void addDirectory(final @Nonnull File directory, final String prefix) thr * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final @Nonnull File directory, final String[] includes, final String[] excludes) throws ArchiverException { debug("DRY RUN: Skipping delegated call to: " + getMethodName()); @@ -132,6 +135,7 @@ public void addDirectory(final @Nonnull File directory, final String[] includes, * {@inheritDoc} */ @Override + @Deprecated public void addDirectory(final @Nonnull File directory) throws ArchiverException { debug("DRY RUN: Skipping delegated call to: " + getMethodName()); } diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java index 2c024ae07..5b57d4f33 100644 --- a/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java @@ -55,9 +55,11 @@ public void addDirectory(@Nonnull File directory) throws ArchiverException {} public void addDirectory(@Nonnull File directory, String prefix) throws ArchiverException {} @Override + @Deprecated public void addDirectory(@Nonnull File directory, String[] includes, String[] excludes) throws ArchiverException {} @Override + @Deprecated public void addDirectory(@Nonnull File directory, String prefix, String[] includes, String[] excludes) throws ArchiverException {} @@ -78,15 +80,18 @@ public void addFile(@Nonnull File inputFile, @Nonnull String destFileName, int p throws ArchiverException {} @Override + @Deprecated public void addArchivedFileSet(@Nonnull File archiveFile) throws ArchiverException {} @Override + @Deprecated public void addArchivedFileSet(@Nonnull File archiveFile, String prefix) throws ArchiverException {} @Override public void addArchivedFileSet(File archiveFile, String[] includes, String[] excludes) throws ArchiverException {} @Override + @Deprecated public void addArchivedFileSet(@Nonnull File archiveFile, String prefix, String[] includes, String[] excludes) throws ArchiverException {} @@ -186,6 +191,7 @@ public void remove() { } @Override + @Deprecated public Map getFiles() { return Collections.emptyMap(); } @@ -212,11 +218,13 @@ public String getDuplicateBehavior() { public void setDuplicateBehavior(String duplicate) {} @Override + @Deprecated public void setUseJvmChmod(boolean useJvmChmod) { this.useJvmChmod = useJvmChmod; } @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; } diff --git a/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java b/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java index 4d951de1a..a15cee1b2 100644 --- a/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java @@ -68,17 +68,20 @@ public void addDirectory(final @Nonnull File directory) throws ArchiverException } @Override + @Deprecated public void addDirectory(final @Nonnull File directory, final String prefix) throws ArchiverException { added.add(new Addition(directory, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE)); } @Override + @Deprecated public void addDirectory(final @Nonnull File directory, final String[] includes, final String[] excludes) throws ArchiverException { added.add(new Addition(directory, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE)); } @Override + @Deprecated public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes, final String[] excludes) throws ArchiverException { @@ -107,6 +110,7 @@ public void addArchivedFileSet(final @Nonnull File archiveFile) throws ArchiverE } @Override + @Deprecated public void addArchivedFileSet(final @Nonnull File archiveFile, final String prefix) throws ArchiverException { added.add(new Addition(archiveFile, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE)); } @@ -122,12 +126,14 @@ public void addSymlink(String s, int i, String s2) throws ArchiverException { } @Override + @Deprecated public void addArchivedFileSet(final File archiveFile, final String[] includes, final String[] excludes) throws ArchiverException { added.add(new Addition(archiveFile, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE)); } @Override + @Deprecated public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes, final String[] excludes) throws ArchiverException { @@ -223,6 +229,7 @@ public void setDotFileDirectory(final File dotFileDirectory) {} } @Override + @Deprecated public Map getFiles() { return new HashMap<>(); } @@ -306,11 +313,13 @@ public Addition( } @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; } @Override + @Deprecated public void setUseJvmChmod(final boolean useJvmChmod) { this.useJvmChmod = useJvmChmod; } diff --git a/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java index 96c848f11..99f56c8e2 100644 --- a/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java @@ -6,7 +6,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import java.util.zip.GZIPInputStream; import org.codehaus.plexus.components.io.attributes.FileAttributes; @@ -36,6 +35,6 @@ protected InputStream getInputStream(File file) throws IOException { @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + return new FileAttributes(file); } } diff --git a/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java index e574e2e23..729845552 100644 --- a/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java @@ -672,7 +672,10 @@ private void grabFilesAndDirs(String file, List dirs, List files } else if (zipFile.isDirectory()) { getLogger().info("JarArchiver skipping indexJar " + zipFile + " because it is not a jar"); } else { - try (ZipFile zf = new ZipFile(file, "utf-8")) { + try (ZipFile zf = ZipFile.builder() + .setFile(file) + .setCharset(StandardCharsets.UTF_8) + .get()) { Enumeration entries = zf.getEntries(); HashSet dirSet = new HashSet<>(); while (entries.hasMoreElements()) { diff --git a/src/main/java/org/codehaus/plexus/archiver/jar/JarToolModularJarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/jar/JarToolModularJarArchiver.java index 078efa16c..2510a81c1 100644 --- a/src/main/java/org/codehaus/plexus/archiver/jar/JarToolModularJarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/jar/JarToolModularJarArchiver.java @@ -281,7 +281,7 @@ private boolean isJarDateOptionSupported(Method runMethod) { // Test the output code validating the --date option. String[] args = {"--date", "2099-12-31T23:59:59Z", "--version"}; - PrintStream nullPrintStream = NullPrintStream.NULL_PRINT_STREAM; + PrintStream nullPrintStream = NullPrintStream.INSTANCE; Integer result = (Integer) runMethod.invoke(jarTool, nullPrintStream, nullPrintStream, args); return result != null && result.intValue() == 0; diff --git a/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java index a7f8d7156..c68b88ed5 100644 --- a/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/snappy/PlexusIoSnappyResourceCollection.java @@ -7,7 +7,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.components.io.attributes.FileAttributes; @@ -29,7 +28,7 @@ public class PlexusIoSnappyResourceCollection extends PlexusIoCompressedFileReso @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + return new FileAttributes(file); } @Override diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarFile.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarFile.java index becbe3113..a0f544ea2 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarFile.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarFile.java @@ -72,7 +72,7 @@ public Enumeration getEntrie public boolean hasMoreElements() { if (!currentEntryValid) { try { - currentEntry = inputStream.getNextTarEntry(); + currentEntry = inputStream.getNextEntry(); } catch (IOException e) { throw new UndeclaredThrowableException(e); } @@ -155,7 +155,7 @@ private void open() throws IOException { private boolean findEntry(TarArchiveEntry entry, TarArchiveEntry currentEntry) throws IOException { for (; ; ) { - this.currentEntry = inputStream.getNextTarEntry(); + this.currentEntry = inputStream.getNextEntry(); if (this.currentEntry == null || (currentEntry != null && this.currentEntry.equals(currentEntry))) { return false; } diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java index 507cb6cb6..8ff360de7 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java @@ -96,7 +96,7 @@ protected void execute(File sourceFile, File destDirectory, FileMapper[] fileMap try (TarArchiveInputStream tis = new TarArchiveInputStream( decompress(compression, sourceFile, bufferedInputStream(fileInputStream(sourceFile))))) { TarArchiveEntry te; - while ((te = tis.getNextTarEntry()) != null) { + while ((te = tis.getNextEntry()) != null) { TarResource fileInfo = new TarResource(tarFile, te); if (isSelected(te.getName(), fileInfo)) { final String symlinkDestination = te.isSymbolicLink() ? te.getLinkName() : null; diff --git a/src/main/java/org/codehaus/plexus/archiver/xz/PlexusIoXZResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/xz/PlexusIoXZResourceCollection.java index b6b39c6e9..bf3698420 100644 --- a/src/main/java/org/codehaus/plexus/archiver/xz/PlexusIoXZResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/xz/PlexusIoXZResourceCollection.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.components.io.attributes.FileAttributes; @@ -36,7 +35,7 @@ public class PlexusIoXZResourceCollection extends PlexusIoCompressedFileResource @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + return new FileAttributes(file); } @Override diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java index 4b2219de8..c2f3f5506 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java @@ -28,7 +28,6 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.input.BoundedInputStream; -import org.apache.commons.io.input.CountingInputStream; import org.codehaus.plexus.archiver.AbstractUnArchiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.components.io.resources.PlexusIoResource; @@ -154,7 +153,11 @@ private String resolveSymlink(ZipFile zf, ZipArchiveEntry ze) throws IOException @Override protected void execute(final String path, final File outputDirectory) throws ArchiverException { getLogger().debug("Expanding: " + getSourceFile() + " into " + outputDirectory); - try (ZipFile zipFile = new ZipFile(getSourceFile(), encoding, true)) { + try (ZipFile zipFile = ZipFile.builder() + .setFile(getSourceFile()) + .setCharset(encoding) + .setUseUnicodeExtraFields(true) + .get()) { long remainingSpace = maxOutputSize; final Enumeration e = zipFile.getEntriesInPhysicalOrder(); @@ -167,12 +170,14 @@ protected void execute(final String path, final File outputDirectory) throws Arc if (ze.getName().startsWith(path)) { try (InputStream in = zipFile.getInputStream(ze)) { - BoundedInputStream bis = new BoundedInputStream(in, remainingSpace + 1); - CountingInputStream cis = new CountingInputStream(bis); + BoundedInputStream bis = BoundedInputStream.builder() + .setInputStream(in) + .setMaxCount(remainingSpace + 1) + .get(); extractFile( getSourceFile(), outputDirectory, - cis, + bis, ze.getName(), new Date(ze.getTime()), ze.isDirectory(), @@ -180,7 +185,7 @@ protected void execute(final String path, final File outputDirectory) throws Arc resolveSymlink(zipFile, ze), getFileMappers()); - remainingSpace -= cis.getByteCount(); + remainingSpace -= bis.getCount(); if (remainingSpace < 0) { throw new ArchiverException("Maximum output size limit reached"); } diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java b/src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java index f2687c4ec..e431efe78 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java @@ -35,7 +35,7 @@ import org.apache.commons.compress.parallel.InputStreamSupplier; import org.apache.commons.compress.parallel.ScatterGatherBackingStore; import org.apache.commons.compress.parallel.ScatterGatherBackingStoreSupplier; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.codehaus.plexus.archiver.util.Streams; import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest; @@ -86,7 +86,6 @@ public static ScatterZipOutputStream createDeferred( * {@link #ConcurrentJarCreator(boolean, int) ConcurrentJarCreator(true, nThreads) }

* * @param nThreads The number of concurrent thread used to create the archive - * * @throws IOException */ public ConcurrentJarCreator(int nThreads) throws IOException { diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/OffloadingOutputStream.java b/src/main/java/org/codehaus/plexus/archiver/zip/OffloadingOutputStream.java index 115add4f4..a71d3053a 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/OffloadingOutputStream.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/OffloadingOutputStream.java @@ -97,6 +97,7 @@ public OffloadingOutputStream(int threshold, String prefix, String suffix) { * @throws java.io.IOException if an error occurs. */ @Override + @Deprecated protected OutputStream getStream() throws IOException { return currentOutputStream; } diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java index c0d729554..01cd38451 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java @@ -24,11 +24,15 @@ public class PlexusArchiverZipFileResourceCollection extends AbstractPlexusIoArc @Override protected Iterator getEntries() throws IOException { - final File f = getFile(); - if (f == null) { + final File file = getFile(); + if (file == null) { throw new IOException("The tar archive file has not been set."); } - final ZipFile zipFile = new ZipFile(f, charset != null ? charset.name() : "UTF8"); + + final ZipFile zipFile = ZipFile.builder() + .setFile(file) + .setCharset(charset != null ? charset : StandardCharsets.UTF_8) + .get(); return new CloseableIterator(zipFile); } diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java index b4767ddca..000797afc 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java @@ -67,7 +67,10 @@ public URL getResource(String name) { final URL url = new URL("jar:" + f.toURI().toURL() + "!/"); final JarFile jarFile = new JarFile(f); - final ZipFile zipFile = new ZipFile(f, charset != null ? charset.name() : "UTF8"); + final ZipFile zipFile = ZipFile.builder() + .setFile(f) + .setCharset(charset != null ? charset : StandardCharsets.UTF_8) + .get(); final Enumeration en = zipFile.getEntriesInPhysicalOrder(); return new ZipFileResourceIterator(en, url, jarFile, zipFile, urlClassLoader); } diff --git a/src/main/java/org/codehaus/plexus/archiver/zstd/PlexusIoZstdResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/zstd/PlexusIoZstdResourceCollection.java index d0ce8ec31..0166f1d7d 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zstd/PlexusIoZstdResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/archiver/zstd/PlexusIoZstdResourceCollection.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.components.io.attributes.FileAttributes; @@ -36,7 +35,7 @@ public class PlexusIoZstdResourceCollection extends PlexusIoCompressedFileResour @Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + return new FileAttributes(file); } @Override diff --git a/src/main/java/org/codehaus/plexus/archiver/zstd/ZstdCompressor.java b/src/main/java/org/codehaus/plexus/archiver/zstd/ZstdCompressor.java index c41557ab2..b67f9434d 100644 --- a/src/main/java/org/codehaus/plexus/archiver/zstd/ZstdCompressor.java +++ b/src/main/java/org/codehaus/plexus/archiver/zstd/ZstdCompressor.java @@ -44,11 +44,12 @@ public void setLevel(Integer level) { public void compress() throws ArchiverException { try { BufferedOutputStream outStream = bufferedOutputStream(fileOutputStream(getDestFile())); - if (level == null) { - zstdOut = new ZstdCompressorOutputStream(outStream); - } else { - zstdOut = new ZstdCompressorOutputStream(outStream, level); + ZstdCompressorOutputStream.Builder zstdOutBuilder = ZstdCompressorOutputStream.builder(); + zstdOutBuilder.setOutputStream(outStream); + if (level != null) { + zstdOutBuilder.setLevel(level); } + zstdOut = zstdOutBuilder.get(); compress(getSource(), zstdOut); } catch (IOException ioe) { throw new ArchiverException("Problem creating zstd " + ioe.getMessage(), ioe); diff --git a/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java b/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java index 3772b3f3f..9083628a2 100644 --- a/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java @@ -36,7 +36,9 @@ void testZipArchiver() throws Exception { File archive = createArchive(archiver, "zip"); org.apache.commons.compress.archivers.zip.ZipFile zf = - new org.apache.commons.compress.archivers.zip.ZipFile(archive); + org.apache.commons.compress.archivers.zip.ZipFile.builder() + .setFile(archive) + .get(); Enumeration e = zf.getEntries(); int entryCount = 0; diff --git a/src/test/java/org/codehaus/plexus/archiver/gzip/GZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/gzip/GZipArchiverTest.java index 4c10c99f0..b48f1d0c3 100644 --- a/src/test/java/org/codehaus/plexus/archiver/gzip/GZipArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/gzip/GZipArchiverTest.java @@ -26,7 +26,6 @@ import java.io.File; import java.io.InputStream; import java.nio.file.Files; -import java.util.Arrays; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -38,6 +37,7 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -95,7 +95,7 @@ void testCreateResourceCollection() throws Exception { final ZipEntry zipEntry = juZipFile.getEntry("prfx/target/output/pom.xml"); final InputStream archivePom = juZipFile.getInputStream(zipEntry); final InputStream pom = Files.newInputStream(pomFile.toPath()); - assertTrue(Arrays.equals(IOUtil.toByteArray(pom), IOUtil.toByteArray(archivePom))); + assertArrayEquals(IOUtil.toByteArray(pom), IOUtil.toByteArray(archivePom)); archivePom.close(); pom.close(); juZipFile.close(); diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java index 1ca3224cc..40fc162a4 100644 --- a/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java @@ -56,13 +56,15 @@ void testCreateArchiveWithIndexedJars() throws Exception { // read the index file back and check it looks like it ought to org.apache.commons.compress.archivers.zip.ZipFile zf = - new org.apache.commons.compress.archivers.zip.ZipFile(archiver2.getDestFile()); + org.apache.commons.compress.archivers.zip.ZipFile.builder() + .setFile(archiver2.getDestFile()) + .get(); ZipArchiveEntry indexEntry = zf.getEntry("META-INF/INDEX.LIST"); assertNotNull(indexEntry); InputStream bis = bufferedInputStream(zf.getInputStream(indexEntry)); - byte buf[] = new byte[1024]; + byte[] buf = new byte[1024]; int i = bis.read(buf); String res = new String(buf, 0, i); assertEquals( @@ -109,13 +111,15 @@ void testCreateArchiveWithIndexedJarsAndMetaInf() throws Exception { // read the index file back and check it looks like it ought to org.apache.commons.compress.archivers.zip.ZipFile zf = - new org.apache.commons.compress.archivers.zip.ZipFile(archiver2.getDestFile()); + org.apache.commons.compress.archivers.zip.ZipFile.builder() + .setFile(archiver2.getDestFile()) + .get(); ZipArchiveEntry indexEntry = zf.getEntry("META-INF/INDEX.LIST"); assertNotNull(indexEntry); InputStream bis = bufferedInputStream(zf.getInputStream(indexEntry)); - byte buf[] = new byte[1024]; + byte[] buf = new byte[1024]; int i = bis.read(buf); String res = new String(buf, 0, i); // System.out.println(res); diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java index 1a618199b..2bab6a158 100644 --- a/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java @@ -45,7 +45,7 @@ void testCreateManifestOnlyJar() throws IOException, ManifestException, Archiver } @Test - void testNonCompressed() throws IOException, ManifestException, ArchiverException { + void testNonCompressed() throws IOException, ArchiverException { File jarFile = new File("target/output/jarArchiveNonCompressed.jar"); JarArchiver archiver = getJarArchiver(); @@ -176,7 +176,9 @@ public void testReproducibleUmask() throws IOException, ParseException { archiver.createArchive(); try (org.apache.commons.compress.archivers.zip.ZipFile zip = - new org.apache.commons.compress.archivers.zip.ZipFile(jarFile.toFile())) { + org.apache.commons.compress.archivers.zip.ZipFile.builder() + .setFile(jarFile.toFile()) + .get()) { Enumeration entries = zip.getEntries(); while (entries.hasMoreElements()) { ZipArchiveEntry entry = entries.nextElement(); diff --git a/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java b/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java index ffe3fd2cd..06a421654 100644 --- a/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java @@ -38,9 +38,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrowsExactly; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Dan T. Tran @@ -109,9 +109,9 @@ void testReuseArchiver() throws Exception { Archiver newArchiver = manager.getArchiver("jar"); assertNotNull(newArchiver); - assertFalse(newArchiver.equals(archiver)); + assertNotEquals(newArchiver, archiver); - assertTrue(!newArchiver.getResources().hasNext()); + assertFalse(newArchiver.getResources().hasNext()); } @Test diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java index 615cd41be..548599a02 100644 --- a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java @@ -49,7 +49,6 @@ import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.IOUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -248,36 +247,34 @@ void createArchive(final int directoryMode, final int fileModes[]) throws Except archiver.createArchive(); - TarArchiveInputStream tis; - - tis = new TarArchiveInputStream( - bufferedInputStream(Files.newInputStream(archiver.getDestFile().toPath()))); - TarArchiveEntry te; + try (TarArchiveInputStream tis = new TarArchiveInputStream( + bufferedInputStream(Files.newInputStream(archiver.getDestFile().toPath())))) { + TarArchiveEntry te; - while ((te = tis.getNextTarEntry()) != null) { - if (te.isDirectory()) { - assertEquals( - directoryMode, - te.getMode() & UnixStat.PERM_MASK, - "un-expected tar-entry mode for [te.name=" + te.getName() + "]"); - } else if (te.isSymbolicLink()) { - assertEquals("../test_destination/", te.getLinkName()); - assertEquals("link_to_test_destinaton", te.getName()); - assertEquals(0640, te.getMode() & UnixStat.PERM_MASK); - } else { - if (te.getName().equals("one.txt")) { - assertEquals(oneFileMode, te.getMode() & UnixStat.PERM_MASK); - } else if (te.getName().equals("two.txt")) { - assertEquals(twoFileMode, te.getMode() & UnixStat.PERM_MASK); - } else { + while ((te = tis.getNextEntry()) != null) { + if (te.isDirectory()) { assertEquals( - defaultFileMode, + directoryMode, te.getMode() & UnixStat.PERM_MASK, "un-expected tar-entry mode for [te.name=" + te.getName() + "]"); + } else if (te.isSymbolicLink()) { + assertEquals("../test_destination/", te.getLinkName()); + assertEquals("link_to_test_destinaton", te.getName()); + assertEquals(0640, te.getMode() & UnixStat.PERM_MASK); + } else { + if (te.getName().equals("one.txt")) { + assertEquals(oneFileMode, te.getMode() & UnixStat.PERM_MASK); + } else if (te.getName().equals("two.txt")) { + assertEquals(twoFileMode, te.getMode() & UnixStat.PERM_MASK); + } else { + assertEquals( + defaultFileMode, + te.getMode() & UnixStat.PERM_MASK, + "un-expected tar-entry mode for [te.name=" + te.getName() + "]"); + } } } } - IOUtil.close(tis); } @Test @@ -302,7 +299,7 @@ void testCreateArchiveWithJiustASymlink() throws Exception { Files.newInputStream(archiver.getDestFile().toPath()))); TarArchiveEntry te; - while ((te = tis.getNextTarEntry()) != null) { + while ((te = tis.getNextEntry()) != null) { if (te.isDirectory()) { assertEquals( 0500, diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarRoundTripTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarRoundTripTest.java index 00d66acf4..38e638675 100644 --- a/src/test/java/org/codehaus/plexus/archiver/tar/TarRoundTripTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/tar/TarRoundTripTest.java @@ -54,7 +54,7 @@ void testLongRoundTripping() throws IOException { tos.close(); TarArchiveInputStream tis = new TarArchiveInputStream(new ByteArrayInputStream(buff.toByteArray())); - TarArchiveEntry tripped = tis.getNextTarEntry(); + TarArchiveEntry tripped = tis.getNextEntry(); assertEquals(LONG_NAME, tripped.getName(), "round-tripped name"); assertNull(tis.getNextEntry(), "no more entries"); tis.close(); diff --git a/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java b/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java index c0f27a5ce..60305f15e 100644 --- a/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtilsTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.HashMap; import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.junit.jupiter.api.Test; @@ -37,7 +36,7 @@ void testChmodWithJava7() throws Exception { } private void assert0770(File temp) throws IOException { - FileAttributes j7 = new FileAttributes(temp, new HashMap(), new HashMap()); + FileAttributes j7 = new FileAttributes(temp); assertTrue(j7.isGroupExecutable()); assertTrue(j7.isGroupReadable()); assertTrue(j7.isGroupWritable()); diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorTest.java index 41a1e42e8..be8a469cc 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorTest.java @@ -9,7 +9,7 @@ import org.apache.commons.compress.archivers.zip.UnixStat; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.codehaus.plexus.util.DirectoryScanner; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java index 9d69f45d2..4323aad76 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java @@ -51,7 +51,7 @@ 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.apache.commons.compress.utils.BoundedInputStream; +import org.apache.commons.io.input.BoundedInputStream; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.BasePlexusArchiverTest; @@ -115,7 +115,7 @@ void testImplicitPermissions() throws IOException { archiver.createArchive(); assertTrue(zipFile.exists()); - ZipFile zf = new ZipFile(zipFile); + ZipFile zf = ZipFile.builder().setFile(zipFile).get(); ZipArchiveEntry fizz = zf.getEntry("fizz/"); assertEquals(040641, fizz.getUnixMode()); ZipArchiveEntry pom = zf.getEntry("fizz/buzz/pom.xml"); @@ -140,7 +140,7 @@ void testOveriddenPermissions() throws IOException { archiver.createArchive(); assertTrue(zipFile.exists()); - ZipFile zf = new ZipFile(zipFile); + ZipFile zf = ZipFile.builder().setFile(zipFile).get(); ZipArchiveEntry fizz = zf.getEntry("symDir"); assertTrue(fizz.isUnixSymlink()); ZipArchiveEntry symR = zf.getEntry("symR"); @@ -224,7 +224,7 @@ void testCreateArchiveWithDetectedModes() throws Exception { archiver.addArchivedFileSet(zipFile); archiver.createArchive(); - ZipFile zf = new ZipFile(zipFile2); + ZipFile zf = ZipFile.builder().setFile(zipFile2).get(); for (String path : executablePaths) { ZipArchiveEntry ze = zf.getEntry(path); @@ -277,7 +277,7 @@ private ZipArchiver getZipArchiver(File destFile) { return zipArchiver; } - private ZipUnArchiver getZipUnArchiver(File testJar) throws Exception { + private ZipUnArchiver getZipUnArchiver(File testJar) { ZipUnArchiver zu = (ZipUnArchiver) lookup(UnArchiver.class, "zip"); zu.setSourceFile(testJar); return zu; @@ -314,7 +314,8 @@ void testRecompressAddedZips() throws Exception { FileUtils.removePath(zipFileRecompress.getPath()); zipArchiverRecompress.createArchive(); - final ZipFile zfRecompress = new ZipFile(zipFileRecompress); + final ZipFile zfRecompress = + ZipFile.builder().setFile(zipFileRecompress).get(); assertEquals(ZipEntry.DEFLATED, zfRecompress.getEntry("test.zip").getMethod()); assertEquals(ZipEntry.DEFLATED, zfRecompress.getEntry("test.jar").getMethod()); assertEquals(ZipEntry.DEFLATED, zfRecompress.getEntry("test.rar").getMethod()); @@ -330,7 +331,8 @@ void testRecompressAddedZips() throws Exception { FileUtils.removePath(zipFileDontRecompress.getPath()); zipArchiver.createArchive(); - final ZipFile zfDontRecompress = new ZipFile(zipFileDontRecompress); + final ZipFile zfDontRecompress = + ZipFile.builder().setFile(zipFileDontRecompress).get(); final ZipArchiveEntry zipEntry = zfDontRecompress.getEntry("test.zip"); final ZipArchiveEntry jarEntry = zfDontRecompress.getEntry("test.jar"); final ZipArchiveEntry rarEntry = zfDontRecompress.getEntry("test.rar"); @@ -367,7 +369,10 @@ void testAddArchivedFileSet() throws Exception { @Nonnull public InputStream transform(@Nonnull PlexusIoResource resource, @Nonnull InputStream inputStream) throws IOException { - return new BoundedInputStream(inputStream, 3); + return BoundedInputStream.builder() + .setInputStream(inputStream) + .setMaxCount(3) + .get(); } }; sfd.setStreamTransformer(is); @@ -386,7 +391,7 @@ public InputStream transform(@Nonnull PlexusIoResource resource, @Nonnull InputS destFile, "prefixUsers/kristian/lsrc/plexus/plexus-archiver/src/main/java/org/codehaus/plexus/archiver/zip/ZipArchiver.java"); assertTrue(a3byteFile.exists()); - assertTrue(a3byteFile.length() == 3); + assertEquals(3, a3byteFile.length()); } @Test @@ -397,7 +402,10 @@ void testCreateArchiveWithStreamTransformer() throws IOException { @Override public InputStream transform(@Nonnull PlexusIoResource resource, @Nonnull InputStream inputStream) throws IOException { - return new BoundedInputStream(inputStream, 3); + return BoundedInputStream.builder() + .setInputStream(inputStream) + .setBufferSizeMax(3) + .get(); } }; @@ -422,7 +430,7 @@ public InputStream transform(@Nonnull PlexusIoResource resource, @Nonnull InputS zipArchiver.createArchive(); } - private ZipArchiver newArchiver(String name) throws Exception { + private ZipArchiver newArchiver(String name) { ZipArchiver archiver = getZipArchiver(getTestFile("target/output/" + name)); archiver.setFileMode(0640); @@ -451,12 +459,12 @@ private void fileModeAssert(int expected, int actual) { private void createArchive(ZipArchiver archiver) throws ArchiverException, IOException { archiver.createArchive(); - ZipFile zf = new ZipFile(archiver.getDestFile()); + ZipFile zf = ZipFile.builder().setFile(archiver.getDestFile()).get(); - Enumeration e = zf.getEntries(); + Enumeration e = zf.getEntries(); while (e.hasMoreElements()) { - ZipArchiveEntry ze = (ZipArchiveEntry) e.nextElement(); + ZipArchiveEntry ze = e.nextElement(); if (ze.isDirectory()) { if (ze.getName().startsWith("worldwritable")) { fileModeAssert(0777, UnixStat.PERM_MASK & ze.getUnixMode()); @@ -529,8 +537,8 @@ void testSymlinkArchivedFileSet() throws Exception { zipArchiver.addArchivedFileSet(zipFile); zipArchiver.createArchive(); - final ZipFile cmp1 = new ZipFile(zipFile); - final ZipFile cmp2 = new ZipFile(zipFile2); + final ZipFile cmp1 = ZipFile.builder().setFile(zipFile).get(); + final ZipFile cmp2 = ZipFile.builder().setFile(zipFile2).get(); ArchiveFileComparator.assertZipEquals(cmp1, cmp2, ""); } @@ -553,7 +561,7 @@ void testLastModifiedTimeRounding() throws Exception { archiver.createArchive(); // verify that the last modified time of the entry is equal or newer than the original file - try (ZipFile resultingZipFile = new ZipFile(destFile)) { + try (ZipFile resultingZipFile = ZipFile.builder().setFile(destFile).get()) { assertEquals( 1534189012_000L, resultingZipFile.getEntry("odd-seconds").getTime()); assertEquals( @@ -611,11 +619,11 @@ void testLookAtExtraZipFields_from_macos() throws IOException { System.out.println(Arrays.asList(ExtraFieldUtils.parse(oddEntry.getExtra()))); - System.out.println("oddEntry.getTime() = " + new Date(oddEntry.getTime()).toString()); + System.out.println("oddEntry.getTime() = " + new Date(oddEntry.getTime())); System.out.println("oddEntry.getName() = " + oddEntry.getName()); System.out.println("new String(oddEntry.getExtra()) = " + new String(oddEntry.getExtra())); System.out.println("evenEntry.getName() = " + evenEntry.getName()); - System.out.println("evenEntry.getTime() = " + new Date(evenEntry.getTime()).toString()); + System.out.println("evenEntry.getTime() = " + new Date(evenEntry.getTime())); System.out.println("new String(evenEntry.getExtra()) = " + new String(evenEntry.getExtra())); } @@ -638,11 +646,11 @@ void testZipStuff() throws IOException { ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); ZipInputStream zipInputStream = new ZipInputStream(bais); final java.util.zip.ZipEntry oddEntry = zipInputStream.getNextEntry(); - System.out.println("oddEntry.getTime() = " + new Date(oddEntry.getTime()).toString()); + System.out.println("oddEntry.getTime() = " + new Date(oddEntry.getTime())); System.out.println("oddEntry.getName() = " + oddEntry.getName()); final java.util.zip.ZipEntry evenEntry = zipInputStream.getNextEntry(); System.out.println("evenEntry.getName() = " + evenEntry.getName()); - System.out.println("evenEntry.getTime() = " + new Date(evenEntry.getTime()).toString()); + System.out.println("evenEntry.getTime() = " + new Date(evenEntry.getTime())); } @Disabled("Junit3 method name is notest") @@ -678,8 +686,8 @@ void testCreateResourceCollection() throws Exception { FileUtils.removePath(zipFile2.getPath()); zipArchiver2.createArchive(); - final ZipFile cmp1 = new ZipFile(zipFile); - final ZipFile cmp2 = new ZipFile(zipFile2); + final ZipFile cmp1 = ZipFile.builder().setFile(zipFile).get(); + final ZipFile cmp2 = ZipFile.builder().setFile(zipFile2).get(); ArchiveFileComparator.assertZipEquals(cmp1, cmp2, "prfx/"); cmp1.close(); cmp2.close(); @@ -710,7 +718,7 @@ void testZipNonConcurrentResourceCollection() throws Exception { zipArchive.createArchive(); final TarFile cmp1 = new TarFile(tarFile); - final ZipFile cmp2 = new ZipFile(zipFile); + final ZipFile cmp2 = ZipFile.builder().setFile(zipFile).get(); ArchiveFileComparator.assertTarZipEquals(cmp1, cmp2, "prfx/"); cmp1.close(); cmp2.close(); @@ -749,7 +757,7 @@ void testForcedFileModes() throws IOException { zipArchiver.createArchive(); - ZipFile zf = new ZipFile(step1file); + ZipFile zf = ZipFile.builder().setFile(step1file).get(); fileModeAssert(040007, zf.getEntry("sixsixsix/a/").getUnixMode()); fileModeAssert(0100077, zf.getEntry("sixsixsix/b/FileInB.txt").getUnixMode()); fileModeAssert(0100707, zf.getEntry("Test2.txt").getUnixMode()); @@ -767,7 +775,7 @@ void testForcedFileModes() throws IOException { zipSrc.setPrefix("zz/"); za2.addResources(zipSrc); za2.createArchive(); - ZipFile zf = new ZipFile(Step2file); + ZipFile zf = ZipFile.builder().setFile(Step2file).get(); fileModeAssert(040676, zf.getEntry("zz/sixsixsix/a/").getUnixMode()); fileModeAssert(0100666, zf.getEntry("zz/Test2.txt").getUnixMode()); zf.close(); @@ -784,7 +792,7 @@ void testForcedFileModes() throws IOException { zipSrc.setPrefix("zz/"); za2.addResources(zipSrc); za2.createArchive(); - ZipFile zf = new ZipFile(Step2file); + ZipFile zf = ZipFile.builder().setFile(Step2file).get(); fileModeAssert(040676, zf.getEntry("zz/sixsixsix/a/").getUnixMode()); fileModeAssert(0100666, zf.getEntry("zz/Test2.txt").getUnixMode()); zf.close(); @@ -802,7 +810,7 @@ void testFixedEntryModificationTime() throws IOException { archiver.createArchive(); assertTrue(zipFile.exists()); - try (final ZipFile zf = new ZipFile(zipFile)) { + try (final ZipFile zf = ZipFile.builder().setFile(zipFile).get()) { assertEquals( almostMinDosTime, zf.getEntry("file-with-even-time.txt").getTime()); assertEquals(almostMinDosTime, zf.getEntry("file-with-odd-time.txt").getTime()); diff --git a/src/test/java/org/codehaus/plexus/archiver/zstd/ZstdArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zstd/ZstdArchiverTest.java index e305400de..8f3e643b5 100644 --- a/src/test/java/org/codehaus/plexus/archiver/zstd/ZstdArchiverTest.java +++ b/src/test/java/org/codehaus/plexus/archiver/zstd/ZstdArchiverTest.java @@ -18,7 +18,6 @@ import java.io.File; import java.io.InputStream; import java.nio.file.Files; -import java.util.Arrays; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -30,6 +29,7 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -97,7 +97,7 @@ void testCreateResourceCollection() throws Exception { final InputStream archivePom = juZipFile.getInputStream(zipEntry); final InputStream pom = Files.newInputStream(pomFile.toPath()); - assertTrue(Arrays.equals(IOUtil.toByteArray(pom), IOUtil.toByteArray(archivePom))); + assertArrayEquals(IOUtil.toByteArray(pom), IOUtil.toByteArray(archivePom)); archivePom.close(); pom.close(); juZipFile.close();