You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/06/04 13:28:31 UTC

(commons-compress) branch master updated (c1327d1d1 -> bf7522a67)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


    from c1327d1d1 Use Objects.equals() to simplify the Object.equals() implementations
     new a204e221f Better local variable name (PMD)
     new 9261a3fb5 Better local variable name (PMD)
     new 9e6e2be53 Better local variable name (PMD)
     new b79216feb Better local variable name (PMD)
     new 4da91497d Better local variable name (PMD)
     new 170f968a2 Better local variable name (PMD)
     new 18908074c Better local variable name (PMD)
     new ea0b5922d Better local variable name (PMD)
     new 35c85866d Better local variable name (PMD)
     new 22c085d03 Better local variable name (PMD)
     new 434d50bdd Fix PMD UselessQualifiedThis
     new 1f1c5bbb0 Javadoc
     new ef3864c5f Better local variable name (PMD)
     new 784ea342e Fix PMD UnusedFormalParameter in private method
     new ed84b21e7 PMD UnusedLocalVariable
     new de36dd63c Comment empty block (PMD)
     new 4f41c2c84 PMD UnusedFormalParameter
     new 76e63a709 PMD UnusedFormalParameter private
     new 05c16fc5b Fix NPE
     new 172829d06 Normalize spelling
     new 342a00ad9 PMD SimplifiedTernary
     new 862e0557e Format nits
     new eb0c4d240 PMD UnusedPrivateField
     new 0a9bb357c PMD UnusedLocalVariable
     new 2e95a6d6d PMD UnusedLocalVariable
     new bf7522a67 Bump org.apache.commons:commons-parent from 69 to 70

The 26 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |  7 +-
 src/changes/changes.xml                            |  4 +-
 src/conf/pmd-exclude.properties                    | 64 +++++++++++++++++++
 src/conf/pmd-ruleset.xml                           | 74 +++++++++++++++++++---
 .../compress/archivers/ArchiveStreamFactory.java   |  2 +-
 .../compress/archivers/sevenz/SevenZFile.java      |  2 +-
 .../archivers/sevenz/SevenZOutputFile.java         |  2 +-
 .../compress/archivers/tar/TarArchiveEntry.java    |  2 +-
 .../archivers/zip/ParallelScatterZipCreator.java   |  2 +-
 .../zip/X0017_StrongEncryptionHeader.java          |  9 ++-
 .../archivers/zip/ZipArchiveInputStream.java       | 25 ++++----
 .../compress/archivers/zip/ZipEncodingHelper.java  |  3 +-
 .../commons/compress/archivers/zip/ZipUtil.java    |  2 +-
 .../bzip2/BZip2CompressorOutputStream.java         |  7 +-
 .../pack200/TempFileCachingStreamBridge.java       |  2 +-
 .../harmony/archive/internal/nls/Messages.java     |  8 +--
 .../commons/compress/harmony/pack200/BandSet.java  | 14 ++--
 .../compress/harmony/unpack200/BcBands.java        |  2 -
 .../apache/commons/compress/utils/OsgiUtils.java   |  2 +-
 .../archivers/zip/ZipMemoryFileSystemTest.java     |  3 +-
 .../utils/FixedLengthBlockOutputStreamTest.java    |  4 +-
 21 files changed, 185 insertions(+), 55 deletions(-)
 create mode 100644 src/conf/pmd-exclude.properties


(commons-compress) 14/26: Fix PMD UnusedFormalParameter in private method

Posted by gg...@apache.org.
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 784ea342ef6cb685dc9585ad9dd774838229e17d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:24:39 2024 -0400

    Fix PMD UnusedFormalParameter in private method
