Change to package private instead of protected

Author: fkjellberg

src/main/java/org/apache/commons/compress/archivers/lha/LhaArchiveInputStream.java

@@ -135,7 +135,7 @@ public LhaArchiveInputStream(final InputStream inputStream, final String charset
      * @param charsetName the charset used for file names in the archive. May be {@code null} to use US-ASCII as default.
      * @param fileSeparatorChar the character used to separate file path elements
      */
-    public LhaArchiveInputStream(final InputStream inputStream, final String charsetName, final char fileSeparatorChar) {
+    LhaArchiveInputStream(final InputStream inputStream, final String charsetName, final char fileSeparatorChar) {
         super(inputStream, charsetName == null ? StandardCharsets.US_ASCII.name() : charsetName);
         this.fileSeparatorChar = fileSeparatorChar;
     }
@@ -212,7 +212,7 @@ public LhaArchiveEntry getNextEntry() throws IOException {
      * @return the next header entry, or null if there are no more entries
      * @throws IOException
      */
-    protected LhaArchiveEntry readHeader() throws IOException {
+    LhaArchiveEntry readHeader() throws IOException {
         // Header level is not known yet. Read the minimum length header.
         final byte[] buffer = new byte[HEADER_GENERIC_MINIMUM_HEADER_LENGTH];
         final int len = IOUtils.read(in, buffer);
@@ -248,7 +248,7 @@ protected LhaArchiveEntry readHeader() throws IOException {
      * @return the LhaArchiveEntry read from the buffer
      * @throws IOException
      */
-    protected LhaArchiveEntry readHeaderLevel0(ByteBuffer buffer) throws IOException {
+    LhaArchiveEntry readHeaderLevel0(ByteBuffer buffer) throws IOException {
         final int headerSize = Byte.toUnsignedInt(buffer.get(HEADER_LEVEL_0_OFFSET_HEADER_SIZE));
         if (headerSize < HEADER_GENERIC_MINIMUM_HEADER_LENGTH) {
             throw new ArchiveException("Invalid header level 0 length: %d", headerSize);
@@ -290,7 +290,7 @@ protected LhaArchiveEntry readHeaderLevel0(ByteBuffer buffer) throws IOException
      * @return the LhaArchiveEntry read from the buffer
      * @throws IOException
      */
-    protected LhaArchiveEntry readHeaderLevel1(ByteBuffer buffer) throws IOException {
+    LhaArchiveEntry readHeaderLevel1(ByteBuffer buffer) throws IOException {
         final int baseHeaderSize = Byte.toUnsignedInt(buffer.get(HEADER_LEVEL_1_OFFSET_BASE_HEADER_SIZE));
         if (baseHeaderSize < HEADER_GENERIC_MINIMUM_HEADER_LENGTH) {
             throw new ArchiveException("Invalid header level 1 length: %d", baseHeaderSize);
@@ -360,7 +360,7 @@ protected LhaArchiveEntry readHeaderLevel1(ByteBuffer buffer) throws IOException
      * @return the LhaArchiveEntry read from the buffer
      * @throws IOException
      */
-    protected LhaArchiveEntry readHeaderLevel2(ByteBuffer buffer) throws IOException {
+    LhaArchiveEntry readHeaderLevel2(ByteBuffer buffer) throws IOException {
         final int headerSize = Short.toUnsignedInt(buffer.getShort(HEADER_LEVEL_2_OFFSET_HEADER_SIZE));
         if (headerSize < HEADER_GENERIC_MINIMUM_HEADER_LENGTH) {
             throw new ArchiveException("Invalid header level 2 length: %d", headerSize);
@@ -414,7 +414,7 @@ protected LhaArchiveEntry readHeaderLevel2(ByteBuffer buffer) throws IOException
      * @return compression method, e.g. -lh5-
      * @throws ArchiveException if the compression method is invalid
      */
-    protected static String getCompressionMethod(final ByteBuffer buffer) throws ArchiveException {
+    static String getCompressionMethod(final ByteBuffer buffer) throws ArchiveException {
         final byte[] compressionMethodBuffer = new byte[5];
         byteBufferGet(buffer, HEADER_GENERIC_OFFSET_COMPRESSION_METHOD, compressionMethodBuffer);
 
@@ -445,7 +445,7 @@ protected static String getCompressionMethod(final ByteBuffer buffer) throws Arc
      * @param pathnameLength the length of the pathname
      * @return pathname
      */
-    protected String getPathname(final ByteBuffer buffer, final int pathnameLength) {
+    String getPathname(final ByteBuffer buffer, final int pathnameLength) {
         final byte[] pathnameBuffer = new byte[pathnameLength];
         buffer.get(pathnameBuffer);
 
@@ -525,7 +525,7 @@ private ByteBuffer readExtendedHeader(final int headerSize) throws IOException {
      * @param entryBuilder the entry builder to set the values in
      * @throws IOException
      */
-    protected void parseExtendedHeader(final ByteBuffer extendedHeaderBuffer, final LhaArchiveEntry.Builder entryBuilder) throws IOException {
+    void parseExtendedHeader(final ByteBuffer extendedHeaderBuffer, final LhaArchiveEntry.Builder entryBuilder) throws IOException {
         final int extendedHeaderType = Byte.toUnsignedInt(extendedHeaderBuffer.get());
         if (extendedHeaderType == EXTENDED_HEADER_TYPE_COMMON) {
             // Common header

src/main/java/org/apache/commons/compress/compressors/lha/AbstractLhStaticHuffmanCompressorInputStream.java

@@ -101,7 +101,7 @@ public void close() throws IOException {
      *
      * @return the copy threshold
      */
-    protected int getCopyThreshold() {
+    int getCopyThreshold() {
         return 3;
     }
 
@@ -110,14 +110,14 @@ protected int getCopyThreshold() {
      *
      * @return the number of bits used for the dictionary size
      */
-    protected abstract int getDictionaryBits();
+    abstract int getDictionaryBits();
 
     /**
      * Gets the size of the dictionary.
      *
      * @return the size of the dictionary
      */
-    protected int getDictionarySize() {
+    int getDictionarySize() {
         return 1 << getDictionaryBits();
     }
 
@@ -126,14 +126,14 @@ protected int getDictionarySize() {
      *
      * @return the number of bits used for the distance
      */
-    protected abstract int getDistanceBits();
+    abstract int getDistanceBits();
 
     /**
      * Gets the maximum number of distance codes in the distance tree.
      *
      * @return the maximum number of distance codes
      */
-    protected int getMaxNumberOfDistanceCodes() {
+    int getMaxNumberOfDistanceCodes() {
         return getDictionaryBits() + 1;
     }
 
@@ -142,7 +142,7 @@ protected int getMaxNumberOfDistanceCodes() {
      *
      * @return the maximum match length
      */
-    protected int getMaxMatchLength() {
+    int getMaxMatchLength() {
         return 256;
     }
 
@@ -152,7 +152,7 @@ protected int getMaxMatchLength() {
      *
      * @return the maximum number of commands
      */
-    protected int getMaxNumberOfCommands() {
+    int getMaxNumberOfCommands() {
         return NUMBER_OF_LITERAL_CODES + getMaxMatchLength() - getCopyThreshold() + 1;
     }
 
@@ -224,7 +224,7 @@ private void fillBuffer() throws IOException {
      * @return the command decoding tree
      * @throws IOException if an I/O error occurs
      */
-    protected BinaryTree readCommandDecodingTree() throws IOException {
+    BinaryTree readCommandDecodingTree() throws IOException {
         // Number of code lengths to read
         final int numCodeLengths = readBits(COMMAND_DECODING_LENGTH_BITS);
 
@@ -256,7 +256,7 @@ protected BinaryTree readCommandDecodingTree() throws IOException {
      * @return code length
      * @throws IOException if an I/O error occurs
      */
-    protected int readCodeLength() throws IOException {
+    int readCodeLength() throws IOException {
         int len = readBits(CODE_LENGTH_BITS);
         if (len == 0x07) {
             int bit = bin.readBit();
@@ -283,7 +283,7 @@ protected int readCodeLength() throws IOException {
      * @return the command tree
      * @throws IOException if an I/O error occurs
      */
-    protected BinaryTree readCommandTree(final BinaryTree commandDecodingTree) throws IOException {
+    BinaryTree readCommandTree(final BinaryTree commandDecodingTree) throws IOException {
         final int numCodeLengths = readBits(COMMAND_TREE_LENGTH_BITS);
 
         if (numCodeLengths > getMaxNumberOfCommands()) {

src/main/java/org/apache/commons/compress/compressors/lha/Lh4CompressorInputStream.java

@@ -33,17 +33,17 @@ public Lh4CompressorInputStream(final InputStream in) throws IOException {
     }
 
     @Override
-    protected int getDictionaryBits() {
+    int getDictionaryBits() {
         return 12;
     }
 
     @Override
-    protected int getDistanceBits() {
+    int getDistanceBits() {
         return 4;
     }
 
     @Override
-    protected int getMaxNumberOfDistanceCodes() {
+    int getMaxNumberOfDistanceCodes() {
         return getDictionaryBits() + 2;
     }
 }

src/main/java/org/apache/commons/compress/compressors/lha/Lh5CompressorInputStream.java

@@ -33,12 +33,12 @@ public Lh5CompressorInputStream(final InputStream in) throws IOException {
     }
 
     @Override
-    protected int getDictionaryBits() {
+    int getDictionaryBits() {
         return 13;
     }
 
     @Override
-    protected int getDistanceBits() {
+    int getDistanceBits() {
         return 4;
     }
 }

src/main/java/org/apache/commons/compress/compressors/lha/Lh6CompressorInputStream.java

@@ -33,12 +33,12 @@ public Lh6CompressorInputStream(final InputStream in) throws IOException {
     }
 
     @Override
-    protected int getDictionaryBits() {
+    int getDictionaryBits() {
         return 15;
     }
 
     @Override
-    protected int getDistanceBits() {
+    int getDistanceBits() {
         return 5;
     }
 }

src/main/java/org/apache/commons/compress/compressors/lha/Lh7CompressorInputStream.java

@@ -33,12 +33,12 @@ public Lh7CompressorInputStream(final InputStream in) throws IOException {
     }
 
     @Override
-    protected int getDictionaryBits() {
+    int getDictionaryBits() {
         return 16;
     }
 
     @Override
-    protected int getDistanceBits() {
+    int getDistanceBits() {
         return 5;
     }
 }