Emanuel, -1 you are duplicating code (again) as a one-off while adding the clutter of a ternary expression (and unnecessary parentheses). It is much cleaner to use canonical-like code from our low level Commons IO library we already use elsewhere. There is no benefit to expanding this API call. This change forces the reader to parse out the ternary expreasion, the how, instead of focusing on the what of the method.
TY, Gary On Fri, Nov 1, 2024, 1:55 PM <ebo...@apache.org> wrote: > This is an automated email from the ASF dual-hosted git repository. > > ebourg pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/commons-compress.git > > > The following commit(s) were added to refs/heads/master by this push: > new 5d2456748 Replace org.apache.commons.io.Charsets with > org.apache.commons.compress.utils.Charsets > 5d2456748 is described below > > commit 5d24567489996a910af842d5db6ed52ded54e1c1 > Author: Emmanuel Bourg <ebo...@apache.org> > AuthorDate: Fri Nov 1 18:22:35 2024 +0100 > > Replace org.apache.commons.io.Charsets with > org.apache.commons.compress.utils.Charsets > --- > .../org/apache/commons/compress/archivers/ArchiveInputStream.java | 2 > +- > .../apache/commons/compress/archivers/tar/TarArchiveOutputStream.java | 2 > +- > .../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 > +- > .../org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java | 2 > +- > src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java | 4 > ++-- > 5 files changed, 6 insertions(+), 6 deletions(-) > > diff --git > a/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java > b/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java > index d8f312faf..2a007d050 100644 > --- > a/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java > +++ > b/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java > @@ -25,7 +25,7 @@ import java.nio.charset.Charset; > import java.util.Iterator; > import java.util.Objects; > > -import org.apache.commons.io.Charsets; > +import org.apache.commons.compress.utils.Charsets; > import org.apache.commons.io.function.IOConsumer; > import org.apache.commons.io.function.IOIterator; > import org.apache.commons.io.input.NullInputStream; > 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 4f3588d9b..2c5878e83 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 > @@ -38,9 +38,9 @@ import java.util.Map; > import org.apache.commons.compress.archivers.ArchiveOutputStream; > import org.apache.commons.compress.archivers.zip.ZipEncoding; > import org.apache.commons.compress.archivers.zip.ZipEncodingHelper; > +import org.apache.commons.compress.utils.Charsets; > import org.apache.commons.compress.utils.FixedLengthBlockOutputStream; > import org.apache.commons.compress.utils.TimeUtils; > -import org.apache.commons.io.Charsets; > import org.apache.commons.io.file.attribute.FileTimes; > import org.apache.commons.io.output.CountingOutputStream; > import org.apache.commons.lang3.ArrayFill; > diff --git > a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java > b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java > index 0849f2848..f617c2b7e 100644 > --- > a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java > +++ > b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java > @@ -38,7 +38,7 @@ import java.util.zip.ZipException; > import org.apache.commons.compress.archivers.ArchiveEntry; > import org.apache.commons.compress.archivers.ArchiveOutputStream; > import org.apache.commons.compress.utils.ByteUtils; > -import org.apache.commons.io.Charsets; > +import org.apache.commons.compress.utils.Charsets; > > /** > * Reimplementation of {@link java.util.zip.ZipOutputStream > java.util.zip.ZipOutputStream} to handle the extended functionality of this > package, especially > 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 3f4dede20..8ba45f801 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 > @@ -23,7 +23,7 @@ import java.nio.ByteBuffer; > import java.nio.charset.Charset; > import java.nio.charset.UnsupportedCharsetException; > > -import org.apache.commons.io.Charsets; > +import org.apache.commons.compress.utils.Charsets; > > /** > * 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 5f3054ed9..d28a57de4 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 > @@ -55,10 +55,10 @@ import > org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; > import > org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; > import org.apache.commons.compress.utils.BoundedArchiveInputStream; > import > org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream; > +import org.apache.commons.compress.utils.Charsets; > import org.apache.commons.compress.utils.IOUtils; > import org.apache.commons.compress.utils.InputStreamStatistics; > import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; > -import org.apache.commons.io.Charsets; > import org.apache.commons.io.FilenameUtils; > import org.apache.commons.io.build.AbstractOrigin.ByteArrayOrigin; > import org.apache.commons.io.build.AbstractStreamBuilder; > @@ -856,7 +856,7 @@ public class ZipFile implements Closeable { > private ZipFile(final SeekableByteChannel channel, final String > channelDescription, final Charset encoding, final boolean > useUnicodeExtraFields, > final boolean closeOnError, final boolean > ignoreLocalFileHeader) throws IOException { > this.isSplitZipArchive = channel instanceof > ZipSplitReadOnlySeekableByteChannel; > - this.encoding = Charsets.toCharset(encoding, > Builder.DEFAULT_CHARSET); > + this.encoding = (encoding == null) ? Builder.DEFAULT_CHARSET : > encoding; > this.zipEncoding = ZipEncodingHelper.getZipEncoding(encoding); > this.useUnicodeExtraFields = useUnicodeExtraFields; > this.archive = channel; > >