---
 .../commons/compress/archivers/zip/ZipArchiveInputStream.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 500f32345..ab1e155c3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -659,7 +659,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
                 // archive.
                 if (!readFirstLocalFileHeader()) {
                     hitCentralDirectory = true;
-                    skipRemainderOfArchive(true);
+                    skipRemainderOfArchive();
                     return null;
                 }
             } else {
@@ -673,7 +673,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
         if (!sig.equals(ZipLong.LFH_SIG)) {
             if (sig.equals(ZipLong.CFH_SIG) || sig.equals(ZipLong.AED_SIG) || isApkSigningBlock(lfhBuf)) {
                 hitCentralDirectory = true;
-                skipRemainderOfArchive(false);
+                skipRemainderOfArchive();
                 return null;
             }
             throw new ZipException(String.format("Unexpected record signature: 0x%x", sig.getValue()));
@@ -1295,7 +1295,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
     /**
      * Reads the stream until it find the "End of central directory record" and consumes it as well.
      */
-    private void skipRemainderOfArchive(final boolean read) throws IOException {
+    private void skipRemainderOfArchive() throws IOException {
         // skip over central directory. One LFH has been read too much
         // already. The calculation discounts file names and extra
         // data, so it will be too short.


(commons-compress) 17/26: PMD UnusedFormalParameter

Posted by gg...@apache.org.
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 4f41c2c84b9da5f9619eaf53467e0c7584e85ac9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:38:50 2024 -0400

    PMD UnusedFormalParameter
---
 .../java/org/apache/commons/compress/harmony/pack200/BandSet.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index d905757e9..f75e28c58 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -239,7 +239,7 @@ public abstract class BandSet {
 
             // Note: these values have been tuned - please test carefully if changing them
             if (numDistinctValues < 100 || distinctValuesAsProportion < 0.02 || effort > 6 && distinctValuesAsProportion < 0.04) { // TODO: tweak
-                encodeWithPopulationCodec(name, band, defaultCodec, bandData, results);
+                encodeWithPopulationCodec(band, defaultCodec, bandData, results);
                 if (timeToStop(results)) {
                     return results;
                 }
@@ -504,8 +504,8 @@ public abstract class BandSet {
         return codec.encode(band);
     }
 
-    private void encodeWithPopulationCodec(final String name, final int[] band, final BHSDCodec defaultCodec, final BandData bandData,
-            final BandAnalysisResults results) throws Pack200Exception {
+    private void encodeWithPopulationCodec(final int[] band, final BHSDCodec defaultCodec, final BandData bandData, final BandAnalysisResults results)
+            throws Pack200Exception {
         results.numCodecsTried += 3; // quite a bit more effort to try this codec
         final Map<Integer, Integer> distinctValues = bandData.distinctValues;
 


(commons-compress) 01/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 a204e221f270b71b235f5bcd2fceb4e593e7a22c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 07:58:34 2024 -0400

    Better local variable name (PMD)
---
 .../java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3611e3623..793df3c26 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
@@ -2217,7 +2217,7 @@ public class SevenZFile implements Closeable {
                     if (result.packSizes.length > 0 && result.files.length > 0) {
                         return result;
                     }
-                } catch (final Exception ignore) {
+                } catch (final Exception ignored) {
                     // Wrong guess...
                 }
             }


(commons-compress) 23/26: PMD UnusedPrivateField

Posted by gg...@apache.org.
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 eb0c4d240030dc1998851f65b0209a9efb0d3acb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 09:16:19 2024 -0400

    PMD UnusedPrivateField
---
 .../commons/compress/archivers/zip/ZipArchiveInputStream.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 40af2e351..bafe2b66c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -296,7 +296,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
     /**
      * The factory for extra fields or null.
      */
-    private Function<ZipShort, ZipExtraField> extraFieldSupport;
+    // private Function<ZipShort, ZipExtraField> extraFieldSupport;
 
     /**
      * Constructs an instance using UTF-8 encoding
@@ -1249,12 +1249,14 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
     }
 
     /**
-     * Enable custom extra fields factory.
+     * Currently unused.
+     *
+     * Sets the custom extra fields factory.
      * @param extraFieldSupport the lookup function based on extra field header id.
      * @return the archive.
      */
     public ZipArchiveInputStream setExtraFieldSupport(final Function<ZipShort, ZipExtraField> extraFieldSupport) {
-        this.extraFieldSupport = extraFieldSupport;
+        // this.extraFieldSupport = extraFieldSupport;
         return this;
     }
 


(commons-compress) 05/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 4da91497d09c1b3c151f7fb6fd4e5304ffc81616
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:00:34 2024 -0400

    Better local variable name (PMD)
---
 src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
index 9639d788c..0fb57fe79 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
@@ -215,7 +215,7 @@ public abstract class ZipUtil {
             if (origCRC32 == f.getNameCRC32()) {
                 try {
                     return ZipEncodingHelper.ZIP_ENCODING_UTF_8.decode(f.getUnicodeName());
-                } catch (final IOException ex) {
+                } catch (final IOException ignored) {
                     // UTF-8 unsupported? should be impossible the
                     // Unicode*ExtraField must contain some bad bytes
                 }


(commons-compress) 26/26: Bump org.apache.commons:commons-parent from 69 to 70

Posted by gg...@apache.org.
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 bf7522a67df8ac727920fdaee1133d03e56d5a25
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 09:28:23 2024 -0400

    Bump org.apache.commons:commons-parent from 69 to 70
    
    Bump PMD from 6.x to 7.2.0
---
 pom.xml                         |  7 ++--
 src/changes/changes.xml         |  4 ++-
 src/conf/pmd-exclude.properties | 64 +++++++++++++++++++++++++++++++++++
 src/conf/pmd-ruleset.xml        | 74 ++++++++++++++++++++++++++++++++++++-----
 4 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index b5f82c7d1..4563643c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>69</version>
+    <version>70</version>
   </parent>
 
   <artifactId>commons-compress</artifactId>
@@ -50,6 +50,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
     <commons.bc.version>1.26.2</commons.bc.version>
     <commons.rc.version>RC1</commons.rc.version>
     <mockito.version>4.11.0</mockito.version>
+    <commons.pmd-impl.version>7.2.0</commons.pmd-impl.version>
 
     <commons.release.isDistModule>true</commons.release.isDistModule>
     <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
@@ -255,10 +256,10 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
             <docencoding>${commons.docEncoding}</docencoding>
             <linksource>true</linksource>
             <links>
-              <link>${commons.javadoc8.java.link}</link>
               <link>${commons.javadoc.javaee.link}</link>
               <link>https://commons.apache.org/proper/commons-codec/apidocs</link>
               <link>https://commons.apache.org/proper/commons-io/apidocs</link>
+              <link>https://commons.apache.org/proper/commons-lang/apidocs</link>
             </links>
             <tags>
               <tag>
@@ -371,6 +372,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
         <configuration>
           <minimumTokens>200</minimumTokens>
           <targetJdk>${maven.compiler.source}</targetJdk>
+          <excludeFromFailureFile>src/conf/pmd-exclude.properties</excludeFromFailureFile>
           <rulesets>
             <ruleset>${basedir}/src/conf/pmd-ruleset.xml</ruleset>
           </rulesets>
@@ -429,6 +431,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
         <configuration>
           <minimumTokens>200</minimumTokens>
           <targetJdk>${maven.compiler.source}</targetJdk>
+          <excludeFromFailureFile>src/conf/pmd-exclude.properties</excludeFromFailureFile>
           <rulesets>
             <ruleset>${basedir}/src/conf/pmd-ruleset.xml</ruleset>
           </rulesets>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7844cbe3a..b72863a63 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,11 +46,13 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <release version="1.27.0" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
       <!-- FIX -->
-      <action type="add" dev="ggregory" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName.</action>
+      <action type="add" dev="ggregory" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName and others.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add ArchiveInputStream.forEach(IOConsumer).</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add ArchiveInputStream.iterator().</action>
       <!-- UPDATE -->
+      <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump org.apache.commons:commons-parent from 69 to 70.</action>
+      <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump PMD from 6.x to 7.2.0.</action>
     </release>
     <release version="1.26.2" date="2024-05-18" description="Minor feature and maintenance release.">
       <!-- FIX -->
diff --git a/src/conf/pmd-exclude.properties b/src/conf/pmd-exclude.properties
new file mode 100644
index 000000000..9f4ee7cac
--- /dev/null
+++ b/src/conf/pmd-exclude.properties
@@ -0,0 +1,64 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AvoidUsingOctalValues
+# We use octal values from C ports and documentation
+org.apache.commons.compress.archivers.cpio.CpioConstants = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.cpio.CpioArchiveOutputStream = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.dump.PERMISSION = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.dump.DumpArchiveEntry = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.tar.TarArchiveEntry = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.tar.TarConstants = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.zip.UnixStat = AvoidUsingOctalValues
+org.apache.commons.compress.archivers.zip.ZipArchiveEntry = AvoidUsingOctalValues
+
+# UselessParentheses
+# False positives
+org.apache.commons.compress.archivers.dump.TapeInputStream = UselessParentheses
+org.apache.commons.compress.archivers.tar.TarUtils = UselessParentheses
+
+# UnusedPrivateField
+# TODO
+org.apache.commons.compress.archivers.zip.X0017_StrongEncryptionHeader = UnusedPrivateField
+org.apache.commons.compress.archivers.zip.ZipArchiveInputStream = UnusedPrivateField
+org.apache.commons.compress.harmony.pack200.IntList = UnusedPrivateField
+org.apache.commons.compress.harmony.unpack200.BcBands = UnusedPrivateField
+org.apache.commons.compress.harmony.unpack200.SegmentHeader = UnusedPrivateField
+
+# UnusedPrivateMethod
+# False positives
+org.apache.commons.compress.changes.ChangeSet = UnusedPrivateMethod
+
+# UnusedFormalParameter
+# Binary compatibility
+org.apache.commons.compress.harmony.unpack200.bytecode.InnerClassesAttribute = UnusedFormalParameter
+
+# JumbledIncrementer, AvoidBranchingStatementAsLastInLoop
+# Ported from C
+org.apache.commons.compress.compressors.bzip2.BlockSort = JumbledIncrementer, AvoidBranchingStatementAsLastInLoop
+
+# TODO?
+org.apache.commons.compress.archivers.zip.ZipArchiveInputStream = JumbledIncrementer
+
+# OverrideBothEqualsAndHashcode
+# TODO Needs review
+org.apache.commons.compress.harmony.unpack200.AttributeLayout = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.AnnotationDefaultAttribute = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.CPInterfaceMethodRef = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.CPMethod = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.CPMethodRef = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.CPRef = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.CPString = OverrideBothEqualsAndHashcode
+org.apache.commons.compress.harmony.unpack200.bytecode.LineNumberTableAttribute = OverrideBothEqualsAndHashcode
diff --git a/src/conf/pmd-ruleset.xml b/src/conf/pmd-ruleset.xml
index f2c9ea7be..cd3e77a90 100644
--- a/src/conf/pmd-ruleset.xml
+++ b/src/conf/pmd-ruleset.xml
@@ -21,12 +21,68 @@
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
-  <description>Standard Ruleset but excluding the "no octal constants" rule</description>
-  <rule ref="rulesets/java/basic.xml">
-    <exclude name="AvoidUsingOctalValues"/>
-  </rule>
-  <rule ref="rulesets/java/finalizers.xml"/>
-  <rule ref="rulesets/java/imports.xml"/>
-  <rule ref="rulesets/java/unusedcode.xml"/>
-  <rule ref="rulesets/java/braces.xml"/>
-</ruleset>
+
+    <description>Apache Commons Compress custom</description>
+
+    <!-- from https://raw.githubusercontent.com/apache/maven-pmd-plugin/HEAD/src/main/resources/rulesets/java/maven-pmd-plugin-default.xml -->
+    <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" />
+    <rule ref="category/java/bestpractices.xml/CheckResultSet" />
+    <rule ref="category/java/bestpractices.xml/PrimitiveWrapperInstantiation" />
+    <rule ref="category/java/bestpractices.xml/UnusedFormalParameter" />
+    <rule ref="category/java/bestpractices.xml/UnusedLocalVariable" />
+    <rule ref="category/java/bestpractices.xml/UnusedPrivateField" />
+    <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod" />
+
+    <!-- Apache Commons Compress custom <rule ref="category/java/codestyle.xml/EmptyControlStatement" /> -->
+    <rule ref="category/java/codestyle.xml/ExtendsObject" />
+    <rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop" />
+    <rule ref="category/java/codestyle.xml/TooManyStaticImports" />
+    <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName" />
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport" />
+    <rule ref="category/java/codestyle.xml/UnnecessaryModifier" />
+    <rule ref="category/java/codestyle.xml/UnnecessaryReturn" />
+    <rule ref="category/java/codestyle.xml/UnnecessarySemicolon" />
+    <rule ref="category/java/codestyle.xml/UselessParentheses" />
+    <rule ref="category/java/codestyle.xml/UselessQualifiedThis" />
+
+    <rule ref="category/java/design.xml/CollapsibleIfStatements" />
+    <rule ref="category/java/design.xml/SimplifiedTernary" />
+    <rule ref="category/java/design.xml/UselessOverridingMethod" />
+
+    <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop" />
+    <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
+    <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators" />
+    <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues" />
+    <rule ref="category/java/errorprone.xml/BrokenNullCheck" />
+    <rule ref="category/java/errorprone.xml/CheckSkipResult" />
+    <rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray" />
+    <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
+    <!-- Apache Commons Compress custom <rule ref="category/java/errorprone.xml/EmptyCatchBlock" /> -->
+    <rule ref="category/java/errorprone.xml/JumbledIncrementer" />
+    <rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
+    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
+    <rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock" />
+    <rule ref="category/java/errorprone.xml/UnconditionalIfStatement" />
+    <rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary" />
+    <rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals" />
+    <rule ref="category/java/errorprone.xml/UselessOperationOnImmutable" />
+
+    <rule ref="category/java/multithreading.xml/AvoidThreadGroup" />
+    <rule ref="category/java/multithreading.xml/DontCallThreadRun" />
+    <rule ref="category/java/multithreading.xml/DoubleCheckedLocking" />
+
+    <rule ref="category/java/performance.xml/BigIntegerInstantiation" />
+
+    <!-- Apache Commons Compress custom -->
+    <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
+      <properties>
+        <property name="allowCommentedBlocks" value="true" />
+        <property name="allowExceptionNameRegex" value="^(ignored|expected)$" />
+      </properties>
+    </rule>
+    <rule ref="category/java/codestyle.xml/EmptyControlStatement">
+      <properties>
+        <property name="allowCommentedBlocks" value="true" />
+      </properties>
+    </rule>
+  </ruleset>


(commons-compress) 19/26: Fix NPE

Posted by gg...@apache.org.
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 05c16fc5b279bb5c299f75013d92f1597a7ee658
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:55:06 2024 -0400

    Fix NPE
---
 .../compress/compressors/bzip2/BZip2CompressorOutputStream.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index 24390f939..66e6a808a 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.util.Arrays;
 
 import org.apache.commons.compress.compressors.CompressorOutputStream;
+import org.apache.commons.io.IOUtils;
 
 /**
  * An output stream that compresses into the BZip2 format into another stream.
@@ -487,7 +488,7 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream implemen
             try {
                 finish();
             } finally {
-                this.out.close();
+                IOUtils.close(out);
             }
         }
     }


(commons-compress) 25/26: PMD UnusedLocalVariable

Posted by gg...@apache.org.
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 2e95a6d6d97f2e6c9c41fdbf34069239c58a9918
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 09:23:52 2024 -0400

    PMD UnusedLocalVariable
---
 src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
index 2826b3a12..539a17ad5 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
@@ -224,7 +224,6 @@ public class BcBands extends BandSet {
                         codeBytes.write(code);
                     }
                     methodByteCodePacked[c][m] = codeBytes.toByteArray();
-                    bcParsed += methodByteCodePacked[c][m].length;
                     final int[] codes = new int[methodByteCodePacked[c][m].length];
                     for (int i = 0; i < codes.length; i++) {
                         codes[i] = methodByteCodePacked[c][m][i] & 0xff;


(commons-compress) 11/26: Fix PMD UselessQualifiedThis

Posted by gg...@apache.org.
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 434d50bddf86610c9bfe83f0babe8283821702d0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:08:07 2024 -0400

    Fix PMD UselessQualifiedThis
    
    Useless qualified this usage in the same class
---
 .../org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
index c2424bf0e..0ce3cf585 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
@@ -79,7 +79,7 @@ public class SevenZOutputFile implements Closeable {
 
         @Override
         public void write(final byte[] b) throws IOException {
-            OutputStreamWrapper.this.write(b, 0, b.length);
+            write(b, 0, b.length);
         }
 
         @Override


(commons-compress) 03/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 9e6e2be5346afb943ea6294de7d91cfe7559261e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 07:59:24 2024 -0400

    Better local variable name (PMD)
---
 .../commons/compress/archivers/zip/ParallelScatterZipCreator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index 004c24b2b..da7d71444 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -152,7 +152,7 @@ public class ParallelScatterZipCreator {
         for (final ScatterZipOutputStream scatterStream : streams) {
             try {
                 scatterStream.close();
-            } catch (final IOException ex) { // NOSONAR
+            } catch (final IOException ignored) {
                 // no way to properly log this
             }
         }


(commons-compress) 22/26: Format nits

Posted by gg...@apache.org.
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 862e0557e5b0851bac752cc98caaf7ab83674e53
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:59:32 2024 -0400

    Format nits
---
 .../commons/compress/archivers/zip/ZipArchiveInputStream.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index ab1e155c3..40af2e351 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -1019,18 +1019,15 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
             READ_LOOP: for (int i = 0; ; ) {
                 for (int j = 0; i <= PREAMBLE_GARBAGE_MAX_SIZE - 4 && j <= header.length - 4; ++j, ++i) {
                     final ZipLong sig = new ZipLong(header, j);
-                    if (
-                            sig.equals(ZipLong.LFH_SIG) ||
-                            sig.equals(ZipLong.SINGLE_SEGMENT_SPLIT_MARKER) ||
-                            sig.equals(ZipLong.DD_SIG)) {
+                    if (sig.equals(ZipLong.LFH_SIG) ||
+                        sig.equals(ZipLong.SINGLE_SEGMENT_SPLIT_MARKER) ||
+                        sig.equals(ZipLong.DD_SIG)) {
                         // regular archive containing at least one entry:
                         System.arraycopy(header, j, header, 0, header.length - j);
                         readFully(header, header.length - j);
                         break READ_LOOP;
                     }
-                    if (
-                            sig.equals(new ZipLong(ZipArchiveOutputStream.EOCD_SIG))
-                    ) {
+                    if (sig.equals(new ZipLong(ZipArchiveOutputStream.EOCD_SIG))) {
                         // empty archive:
                         pushback(header, j, header.length - j);
                         return false;


(commons-compress) 12/26: Javadoc

Posted by gg...@apache.org.
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 1f1c5bbb0970c48bcef64c63133ac301aff03524
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:10:34 2024 -0400

    Javadoc
---
 .../compress/archivers/zip/X0017_StrongEncryptionHeader.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
index d579949bd..42c08a0dc 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
@@ -267,15 +267,18 @@ public class X0017_StrongEncryptionHeader extends PKWareExtraHeader {
     private long rcount;
     private HashAlgorithm hashAlg;
     private int hashSize;
-    // encryption data
+
+    /** Encryption data/ */
     private byte[] ivData;
 
     private byte[] erdData;
-    // encryption key
+
+    /** Encryption key. */
     private byte[] recipientKeyHash;
 
     private byte[] keyBlob;
-    // password verification data
+
+    /** Password verification data. */
     private byte[] vData;
 
     private byte[] vCRC32;


(commons-compress) 20/26: Normalize spelling

Posted by gg...@apache.org.
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 172829d06025818889c7b26ee73d3cf04e0b331a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:56:53 2024 -0400

    Normalize spelling
---
 .../commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index 66e6a808a..946c99d7b 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -522,7 +522,7 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream implemen
         /* Now the block's CRC, so it is in a known place. */
         bsPutInt(blockCRC);
 
-        /* Now a single bit indicating no randomisation. */
+        /* Now a single bit indicating no randomization. */
         bsW(1, 0);
 
         /* Finally, block's contents proper. */


(commons-compress) 10/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 22c085d03c0d99c64812f26f5393386bf6939bc5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:03:53 2024 -0400

    Better local variable name (PMD)
---
 .../apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
index 73b6a4187..68d5f48a6 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
@@ -83,7 +83,8 @@ public class ZipMemoryFileSystemTest {
             walk.sorted(Comparator.reverseOrder()).peek(path -> println("Deleting: " + path.toAbsolutePath())).forEach(path -> {
                 try {
                     Files.deleteIfExists(path);
-                } catch (final IOException ignore) {
+                } catch (final IOException ignored) {
+                    // ignored
                 }
             });
         }


(commons-compress) 06/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 170f968a268f0edeba20d85958dcaf8c5c9c8242
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:01:20 2024 -0400

    Better local variable name (PMD)
---
 .../compress/compressors/pack200/TempFileCachingStreamBridge.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 12c632c61..25f003378 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
@@ -52,7 +52,7 @@ final class TempFileCachingStreamBridge extends AbstractStreamBridge {
                 } finally {
                     try {
                         Files.deleteIfExists(path);
-                    } catch (final IOException ignore) {
+                    } catch (final IOException ignored) {
                         // if this fails the only thing we can do is to rely on deleteOnExit
                     }
                 }


(commons-compress) 21/26: PMD SimplifiedTernary

Posted by gg...@apache.org.
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 342a00ad955758fd4123f91fb3187b0de6257677
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:59:14 2024 -0400

    PMD SimplifiedTernary
---
 src/main/java/org/apache/commons/compress/utils/OsgiUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/utils/OsgiUtils.java b/src/main/java/org/apache/commons/compress/utils/OsgiUtils.java
index 123f3806e..8bf519f05 100644
--- a/src/main/java/org/apache/commons/compress/utils/OsgiUtils.java
+++ b/src/main/java/org/apache/commons/compress/utils/OsgiUtils.java
@@ -28,7 +28,7 @@ public class OsgiUtils {
 
     static {
         final ClassLoader classLoader = OsgiUtils.class.getClassLoader();
-        inOsgiEnvironment = classLoader != null ? isBundleReference(classLoader.getClass()) : false;
+        inOsgiEnvironment = classLoader != null && isBundleReference(classLoader.getClass());
     }
 
     private static boolean isBundleReference(final Class<?> clazz) {


(commons-compress) 08/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 ea0b5922dd0578edc3cfc3afb74f04836d218de7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:02:12 2024 -0400

    Better local variable name (PMD)
---
 .../commons/compress/harmony/archive/internal/nls/Messages.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
index d7cf6866a..068990f60 100644
--- a/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
+++ b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
@@ -203,8 +203,8 @@ public class Messages {
             final ClassLoader loader = null; // VM.bootCallerClassLoader();
             return (ResourceBundle) AccessController.doPrivileged(
                     (PrivilegedAction<Object>) () -> ResourceBundle.getBundle(resource, locale, loader != null ? loader : ClassLoader.getSystemClassLoader()));
-        } catch (final MissingResourceException e) {
-            // ignore
+        } catch (final MissingResourceException ignored) {
+            // ignored
         }
         return null;
     }


(commons-compress) 13/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 ef3864c5fd3db5811983a0cd73a5e143ba0c76c4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:13:33 2024 -0400

    Better local variable name (PMD)
---
 .../org/apache/commons/compress/archivers/ArchiveStreamFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index c0ef53333..24f80b9f0 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -288,7 +288,7 @@ public class ArchiveStreamFactory implements ArchiveStreamProvider {
                 if (entry != null && entry.isCheckSumOK() && !entry.isDirectory() && entry.getSize() > 0 || count > 0) {
                     return TAR;
                 }
-            } catch (final Exception e) { // NOPMD NOSONAR
+            } catch (final Exception ignored) {
                 // can generate IllegalArgumentException as well as IOException auto-detection, simply not a TAR ignored
             }
         }


(commons-compress) 15/26: PMD UnusedLocalVariable

Posted by gg...@apache.org.
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 ed84b21e7de77648fd4e80b09dbdfdfe87394aed
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:31:18 2024 -0400

    PMD UnusedLocalVariable
---
 .../compress/compressors/bzip2/BZip2CompressorOutputStream.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index 334e9d892..24390f939 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -484,8 +484,10 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream implemen
     @Override
     public void close() throws IOException {
         if (!closed) {
-            try (OutputStream outShadow = this.out) {
+            try {
                 finish();
+            } finally {
+                this.out.close();
             }
         }
     }


(commons-compress) 16/26: Comment empty block (PMD)

Posted by gg...@apache.org.
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 de36dd63cc4640f7bb8e3b0b5b5e90480e3743b4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:38:08 2024 -0400

    Comment empty block (PMD)
---
 src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index d87bac80e..d905757e9 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -381,7 +381,7 @@ public abstract class BandSet {
                     return encodedBand;
                 }
                 if (betterCodec instanceof RunCodec) {
-
+                    // TODO?
                 }
             }
         }


(commons-compress) 18/26: PMD UnusedFormalParameter private

Posted by gg...@apache.org.
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 76e63a7095428cf2812b3fe8402298eb14b997b8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:39:15 2024 -0400

    PMD UnusedFormalParameter private
---
 .../java/org/apache/commons/compress/harmony/pack200/BandSet.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index f75e28c58..b70532a76 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -293,7 +293,7 @@ public abstract class BandSet {
             codecFamiliesToTry.add(CanonicalCodecFamilies.deltaUnsignedCodecs5);
         }
         for (final BHSDCodec[] family : codecFamiliesToTry) {
-            tryCodecs(name, band, defaultCodec, bandData, results, encoded, family);
+            tryCodecs(band, defaultCodec, bandData, results, encoded, family);
             if (timeToStop(results)) {
                 break;
             }
@@ -716,8 +716,8 @@ public abstract class BandSet {
         // || (float) results.saved/(float) results.encodedBand.length > (float) effort * 2/100;
     }
 
-    private void tryCodecs(final String name, final int[] band, final BHSDCodec defaultCodec, final BandData bandData, final BandAnalysisResults results,
-            final byte[] encoded, final BHSDCodec[] potentialCodecs) throws Pack200Exception {
+    private void tryCodecs(final int[] band, final BHSDCodec defaultCodec, final BandData bandData, final BandAnalysisResults results, final byte[] encoded,
+            final BHSDCodec[] potentialCodecs) throws Pack200Exception {
         for (final BHSDCodec potential : potentialCodecs) {
             if (potential.equals(defaultCodec)) {
                 return; // don't try codecs with greater cardinality in the same 'family' as the default codec as there


(commons-compress) 04/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 b79216feba0fe4e1251e9d74984c4ecad9689298
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:00:08 2024 -0400

    Better local variable name (PMD)
---
 .../org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
index 92dfdfcdc..3f4dede20 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java
@@ -98,7 +98,8 @@ public abstract class ZipEncodingHelper {
         Charset charset = Charset.defaultCharset();
         try {
             charset = Charsets.toCharset(name);
-        } catch (final UnsupportedCharsetException ignore) { // NOSONAR we use the default encoding instead
+        } catch (final UnsupportedCharsetException ignored) {
+            // Use the default encoding instead.
         }
         return charset;
     }


(commons-compress) 07/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 18908074ccacf8d307bacfbd7065f60d04d2774d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:01:52 2024 -0400

    Better local variable name (PMD)
---
 .../commons/compress/harmony/archive/internal/nls/Messages.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
index 961db32ee..d7cf6866a 100644
--- a/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
+++ b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
@@ -182,8 +182,8 @@ public class Messages {
         if (bundle != null) {
             try {
                 format = bundle.getString(msg);
-            } catch (final MissingResourceException e) {
-                // ignore
+            } catch (final MissingResourceException ignored) {
+                // ignored
             }
         }
 


(commons-compress) 02/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 9261a3fb51e792236b2b5c51bcf85fcf35f9dde6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 07:58:51 2024 -0400

    Better local variable name (PMD)
---
 .../java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index d860c242f..b3f577996 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -1681,7 +1681,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants, EntryStreamO
                 this.groupId = ((Number) Files.getAttribute(file, "unix:gid", options)).longValue();
                 try {
                     setStatusChangeTime((FileTime) Files.getAttribute(file, "unix:ctime", options));
-                } catch (final IllegalArgumentException ex) { // NOSONAR
+                } catch (final IllegalArgumentException ignored) {
                     // ctime is not supported
                 }
             }


(commons-compress) 09/26: Better local variable name (PMD)

Posted by gg...@apache.org.
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 35c85866d4bfd18c9eeacdeaa99bab2ceef276a8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 08:03:48 2024 -0400

    Better local variable name (PMD)
---
 .../commons/compress/utils/FixedLengthBlockOutputStreamTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 95aca1e80..02d1e17a9 100644
--- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
@@ -228,8 +228,8 @@ public class FixedLengthBlockOutputStreamTest {
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             try {
                 Files.deleteIfExists(tempFile);
-            } catch (final IOException ignore) {
-                // ignore
+            } catch (final IOException ignored) {
+                // ignored
             }
         }));
         final int blockSize = 512;


(commons-compress) 24/26: PMD UnusedLocalVariable

Posted by gg...@apache.org.
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 0a9bb357cbcbf79e59ec99d9d4e0d629bb9767a8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 4 09:18:50 2024 -0400

    PMD UnusedLocalVariable
---
 src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
index e9267fb67..2826b3a12 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
@@ -209,7 +209,6 @@ public class BcBands extends BandSet {
         final AttributeLayout nativeModifier = attributeDefinitionMap.getAttributeLayout(AttributeLayout.ACC_NATIVE, AttributeLayout.CONTEXT_METHOD);
 
         methodByteCodePacked = new byte[classCount][][];
-        int bcParsed = 0;
 
         final List<Boolean> switchIsTableSwitch = new ArrayList<>();
         wideByteCodes = new ArrayList<>();