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 f314a08728d585761030991e1b0f7cd06ce5745e Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Nov 4 18:22:36 2023 -0400 Make package private classes final --- .../commons/compress/archivers/arj/LocalFileHeader.java | 12 ++++++++---- .../apache/commons/compress/archivers/arj/MainHeader.java | 8 +++++--- .../org/apache/commons/compress/archivers/cpio/CpioUtil.java | 2 +- .../commons/compress/archivers/dump/TapeInputStream.java | 2 +- .../archivers/tar/TarArchiveSparseZeroInputStream.java | 2 +- .../commons/compress/archivers/tar/TarGnuSparseKeys.java | 2 +- .../commons/compress/archivers/zip/CircularBuffer.java | 2 +- .../compress/archivers/zip/UnshrinkingInputStream.java | 2 +- .../commons/compress/archivers/zip/ZipSplitOutputStream.java | 2 +- .../java/org/apache/commons/compress/changes/Change.java | 2 +- .../apache/commons/compress/compressors/bzip2/BlockSort.java | 2 +- .../org/apache/commons/compress/compressors/bzip2/CRC.java | 3 ++- .../compressors/pack200/InMemoryCachingStreamBridge.java | 2 +- 13 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java b/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java index 5734affd..a7875b77 100644 --- a/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java +++ b/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java @@ -19,8 +19,9 @@ package org.apache.commons.compress.archivers.arj; import java.util.Arrays; import java.util.Objects; -class LocalFileHeader { - static class FileTypes { +final class LocalFileHeader { + + final static class FileTypes { static final int BINARY = 0; static final int SEVEN_BIT_TEXT = 1; static final int COMMENT_HEADER = 2; @@ -28,14 +29,16 @@ class LocalFileHeader { static final int VOLUME_LABEL = 4; static final int CHAPTER_LABEL = 5; } - static class Flags { + + final static class Flags { static final int GARBLED = 0x01; static final int VOLUME = 0x04; static final int EXTFILE = 0x08; static final int PATHSYM = 0x10; static final int BACKUP = 0x20; } - static class Methods { + + final static class Methods { static final int STORED = 0; static final int COMPRESSED_MOST = 1; static final int COMPRESSED = 2; @@ -44,6 +47,7 @@ class LocalFileHeader { static final int NO_DATA_NO_CRC = 8; static final int NO_DATA = 9; } + int archiverVersionNumber; int minVersionToExtract; int hostOS; diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java b/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java index 31f5994c..b8168086 100644 --- a/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java +++ b/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java @@ -18,8 +18,9 @@ package org.apache.commons.compress.archivers.arj; import java.util.Arrays; -class MainHeader { - static class Flags { +final class MainHeader { + + final static class Flags { static final int GARBLED = 0x01; static final int OLD_SECURED_NEW_ANSI_PAGE = 0x02; static final int VOLUME = 0x04; @@ -29,7 +30,8 @@ class MainHeader { static final int SECURED = 0x40; static final int ALTNAME = 0x80; } - static class HostOS { + + final static class HostOS { static final int MS_DOS = 0; static final int PRIMOS = 1; static final int UNIX = 2; diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java index 1eb7bf63..c4d3886a 100644 --- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java +++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java @@ -25,7 +25,7 @@ import java.util.Arrays; * * @Immutable */ -class CpioUtil { +final class CpioUtil { /** * Converts a byte array to a long. Halfwords can be swapped by setting 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 f84d7a83..fe0242fb 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 @@ -34,7 +34,7 @@ import org.apache.commons.compress.utils.IOUtils; * * @NotThreadSafe */ -class TapeInputStream extends FilterInputStream { +final class TapeInputStream extends FilterInputStream { private static final int RECORD_SIZE = DumpArchiveConstants.TP_SIZE; private byte[] blockBuffer = new byte[DumpArchiveConstants.TP_SIZE]; private int currBlkIdx = -1; diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveSparseZeroInputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveSparseZeroInputStream.java index 9f5ba8d2..e7b8c737 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveSparseZeroInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveSparseZeroInputStream.java @@ -23,7 +23,7 @@ import java.io.InputStream; * This is an InputStream that always return 0, * this is used when reading the "holes" of a sparse file */ -class TarArchiveSparseZeroInputStream extends InputStream { +final class TarArchiveSparseZeroInputStream extends InputStream { /** * Returns 0. diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarGnuSparseKeys.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarGnuSparseKeys.java index 1eefc0c4..10e34c13 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarGnuSparseKeys.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarGnuSparseKeys.java @@ -22,7 +22,7 @@ package org.apache.commons.compress.archivers.tar; /** * GNU sparse key names. */ -class TarGnuSparseKeys { +final class TarGnuSparseKeys { static final String MAP = "GNU.sparse.map"; static final String NAME = "GNU.sparse.name"; diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/CircularBuffer.java b/src/main/java/org/apache/commons/compress/archivers/zip/CircularBuffer.java index 9f6a90e1..2f194ee5 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/CircularBuffer.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/CircularBuffer.java @@ -24,7 +24,7 @@ package org.apache.commons.compress.archivers.zip; * * @since 1.7 */ -class CircularBuffer { +final class CircularBuffer { /** Size of the buffer */ private final int size; diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java index c915c37b..2d96e69f 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java @@ -29,7 +29,7 @@ import org.apache.commons.compress.compressors.lzw.LZWInputStream; * @NotThreadSafe * @since 1.7 */ -class UnshrinkingInputStream extends LZWInputStream { +final class UnshrinkingInputStream extends LZWInputStream { private static final int MAX_CODE_SIZE = 13; private static final int MAX_TABLE_SIZE = 1 << MAX_CODE_SIZE; private final boolean[] isUsed; 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 5ccc896a..ca9c9936 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 @@ -31,7 +31,7 @@ import org.apache.commons.compress.utils.FileNameUtils; * * @since 1.20 */ -class ZipSplitOutputStream extends OutputStream { +final class ZipSplitOutputStream extends OutputStream { /** * 8.5.1 Capacities for split archives are as follows: diff --git a/src/main/java/org/apache/commons/compress/changes/Change.java b/src/main/java/org/apache/commons/compress/changes/Change.java index 39a20859..8650ac71 100644 --- a/src/main/java/org/apache/commons/compress/changes/Change.java +++ b/src/main/java/org/apache/commons/compress/changes/Change.java @@ -29,7 +29,7 @@ import org.apache.commons.compress.archivers.ArchiveEntry; * @param <E> The ArchiveEntry type. * @Immutable */ -class Change<E extends ArchiveEntry> { +final class Change<E extends ArchiveEntry> { /** * Enumerates types of changes. diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java index 70285d54..07ca7b36 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java @@ -78,7 +78,7 @@ import java.util.BitSet; * * @NotThreadSafe */ -class BlockSort { +final class BlockSort { /* * Some of the constructs used in the C code cannot be ported diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java index 9c2920f2..5be9e683 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java @@ -23,7 +23,8 @@ package org.apache.commons.compress.compressors.bzip2; * data. * @NotThreadSafe */ -class CRC { +final class CRC { + private static final int[] crc32Table = { 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java b/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java index 995e3843..44b602ce 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/InMemoryCachingStreamBridge.java @@ -29,7 +29,7 @@ import java.io.InputStream; * * @since 1.3 */ -class InMemoryCachingStreamBridge extends AbstractStreamBridge { +final class InMemoryCachingStreamBridge extends AbstractStreamBridge { InMemoryCachingStreamBridge() { super(new ByteArrayOutputStream());