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 5c82205ff46cf46e3eafc04a380f1ceaa16cb489
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Feb 5 08:30:08 2025 -0500
Package-private and private classes can be final
---
src/changes/changes.xml | 1 +
.../commons/compress/archivers/ArchiveInputStream.java | 2 +-
.../compress/archivers/dump/DumpArchiveEntry.java | 2 +-
.../apache/commons/compress/archivers/sevenz/Coders.java | 16 +++++++++-------
.../archivers/zip/FileRandomAccessOutputStream.java | 2 +-
.../zip/SeekableChannelRandomAccessOutputStream.java | 2 +-
.../apache/commons/compress/archivers/zip/ZipFile.java | 2 +-
.../apache/commons/compress/archivers/zip/ZipIoUtil.java | 2 +-
.../apache/commons/compress/harmony/pack200/Archive.java | 4 ++--
.../apache/commons/compress/harmony/pack200/IcBands.java | 2 +-
10 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fe609e703..ca3405851 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -66,6 +66,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Javadoc and
names in the org.apache.commons.compress.compressors.lzw package to specify
kibibyte scale in memory limits.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Javadoc and
names in the org.apache.commons.compress.compressors.z package to specify
kibibyte scale in memory limits.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Refactor
LZ77Compressor block classes to reduce duplication.</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Package-private
and private classes can be final.</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary Gregory">Add
GzipParameters.getModificationInstant().</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">Add
GzipParameters.setModificationInstant(Instant).</action>
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 03b2cec78..ef4239993 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
@@ -54,7 +54,7 @@ public abstract class ArchiveInputStream<E extends
ArchiveEntry> extends FilterI
/**
* An iterator over a collection of a specific {@link ArchiveEntry} type.
*/
- class ArchiveEntryIOIterator implements IOIterator<E> {
+ final class ArchiveEntryIOIterator implements IOIterator<E> {
private E next;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
index 0af0681a6..a792e65cc 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
@@ -268,7 +268,7 @@ public static Set<PERMISSION> find(final int code) {
/**
* Archive entry as stored on tape. There is one TSH for (at most) every
512k in the file.
*/
- static class TapeSegmentHeader {
+ static final class TapeSegmentHeader {
private DumpArchiveConstants.SEGMENT_TYPE type;
private int volume;
private int ino;
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 4197e98ba..b61f44f03 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
@@ -46,7 +46,8 @@
import org.tukaani.xz.X86Options;
final class Coders {
- static class BCJDecoder extends AbstractCoder {
+
+ static final class BCJDecoder extends AbstractCoder {
private final FilterOptions opts;
BCJDecoder(final FilterOptions opts) {
@@ -71,7 +72,7 @@ OutputStream encode(final OutputStream out, final Object
options) {
}
}
- static class BZIP2Decoder extends AbstractCoder {
+ static final class BZIP2Decoder extends AbstractCoder {
BZIP2Decoder() {
super(Number.class);
}
@@ -89,7 +90,7 @@ OutputStream encode(final OutputStream out, final Object
options) throws IOExcep
}
}
- static class CopyDecoder extends AbstractCoder {
+ static final class CopyDecoder extends AbstractCoder {
@Override
InputStream decode(final String archiveName, final InputStream in,
final long uncompressedLength, final Coder coder, final byte[] password,
final int maxMemoryLimitKiB) throws IOException {
@@ -102,7 +103,7 @@ OutputStream encode(final OutputStream out, final Object
options) {
}
}
- static class Deflate64Decoder extends AbstractCoder {
+ static final class Deflate64Decoder extends AbstractCoder {
Deflate64Decoder() {
super(Number.class);
}
@@ -114,8 +115,9 @@ InputStream decode(final String archiveName, final
InputStream in, final long un
}
}
- static class DeflateDecoder extends AbstractCoder {
- static class DeflateDecoderInputStream extends FilterInputStream {
+ static final class DeflateDecoder extends AbstractCoder {
+
+ static final class DeflateDecoderInputStream extends FilterInputStream
{
Inflater inflater;
@@ -135,7 +137,7 @@ public void close() throws IOException {
}
- static class DeflateDecoderOutputStream extends OutputStream {
+ static final class DeflateDecoderOutputStream extends OutputStream {
final DeflaterOutputStream deflaterOutputStream;
Deflater deflater;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
index 48a14a6d3..6a0d69697 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/FileRandomAccessOutputStream.java
@@ -30,7 +30,7 @@
* {@link RandomAccessOutputStream} implementation based on a file.
*/
// Keep package-private; consider for Apache Commons IO.
-class FileRandomAccessOutputStream extends RandomAccessOutputStream {
+final class FileRandomAccessOutputStream extends RandomAccessOutputStream {
private final FileChannel channel;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
index 0ebdc9489..30490ee8c 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/SeekableChannelRandomAccessOutputStream.java
@@ -26,7 +26,7 @@
* {@link RandomAccessOutputStream} implementation for SeekableByteChannel.
*/
// Keep package-private; consider for Apache Commons IO.
-class SeekableChannelRandomAccessOutputStream extends RandomAccessOutputStream
{
+final class SeekableChannelRandomAccessOutputStream extends
RandomAccessOutputStream {
private final SeekableByteChannel channel;
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 264f0a850..4425ecc0e 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
@@ -96,7 +96,7 @@ public class ZipFile implements Closeable {
* Lock-free implementation of BoundedInputStream. The implementation uses
positioned reads on the underlying archive file channel and therefore performs
* significantly faster in concurrent environment.
*/
- private static class BoundedFileChannelInputStream extends
BoundedArchiveInputStream {
+ private static final class BoundedFileChannelInputStream extends
BoundedArchiveInputStream {
private final FileChannel archive;
BoundedFileChannelInputStream(final long start, final long remaining,
final FileChannel archive) {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipIoUtil.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipIoUtil.java
index 001446612..47ca263e7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipIoUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipIoUtil.java
@@ -27,7 +27,7 @@
* IO utilities for Zip operations.
*/
// Keep package-private; consider for Apache Commons IO.
-class ZipIoUtil {
+final class ZipIoUtil {
/**
* Writes full buffer to channel.
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
index f2018049e..c2017bdc4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
@@ -35,7 +35,7 @@
*/
public class Archive {
- static class PackingFile {
+ static final class PackingFile {
private final String name;
private byte[] contents;
@@ -89,7 +89,7 @@ public String toString() {
}
}
- static class SegmentUnit {
+ static final class SegmentUnit {
private final List<Pack200ClassReader> classList;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
index 2f42cb5ff..51acb34c9 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
@@ -33,7 +33,7 @@
*/
public class IcBands extends BandSet {
- static class IcTuple implements Comparable<IcTuple> {
+ static final class IcTuple implements Comparable<IcTuple> {
protected CPClass C; // this class
protected int F; // flags
