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
The following commit(s) were added to refs/heads/master by this push:
new c6380020 Make package private class final
c6380020 is described below
commit c6380020774e9665d6a35060c96025e70c531a62
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Nov 5 08:03:48 2023 -0500
Make package private class final
---
src/main/java/org/apache/commons/compress/archivers/dump/Dirent.java | 2 +-
.../org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java | 2 +-
.../org/apache/commons/compress/archivers/sevenz/AES256Options.java | 2 +-
.../apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java | 2 +-
.../java/org/apache/commons/compress/archivers/sevenz/Archive.java | 2 +-
.../java/org/apache/commons/compress/archivers/sevenz/BindPair.java | 2 +-
.../archivers/sevenz/BoundedSeekableByteChannelInputStream.java | 2 +-
src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java | 2 +-
src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java | 2 +-
.../org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java | 2 +-
src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java | 2 +-
.../org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java | 2 +-
.../java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java | 2 +-
.../java/org/apache/commons/compress/archivers/sevenz/StartHeader.java | 2 +-
.../java/org/apache/commons/compress/archivers/sevenz/StreamMap.java | 2 +-
.../org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.java | 2 +-
.../java/org/apache/commons/compress/archivers/zip/BinaryTree.java | 2 +-
src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java | 2 +-
.../apache/commons/compress/archivers/zip/ExplodingInputStream.java | 2 +-
.../java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java | 2 +-
.../apache/commons/compress/compressors/deflate64/HuffmanDecoder.java | 3 +++
.../compress/compressors/pack200/TempFileCachingStreamBridge.java | 2 +-
src/test/java/org/apache/commons/compress/changes/TestFixtures.java | 2 +-
23 files changed, 25 insertions(+), 22 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/Dirent.java
b/src/main/java/org/apache/commons/compress/archivers/dump/Dirent.java
index 73b2a3d4..1268ad2c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/Dirent.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/Dirent.java
@@ -21,7 +21,7 @@ package org.apache.commons.compress.archivers.dump;
/**
* Directory entry.
*/
-class Dirent {
+final class Dirent {
private final int ino;
private final int parentIno;
private final int type;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
index 7f4be5f2..90da95f7 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
@@ -27,7 +27,7 @@ import org.apache.commons.compress.utils.ByteUtils;
/**
* Various utilities for dump archives.
*/
-class DumpArchiveUtil {
+final class DumpArchiveUtil {
/**
* Calculate checksum for buffer.
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 bcd72892..d84ac30e 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
@@ -31,7 +31,7 @@ import javax.crypto.spec.SecretKeySpec;
* @since 1.23
* @see AES256SHA256Decoder
*/
-class AES256Options {
+final class AES256Options {
static final String ALGORITHM = "AES";
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
index 1cd59eae..8ec7566f 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
@@ -36,7 +36,7 @@ import javax.crypto.spec.IvParameterSpec;
import org.apache.commons.compress.PasswordRequiredException;
-class AES256SHA256Decoder extends AbstractCoder {
+final class AES256SHA256Decoder extends AbstractCoder {
private static final class AES256SHA256DecoderInputStream extends
InputStream {
private final InputStream in;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
index bec090da..cc94356c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
@@ -18,7 +18,7 @@ package org.apache.commons.compress.archivers.sevenz;
import java.util.BitSet;
-class Archive {
+final class Archive {
private static String lengthOf(final long[] a) {
return a == null ? "(null)" : Integer.toString(a.length);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
index e7778c60..dc400964 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.compress.archivers.sevenz;
-class BindPair {
+final class BindPair {
long inIndex;
long outIndex;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java
index c86ca960..56b67bd3 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedSeekableByteChannelInputStream.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.channels.SeekableByteChannel;
-class BoundedSeekableByteChannelInputStream extends InputStream {
+final class BoundedSeekableByteChannelInputStream extends InputStream {
private static final int MAX_BUF_LEN = 8192;
private final ByteBuffer buffer;
private final SeekableByteChannel channel;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
index c323ff4a..a43ae5b9 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.compress.archivers.sevenz;
-class Coder {
+final class Coder {
byte[] decompressionMethodId;
long numInStreams;
long numOutStreams;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index 68650244..986896e8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -43,7 +43,7 @@ import org.tukaani.xz.PowerPCOptions;
import org.tukaani.xz.SPARCOptions;
import org.tukaani.xz.X86Options;
-class Coders {
+final class Coders {
static class BCJDecoder extends AbstractCoder {
private final FilterOptions opts;
BCJDecoder(final FilterOptions opts) {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
index 1dca8d00..5f9f5ed9 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/DeltaDecoder.java
@@ -24,7 +24,7 @@ import org.tukaani.xz.DeltaOptions;
import org.tukaani.xz.FinishableWrapperOutputStream;
import org.tukaani.xz.UnsupportedOptionsException;
-class DeltaDecoder extends AbstractCoder {
+final class DeltaDecoder extends AbstractCoder {
DeltaDecoder() {
super(Number.class);
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
index 27ad734f..7accb2d3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
/**
* The unit of solid compression.
*/
-class Folder {
+final class Folder {
static final Folder[] EMPTY_FOLDER_ARRAY = {};
/// List of coders used in this folder, e.g. one for compression, one for
encryption.
Coder[] coders;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
index 41a776ad..4a39bcab 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
@@ -25,7 +25,7 @@ import org.tukaani.xz.FinishableWrapperOutputStream;
import org.tukaani.xz.LZMA2InputStream;
import org.tukaani.xz.LZMA2Options;
-class LZMA2Decoder extends AbstractCoder {
+final class LZMA2Decoder extends AbstractCoder {
LZMA2Decoder() {
super(LZMA2Options.class, Number.class);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
index 39ef76b6..92519f29 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMADecoder.java
@@ -27,7 +27,7 @@ import org.tukaani.xz.LZMA2Options;
import org.tukaani.xz.LZMAInputStream;
import org.tukaani.xz.LZMAOutputStream;
-class LZMADecoder extends AbstractCoder {
+final class LZMADecoder extends AbstractCoder {
LZMADecoder() {
super(LZMA2Options.class, Number.class);
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/StartHeader.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/StartHeader.java
index 637acf6e..e4f083fe 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/StartHeader.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/StartHeader.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.compress.archivers.sevenz;
-class StartHeader {
+final class StartHeader {
long nextHeaderOffset;
long nextHeaderSize;
long nextHeaderCrc;
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 324165d8..bb06c15e 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
@@ -17,7 +17,7 @@
package org.apache.commons.compress.archivers.sevenz;
/// Map between folders, files and streams.
-class StreamMap {
+final class StreamMap {
/// The first Archive.packStream index of each folder.
int[] folderFirstPackStreamIndex;
/// Offset to beginning of this pack stream's data, relative to the
beginning of the first pack stream.
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.java
index d7efe292..78f82308 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SubStreamsInfo.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.archivers.sevenz;
import java.util.BitSet;
/// Properties for non-empty files.
-class SubStreamsInfo {
+final class SubStreamsInfo {
/// Unpacked size of each unpacked stream.
long[] unpackSizes;
/// Whether CRC is present for each unpacked stream.
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 e4f3147f..de96afd0 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
@@ -31,7 +31,7 @@ import org.apache.commons.compress.utils.IOUtils;
*
* @since 1.7
*/
-class BinaryTree {
+final class BinaryTree {
/** Value in the array indicating an undefined node */
private static final int UNDEFINED = -1;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
index 8d8700e3..680590d8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/BitStream.java
@@ -31,7 +31,7 @@ import org.apache.commons.compress.utils.BitInputStream;
*
* @since 1.7
*/
-class BitStream extends BitInputStream {
+final class BitStream extends BitInputStream {
BitStream(final InputStream in) {
super(in, ByteOrder.LITTLE_ENDIAN);
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
index 31728b71..989e892d 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
@@ -38,7 +38,7 @@ import
org.apache.commons.compress.utils.InputStreamStatistics;
*
* @since 1.7
*/
-class ExplodingInputStream extends InputStream implements
InputStreamStatistics {
+final class ExplodingInputStream extends InputStream implements
InputStreamStatistics {
/** The underlying stream containing the compressed data */
private final InputStream in;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
index bf1ceede..89c857f8 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java
@@ -34,7 +34,7 @@ import java.nio.charset.CodingErrorAction;
* <p>The methods of this class are reentrant.</p>
* @Immutable
*/
-class NioZipEncoding implements ZipEncoding, CharsetAccessor {
+final class NioZipEncoding implements ZipEncoding, CharsetAccessor {
private static final char REPLACEMENT = '?';
private static final byte[] REPLACEMENT_BYTES = { (byte) REPLACEMENT };
diff --git
a/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
b/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
index 2fe19fd5..9aad879d 100644
---
a/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
+++
b/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
@@ -32,6 +32,9 @@ import org.apache.commons.compress.utils.BitInputStream;
import org.apache.commons.compress.utils.ByteUtils;
import org.apache.commons.compress.utils.ExactMath;
+/**
+ * TODO This class can't be final because it is mocked by Mockito.
+ */
class HuffmanDecoder implements Closeable {
private static final class BinaryTreeNode {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
index 826510a9..6afbecfd 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/TempFileCachingStreamBridge.java
@@ -31,7 +31,7 @@ import java.nio.file.Path;
*
* @since 1.3
*/
-class TempFileCachingStreamBridge extends AbstractStreamBridge {
+final class TempFileCachingStreamBridge extends AbstractStreamBridge {
private final Path path;
diff --git
a/src/test/java/org/apache/commons/compress/changes/TestFixtures.java
b/src/test/java/org/apache/commons/compress/changes/TestFixtures.java
index 70a994c0..34186cf1 100644
--- a/src/test/java/org/apache/commons/compress/changes/TestFixtures.java
+++ b/src/test/java/org/apache/commons/compress/changes/TestFixtures.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-class TestFixtures {
+final class TestFixtures {
static Set<String> getEmptyOutputArchiveNames() {
final Set<String> outputStreamArchiveNames = getOutputArchiveNames();
