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 e15014b1 Make private static classes final
e15014b1 is described below
commit e15014b1ddbcf1ce30e89a530f11857c37708144
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Oct 10 16:21:44 2023 -0400
Make private static classes final
---
.../org/apache/commons/compress/archivers/sevenz/SevenZFile.java | 2 +-
.../commons/compress/archivers/zip/ScatterZipOutputStream.java | 2 +-
.../java/org/apache/commons/compress/archivers/zip/ZipFile.java | 4 ++--
.../compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java | 2 +-
.../org/apache/commons/compress/changes/ChangeSetPerformer.java | 4 ++--
.../commons/compress/compressors/deflate64/HuffmanDecoder.java | 6 +++---
.../org/apache/commons/compress/harmony/pack200/ClassBands.java | 2 +-
.../org/apache/commons/compress/harmony/pack200/PackingUtils.java | 2 +-
.../org/apache/commons/compress/harmony/pack200/SegmentHeader.java | 2 +-
.../compress/harmony/unpack200/bytecode/InnerClassesAttribute.java | 2 +-
.../commons/compress/harmony/unpack200/bytecode/NewAttribute.java | 6 +++---
.../apache/commons/compress/utils/FixedLengthBlockOutputStream.java | 2 +-
.../commons/compress/archivers/sevenz/SevenZNativeHeapTest.java | 4 ++--
src/test/java/org/apache/commons/compress/archivers/zip/Lister.java | 2 +-
.../apache/commons/compress/compressors/bzip2/BlockSortTest.java | 2 +-
.../lz77support/AbstractLZ77CompressorInputStreamTest.java | 2 +-
.../commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java | 2 +-
.../commons/compress/utils/FixedLengthBlockOutputStreamTest.java | 4 ++--
.../compress/utils/MultiReadOnlySeekableByteChannelTest.java | 2 +-
19 files changed, 27 insertions(+), 27 deletions(-)
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 6752014e..8dd12721 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
@@ -89,7 +89,7 @@ import
org.apache.commons.compress.utils.InputStreamStatistics;
* @since 1.6
*/
public class SevenZFile implements Closeable {
- private static class ArchiveStatistics {
+ private static final class ArchiveStatistics {
private int numberOfPackedStreams;
private long numberOfCoders;
private long numberOfOutStreams;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
index db431427..dacf6919 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
@@ -50,7 +50,7 @@ import org.apache.commons.compress.utils.BoundedInputStream;
*/
public class ScatterZipOutputStream implements Closeable {
- private static class CompressedEntry {
+ private static final class CompressedEntry {
final ZipArchiveEntryRequest zipArchiveEntryRequest;
final long crc;
final long compressedSize;
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 089f6959..a2496c8d 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
@@ -106,7 +106,7 @@ public class ZipFile implements Closeable {
/**
* Extends ZipArchiveEntry to store the offset within the archive.
*/
- private static class Entry extends ZipArchiveEntry {
+ private static final class Entry extends ZipArchiveEntry {
Entry() {
}
@@ -140,7 +140,7 @@ public class ZipFile implements Closeable {
this.comment = comment;
}
}
- private static class StoredStatisticsStream extends CountingInputStream
implements InputStreamStatistics {
+ private static final class StoredStatisticsStream extends
CountingInputStream implements InputStreamStatistics {
StoredStatisticsStream(final InputStream in) {
super(in);
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
index 47b06e59..bad44986 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitReadOnlySeekableByteChannel.java
@@ -48,7 +48,7 @@ import
org.apache.commons.compress.utils.MultiReadOnlySeekableByteChannel;
*/
public class ZipSplitReadOnlySeekableByteChannel extends
MultiReadOnlySeekableByteChannel {
- private static class ZipSplitSegmentComparator implements
Comparator<Path>, Serializable {
+ private static final class ZipSplitSegmentComparator implements
Comparator<Path>, Serializable {
private static final long serialVersionUID = 20200123L;
@Override
diff --git
a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
index 05cd38eb..4ae8bde1 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
@@ -57,7 +57,7 @@ public class ChangeSetPerformer {
ArchiveEntry next();
}
- private static class ArchiveInputStreamIterator
+ private static final class ArchiveInputStreamIterator
implements ArchiveEntryIterator {
private final ArchiveInputStream in;
private ArchiveEntry next;
@@ -78,7 +78,7 @@ public class ChangeSetPerformer {
}
}
- private static class ZipFileIterator
+ private static final class ZipFileIterator
implements ArchiveEntryIterator {
private final ZipFile in;
private final Enumeration<ZipArchiveEntry> nestedEnum;
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 8718a998..2fe19fd5 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
@@ -34,7 +34,7 @@ import org.apache.commons.compress.utils.ExactMath;
class HuffmanDecoder implements Closeable {
- private static class BinaryTreeNode {
+ private static final class BinaryTreeNode {
private final int bits;
int literal = -1;
BinaryTreeNode leftNode;
@@ -75,7 +75,7 @@ class HuffmanDecoder implements Closeable {
abstract HuffmanState state();
}
- private static class DecodingMemory {
+ private static final class DecodingMemory {
private final byte[] memory;
private final int mask;
private int wHead;
@@ -214,7 +214,7 @@ class HuffmanDecoder implements Closeable {
return endOfBlock ? INITIAL : state;
}
}
- private static class InitialState extends DecoderState {
+ private static final class InitialState extends DecoderState {
@Override
int available() {
return 0;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
index 075be8b4..3c512cc7 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
@@ -38,7 +38,7 @@ import org.objectweb.asm.Opcodes;
*/
public class ClassBands extends BandSet {
- private static class TempParamAnnotation {
+ private static final class TempParamAnnotation {
int numParams;
int[] annoN;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index 366c1166..38a0b6a5 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -41,7 +41,7 @@ import
org.apache.commons.compress.harmony.pack200.Archive.PackingFile;
public class PackingUtils {
- private static class PackingLogger extends Logger {
+ private static final class PackingLogger extends Logger {
private boolean verbose = false;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
index 406110b5..8e3f8e7d 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
@@ -28,7 +28,7 @@ public class SegmentHeader extends BandSet {
/**
* Counter for major/minor class file numbers, so we can work out the
default
*/
- private static class Counter {
+ private static final class Counter {
private final int[] objs = new int[8];
private final int[] counts = new int[8];
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
index d7e42677..0ca8d10b 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
@@ -26,7 +26,7 @@ import java.util.List;
*/
public class InnerClassesAttribute extends Attribute {
- private static class InnerClassesEntry {
+ private static final class InnerClassesEntry {
CPClass innerClassInfo;
CPClass outerClassInfo;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
index 6f6e1556..adabd367 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
@@ -36,7 +36,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
}
}
- private static class BCIndex extends AbstractBcValue {
+ private static final class BCIndex extends AbstractBcValue {
private final int index;
@@ -44,7 +44,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
this.index = index;
}
}
- private static class BCLength extends AbstractBcValue {
+ private static final class BCLength extends AbstractBcValue {
private final int length;
@@ -52,7 +52,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
this.length = length;
}
}
- private static class BCOffset extends AbstractBcValue {
+ private static final class BCOffset extends AbstractBcValue {
private final int offset;
private int index;
diff --git
a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
index 218a6c23..f2d31454 100644
---
a/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStream.java
@@ -55,7 +55,7 @@ public class FixedLengthBlockOutputStream extends
OutputStream implements Writab
* breaks up writes into 8KB max chunks. Since the purpose of this class
is to always write
* complete blocks, we need to write a simple class to take care of it.
*/
- private static class BufferAtATimeOutputChannel implements
WritableByteChannel {
+ private static final class BufferAtATimeOutputChannel implements
WritableByteChannel {
private final OutputStream out;
private final AtomicBoolean closed = new AtomicBoolean(false);
diff --git
a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
index 9b4fd876..94e8701a 100644
---
a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
public class SevenZNativeHeapTest extends AbstractTestCase {
- private static class DelegatingDeflater extends Deflater {
+ private static final class DelegatingDeflater extends Deflater {
private final Deflater deflater;
@@ -143,7 +143,7 @@ public class SevenZNativeHeapTest extends AbstractTestCase {
}
- private static class DelegatingInflater extends Inflater {
+ private static final class DelegatingInflater extends Inflater {
private final Inflater inflater;
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 d00e475e..85cf3b89 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
@@ -35,7 +35,7 @@ import org.apache.commons.compress.archivers.ArchiveEntry;
* and whether to use ZipFile or ZipArchiveInputStream.</p>
*/
public final class Lister {
- private static class CommandLine {
+ private static final class CommandLine {
String archive;
boolean useStream = false;
String encoding;
diff --git
a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
index 25c68058..1ddcf573 100644
---
a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
public class BlockSortTest {
- private static class DS {
+ private static final class DS {
private final BZip2CompressorOutputStream.Data data;
private final BlockSort s;
DS(final BZip2CompressorOutputStream.Data data, final BlockSort s) {
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStreamTest.java
index 979b4fa7..6db6bd33 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStreamTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
public class AbstractLZ77CompressorInputStreamTest {
- private static class TestStream extends AbstractLZ77CompressorInputStream {
+ private static final class TestStream extends
AbstractLZ77CompressorInputStream {
private boolean literal;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
index 1eecb6d2..6b376632 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.params.provider.MethodSource;
public class SegmentUtilsTest {
- private static class MultipleMatches implements IMatcher {
+ private static final class MultipleMatches implements IMatcher {
private final int divisor;
diff --git
a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
index abc60afc..c018e54e 100644
---
a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
public class FixedLengthBlockOutputStreamTest {
- private static class MockOutputStream extends OutputStream {
+ private static final class MockOutputStream extends OutputStream {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
private final int requiredWriteSize;
@@ -86,7 +86,7 @@ public class FixedLengthBlockOutputStreamTest {
}
}
- private static class MockWritableByteChannel implements
WritableByteChannel {
+ private static final class MockWritableByteChannel implements
WritableByteChannel {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
private final int requiredWriteSize;
diff --git
a/src/test/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannelTest.java
b/src/test/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannelTest.java
index b3faaeaf..f690eef7 100644
---
a/src/test/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannelTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannelTest.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.api.Test;
*/
public class MultiReadOnlySeekableByteChannelTest {
- private static class ThrowingSeekableByteChannel implements
SeekableByteChannel {
+ private static final class ThrowingSeekableByteChannel implements
SeekableByteChannel {
private boolean closed = false;
@Override
public void close() throws IOException {
