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 4c114c03059d05b97073d01f3b9b6ee67ffd3b46 Author: Gary D. Gregory <[email protected]> AuthorDate: Sun Jul 20 17:26:57 2025 -0400 Merge some string literals --- .../org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java | 2 +- .../java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java | 2 +- .../java/org/apache/commons/compress/archivers/sevenz/StreamMap.java | 2 +- .../org/apache/commons/compress/archivers/tar/TarArchiveEntry.java | 2 +- .../apache/commons/compress/archivers/tar/TarArchiveStructSparse.java | 2 +- src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java | 2 +- .../java/org/apache/commons/compress/archivers/zip/BinaryTree.java | 2 +- .../org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java | 2 +- .../compress/archivers/zip/Zip64ExtendedInformationExtraField.java | 4 ++-- .../apache/commons/compress/archivers/zip/ZipArchiveInputStream.java | 2 +- .../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 4 ++-- src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java | 4 ++-- .../compressors/lz77support/AbstractLZ77CompressorInputStream.java | 2 +- .../compressors/snappy/FramedSnappyCompressorInputStream.java | 2 +- .../java/org/apache/commons/compress/harmony/unpack200/IcBands.java | 2 +- .../org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java | 2 +- src/test/java/org/apache/commons/compress/archivers/zip/Lister.java | 2 +- src/test/java/org/apache/commons/compress/compressors/GZipTest.java | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java index 908eb2697..cd90bb1bb 100644 --- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java @@ -846,7 +846,7 @@ public void setMode(final long mode) { case C_ISNWK: break; default: - throw new IllegalArgumentException("Unknown mode. " + "Full: " + Long.toHexString(mode) + " Masked: " + Long.toHexString(maskedMode)); + throw new IllegalArgumentException("Unknown mode. Full: " + Long.toHexString(mode) + " Masked: " + Long.toHexString(maskedMode)); } this.mode = mode; 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 9b95d3d03..8be1a4c99 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 @@ -1564,7 +1564,7 @@ private Archive readHeaders(final byte[] password) throws IOException { return tryToLocateEndHeader(password); } throw new IOException("archive seems to be invalid.\nYou may want to retry and enable the" - + " tryToRecoverBrokenArchives if the archive could be a multi volume archive that has been closed" + " prematurely."); + + " tryToRecoverBrokenArchives if the archive could be a multi volume archive that has been closed prematurely."); } private void readPackInfo(final ByteBuffer header, final Archive archive) throws IOException { diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java index 0e72583ae..180f7f287 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java @@ -53,6 +53,6 @@ final class StreamMap { @Override public String toString() { return "StreamMap with indices of " + folderFirstPackStreamIndex.length + " folders, offsets of " + packStreamOffsets.length + " packed streams," - + " first files of " + folderFirstFileIndex.length + " folders and" + " folder indices for " + fileFolderIndex.length + " files"; + + " first files of " + folderFirstFileIndex.length + " folders and folder indices for " + fileFolderIndex.length + " files"; } } diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java index 0360091d0..c9288118f 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java @@ -1761,7 +1761,7 @@ public void setDevMajor(final int devNo) { */ public void setDevMinor(final int devNo) { if (devNo < 0) { - throw new IllegalArgumentException("Minor device number is out of " + "range: " + devNo); + throw new IllegalArgumentException("Minor device number is out of range: " + devNo); } this.devMinor = devNo; } diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java index d7e5008dd..77a31c580 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveStructSparse.java @@ -92,6 +92,6 @@ public int hashCode() { @Override public String toString() { - return "TarArchiveStructSparse{" + "offset=" + offset + ", numbytes=" + numbytes + '}'; + return "TarArchiveStructSparse{offset=" + offset + ", numbytes=" + numbytes + '}'; } } diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java index 3516231a1..72c0cf0f7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java @@ -675,7 +675,7 @@ protected static Map<String, String> parsePaxHeaders(final InputStream inputStre totalRead += restLen; // Drop trailing NL if (rest[restLen - 1] != '\n') { - throw new IOException("Failed to read Paxheader." + "Value should end with a newline"); + throw new IOException("Failed to read Paxheader.Value should end with a newline"); } final String value = new String(rest, 0, restLen - 1, StandardCharsets.UTF_8); headers.put(keyword, value); diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java b/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java index 480410a84..beb181d4d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java @@ -138,7 +138,7 @@ static BinaryTree decode(final InputStream inputStream, final int totalNumberOfV BinaryTree(final int depth) { if (depth < 0 || depth > 30) { - throw new IllegalArgumentException("depth must be bigger than 0 and not bigger than 30" + " but is " + depth); + throw new IllegalArgumentException("depth must be bigger than 0 and not bigger than 30 but is " + depth); } tree = ArrayFill.fill(new int[(int) ((1L << depth + 1) - 1)], UNDEFINED); } diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java index 59fcb856c..dd922c9be 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java @@ -91,7 +91,7 @@ public ZipExtraField onUnparseableExtraField(final byte[] data, final int off, f throws ZipException { switch (key) { case THROW_KEY: - throw new ZipException("Bad extra field starting at " + off + ". Block length of " + claimedLength + " bytes exceeds remaining" + " data of " + throw new ZipException("Bad extra field starting at " + off + ". Block length of " + claimedLength + " bytes exceeds remaining data of " + (len - WORD) + " bytes."); case READ_KEY: final UnparseableExtraFieldData field = new UnparseableExtraFieldData(); 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 fd79f4cdb..11f1d8135 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 @@ -44,7 +44,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { static final ZipShort HEADER_ID = new ZipShort(0x0001); - private static final String LFH_MUST_HAVE_BOTH_SIZES_MSG = "Zip64 extended information must contain" + " both size values in the local file header."; + private static final String LFH_MUST_HAVE_BOTH_SIZES_MSG = "Zip64 extended information must contain both size values in the local file header."; private ZipEightByteInteger size; private ZipEightByteInteger compressedSize; private ZipEightByteInteger relativeHeaderOffset; @@ -263,7 +263,7 @@ public void reparseCentralDirectoryData(final boolean hasUncompressedSize, final final int expectedLength = (hasUncompressedSize ? DWORD : 0) + (hasCompressedSize ? DWORD : 0) + (hasRelativeHeaderOffset ? DWORD : 0) + (hasDiskStart ? WORD : 0); if (rawCentralDirectoryData.length < expectedLength) { - throw new ZipException("Central directory zip64 extended" + " information extra field's length" + " doesn't match central directory" + throw new ZipException("Central directory zip64 extended information extra field's length doesn't match central directory" + " data. Expected length " + expectedLength + " but is " + rawCentralDirectoryData.length); } int offset = 0; diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java index 1f2efd402..46f37b1de 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java @@ -1026,7 +1026,7 @@ private int readDeflated(final byte[] buffer, final int offset, final int length return -1; } if (inf.needsDictionary()) { - throw new ZipException("This archive needs a preset dictionary" + " which is not supported by Commons" + " Compress."); + throw new ZipException("This archive needs a preset dictionary" + " which is not supported by Commons Compress."); } if (read == -1) { throw new IOException("Truncated ZIP file"); 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 c3c35814d..735e2c8e4 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 @@ -1533,10 +1533,10 @@ private void validateSizeInformation(final Zip64Mode effectiveMode) throws ZipEx // Size/CRC not required if SeekableByteChannel is used if (entry.entry.getMethod() == STORED && !(out instanceof RandomAccessOutputStream)) { if (entry.entry.getSize() == ArchiveEntry.SIZE_UNKNOWN) { - throw new ZipException("Uncompressed size is required for" + " STORED method when not writing to a" + " file"); + throw new ZipException("Uncompressed size is required for" + " STORED method when not writing to a file"); } if (entry.entry.getCrc() == ZipArchiveEntry.CRC_UNKNOWN) { - throw new ZipException("CRC checksum is required for STORED" + " method when not writing to a file"); + throw new ZipException("CRC checksum is required for STORED method when not writing to a file"); } entry.entry.setCompressedSize(entry.entry.getSize()); } 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 515b57759..264ac339a 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 @@ -1068,7 +1068,7 @@ public void copyRawEntries(final ZipArchiveOutputStream target, final ZipArchive */ private BoundedArchiveInputStream createBoundedInputStream(final long start, final long remaining) { if (start < 0 || remaining < 0 || start + remaining < start) { - throw new IllegalArgumentException("Corrupted archive, stream boundaries" + " are out of range"); + throw new IllegalArgumentException("Corrupted archive, stream boundaries are out of range"); } return archive instanceof FileChannel ? new BoundedFileChannelInputStream(start, remaining, (FileChannel) archive) : new BoundedSeekableByteChannelInputStream(start, remaining, archive); @@ -1354,7 +1354,7 @@ private Map<ZipArchiveEntry, NameAndComment> populateFromCentralDirectory() thro long sig = ZipLong.getValue(wordBuf); if (sig != CFH_SIG && startsWithLocalFileHeader()) { - throw new IOException("Central directory is empty, can't expand" + " corrupt archive."); + throw new IOException("Central directory is empty, can't expand corrupt archive."); } while (sig == CFH_SIG) { diff --git a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java index d79c627c4..a43228d5c 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java @@ -274,7 +274,7 @@ private void slideBuffer() { */ protected final void startBackReference(final int offset, final long length) { if (offset <= 0 || offset > writeIndex) { - throw new IllegalArgumentException("offset must be bigger than 0 but not bigger than the number" + " of bytes available for back-references"); + throw new IllegalArgumentException("offset must be bigger than 0 but not bigger than the number of bytes available for back-references"); } if (length < 0) { throw new IllegalArgumentException("length must not be negative"); diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java index 1a2a6bad4..0c40bdc44 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java @@ -244,7 +244,7 @@ private void readNextBlock() throws IOException { skipBlock(); readNextBlock(); } else if (type >= MIN_UNSKIPPABLE_TYPE && type <= MAX_UNSKIPPABLE_TYPE) { - throw new IOException("Unskippable chunk with type " + type + " (hex " + Integer.toHexString(type) + ")" + " detected."); + throw new IOException("Unskippable chunk with type " + type + " (hex " + Integer.toHexString(type) + ") detected."); } else if (type == UNCOMPRESSED_CHUNK_TYPE) { inUncompressedChunk = true; uncompressedBytesRemaining = readSize() - 4 /* CRC */; diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java index a2075d017..a13f0bdb4 100644 --- a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java +++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java @@ -207,7 +207,7 @@ public void unpack() throws IOException, Pack200Exception { // final Object result = thisClassToTuple.put(tuple.thisClassString(), tuple); if (result != null) { - throw new Error("Collision detected in <thisClassString, IcTuple> mapping. " + "There are at least two inner clases with the same name."); + throw new Error("Collision detected in <thisClassString, IcTuple> mapping. There are at least two inner clases with the same name."); } // generate mapping outerClassString -> IcTuple 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 12a707a5c..e4957237d 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 @@ -60,7 +60,7 @@ import org.junit.jupiter.api.Test; class SevenZFileTest extends AbstractTest { - private static final String TEST2_CONTENT = "<?xml version = '1.0'?>\r\n<!DOCTYPE" + " connections>\r\n<meinxml>\r\n\t<leer />\r\n</meinxml>\n"; + private static final String TEST2_CONTENT = "<?xml version = '1.0'?>\r\n<!DOCTYPE connections>\r\n<meinxml>\r\n\t<leer />\r\n</meinxml>\n"; private static boolean isStrongCryptoAvailable() throws NoSuchAlgorithmException { return Cipher.getMaxAllowedKeyLength("AES/ECB/PKCS5Padding") >= 256; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java index 78e31479c..07e2f90f9 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java @@ -133,7 +133,7 @@ private static CommandLine parse(final String[] args) { } private static void usage() { - System.err.println("lister [-enc encoding] [-stream] [-file]" + " [+storeddd] [-extract dir] archive"); + System.err.println("lister [-enc encoding] [-stream] [-file] [+storeddd] [-extract dir] archive"); System.exit(1); } } diff --git a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java index bbaf15b0c..299cc0d0e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java @@ -220,7 +220,7 @@ void testMetadataRoundTrip() throws Exception { assertEquals(parameters.getFilename(), parameters.getFileName()); parameters.setComment("Umlaute möglich?"); try (GzipCompressorOutputStream out = new GzipCompressorOutputStream(bout, parameters)) { - out.write(getFile("test3" + ".xml")); + out.write(getFile("test3.xml")); } final GzipCompressorInputStream input = new GzipCompressorInputStream(new ByteArrayInputStream(bout.toByteArray()));
