PMD update

README.md

@@ -98,7 +98,7 @@ Argument | Description
 **‑v**, **‑‑verbosity** |  choose logging level according [this](https://docs.python.org/3/library/logging.html#levels) list: `1` - **ERROR**; `2` - **INFO**; `3` - **DEBUG**; `0` - disable logging (**CRITICAL** value); default value is `0` (**CRITICAL**).
 **‑d**, **‑‑disable**   |  disable inspectors. Available values: for **Python** language: `pylint` for [Pylint](https://github.com/PyCQA/pylint), `flake8` for [flake8](https://flake8.pycqa.org/en/latest/), `radon` for [Radon](https://radon.readthedocs.io/en/latest/), `python_ast` to check different measures providing by AST; for **Java** language: `checkstyle` for the [Checkstyle](https://checkstyle.sourceforge.io/), `pmd` for [PMD](https://pmd.github.io/); for `Kotlin` language: detekt for [Detekt](https://detekt.github.io/detekt/); for **JavaScript** language: `eslint` for [ESlint](https://eslint.org/). Example: `-d pylint,flake8`.
 **‑‑allow-duplicates**        |  allow duplicate issues found by different linters. By default, duplicates are skipped.
-**‑‑language-version**, **‑‑language_version**  |  specify the language version for JAVA inspectors. Available values: `java7`, `java8`, `java9`, `java11`. **Note**: **‑‑language_version** is deprecated. Will be deleted in the future.
+**‑‑language-version**, **‑‑language_version**  |  specify the language version for JAVA inspectors. Available values: `java7`, `java8`, `java9`, `java11`, `java15`. **Note**: **‑‑language_version** is deprecated and will be deleted in the future.
 **‑‑n-cpu**, **‑‑n_cpu**  |  specify number of _cpu_ that can be used to run inspectors. **Note**: **‑‑n_cpu** is deprecated. Will be deleted in the future.
 **‑f**, **‑‑format**    |  the output format. Available values: `json`, `text`. Default value is `json`.
 **‑s**, **‑‑start-line**|  the first line to be analyzed. By default it starts from `1`.

src/python/review/application_config.py

@@ -25,6 +25,7 @@ class LanguageVersion(Enum):
     JAVA_8 = 'java8'
     JAVA_9 = 'java9'
     JAVA_11 = 'java11'
+    JAVA_15 = 'java15'
     PYTHON_3 = 'python3'
     KOTLIN = 'kotlin'
 
@@ -39,6 +40,7 @@ def language_to_extension_dict(cls) -> Dict['LanguageVersion', Extension]:
                 cls.JAVA_8: Extension.JAVA,
                 cls.JAVA_9: Extension.JAVA,
                 cls.JAVA_11: Extension.JAVA,
+                cls.JAVA_15: Extension.JAVA,
                 cls.KOTLIN: Extension.KT}
 
     def extension_by_language(self) -> Extension:
@@ -50,4 +52,5 @@ def is_java(self) -> bool:
             or self == LanguageVersion.JAVA_8
             or self == LanguageVersion.JAVA_9
             or self == LanguageVersion.JAVA_11
+            or self == LanguageVersion.JAVA_15
         )

src/python/review/inspectors/common.py

@@ -10,3 +10,14 @@ def convert_percentage_of_value_to_lack_of_value(percentage_of_value: float) ->
     :return: lack of value.
     """
     return floor(100 - percentage_of_value)
+
+
+# TODO: When upgrading to python 3.9+, replace it with removeprefix.
+# See: https://docs.python.org/3.9/library/stdtypes.html#str.removeprefix
+def remove_prefix(text: str, prefix: str) -> str:
+    """
+    Removes the prefix if it is present, otherwise returns the original string.
+    """
+    if text.startswith(prefix):
+        return text[len(prefix):]
+    return text

src/python/review/inspectors/pmd/files/bin/ast-dump.bat

@@ -0,0 +1,6 @@
+@echo off
+set TOPDIR=%~dp0..
+set OPTS=
+set MAIN_CLASS=net.sourceforge.pmd.util.treeexport.TreeExportCli
+
+java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*

src/python/review/inspectors/pmd/files/bin/basic.xml

@@ -1,19 +1,23 @@
 <?xml version="1.0"?>
+
 <ruleset name="Basic"
-    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 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
-  <description>
-    The Basic ruleset contains a collection of good practices which should be followed.
-  </description>
+         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 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        The Basic ruleset contains a collection of good practices which should be followed.
+    </description>
+
     <!-- Best Practices -->
     <rule ref="category/java/bestpractices.xml/AbstractClassWithoutAbstractMethod"/>
     <rule ref="category/java/bestpractices.xml/AccessorClassGeneration"/>
     <rule ref="category/java/bestpractices.xml/AccessorMethodGeneration"/>
     <rule ref="category/java/bestpractices.xml/ArrayIsStoredDirectly"/>
     <rule ref="category/java/bestpractices.xml/AvoidMessageDigestField"/>
-    <rule ref="category/java/bestpractices.xml/AvoidReassigningParameters"/>
+    <rule ref="category/java/bestpractices.xml/AvoidReassigningCatchVariables"/>
     <rule ref="category/java/bestpractices.xml/AvoidReassigningLoopVariables"/>
+    <rule ref="category/java/bestpractices.xml/AvoidReassigningParameters"/>
     <rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>
     <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
     <rule ref="category/java/bestpractices.xml/CheckResultSet"/>
@@ -25,87 +29,74 @@
             <property name="maximumVariables" value="2"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/GuardLogStatement"/>
+    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/MethodReturnsInternalArray"/>
+    <rule ref="category/java/bestpractices.xml/MissingOverride"/>
     <rule ref="category/java/bestpractices.xml/OneDeclarationPerLine"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInCaseInsensitiveComparisons"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <rule ref="category/java/bestpractices.xml/SwitchStmtsShouldHaveDefault"/>
     <rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
-    <rule ref="category/java/bestpractices.xml/UnusedImports"/>
     <rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
     <rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
+    <rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>
     <rule ref="category/java/bestpractices.xml/UseTryWithResources"/>
+    <rule ref="category/java/bestpractices.xml/WhileLoopWithLiteralBoolean"/>
 
-    <!-- Code Style rules -->
+    <!-- Code Style -->
     <rule ref="category/java/codestyle.xml/AvoidDollarSigns"/>
     <rule ref="category/java/codestyle.xml/AvoidProtectedFieldInFinalClass"/>
-    <rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
+    <rule ref="category/java/codestyle.xml/AvoidProtectedMethodInFinalClassNotExtending"/>
     <rule ref="category/java/codestyle.xml/BooleanGetMethodName"/>
+    <rule ref="category/java/codestyle.xml/CallSuperInConstructor"/>
     <rule ref="category/java/codestyle.xml/ClassNamingConventions">
-      <properties>
-        <property name="utilityClassPattern" value="[A-Z][a-zA-Z0-9]+(Utils?|Helper|Constants)?" />
-      </properties>
+        <properties>
+            <property name="utilityClassPattern" value="[A-Z][a-zA-Z0-9]+(Utils?|Helper|Constants)?"/>
+        </properties>
     </rule>
-<!--    <rule ref="category/java/codestyle.xml/ConfusingTernary"/>-->
     <rule ref="category/java/codestyle.xml/ControlStatementBraces"/>
-    <rule ref="category/java/codestyle.xml/DontImportJavaLang"/>
-    <rule ref="category/java/codestyle.xml/DuplicateImports"/>
     <rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
     <rule ref="category/java/codestyle.xml/ExtendsObject"/>
     <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
     <rule ref="category/java/codestyle.xml/FieldNamingConventions">
-      <properties>
-        <property name="exclusions" value="serialVersionUID|serialPersistentFields|log|logger"/>
-      </properties>
+        <properties>
+            <property name="exclusions" value="serialVersionUID|serialPersistentFields|log|logger"/>
+        </properties>
     </rule>
     <rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
     <rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
-<!--    <rule ref="category/java/codestyle.xml/LinguisticNaming"/>-->
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
     <rule ref="category/java/codestyle.xml/MethodNamingConventions"/>
     <rule ref="category/java/codestyle.xml/PackageCase"/>
-<!--    <rule ref="category/java/codestyle.xml/TooManyStaticImports">-->
-<!--      <properties>-->
-<!--        <property name="maximumStaticImports" value="5"/>-->
-<!--      </properties>-->
-<!--    </rule>-->
+    <rule ref="category/java/codestyle.xml/UnnecessaryCast"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
-    <rule ref="category/java/codestyle.xml/UseDiamondOperator"/>
+    <rule ref="category/java/codestyle.xml/UseDiamondOperator">
+        <properties>
+            <property name="java7Compatibility" value="true"/>
+        </properties>
+    </rule>
     <rule ref="category/java/codestyle.xml/UselessParentheses"/>
     <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
     <rule ref="category/java/codestyle.xml/UseShortArrayInitializer"/>
-    <rule ref="category/java/codestyle.xml/UseUnderscoresInNumericLiterals"/>
 
     <!-- Design -->
     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts"/>
     <rule ref="category/java/design.xml/AvoidRethrowingException"/>
     <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/>
     <rule ref="category/java/design.xml/AvoidUncheckedExceptionsInSignatures"/>
     <rule ref="category/java/design.xml/CollapsibleIfStatements"/>
-<!--    <rule ref="category/java/design.xml/CouplingBetweenObjects"/>-->
-<!--    <rule ref="category/java/design.xml/CyclomaticComplexity"/>-->
     <rule ref="category/java/design.xml/DoNotExtendJavaLangError"/>
-<!--    <rule ref="category/java/design.xml/ExcessiveClassLength"/>-->
-<!--    <rule ref="category/java/design.xml/ExcessiveMethodLength">-->
-<!--        <properties>-->
-<!--            <property name="minimum" value="200.0"/>-->
-<!--        </properties>-->
-<!--    </rule>-->
     <rule ref="category/java/design.xml/ExcessiveParameterList"/>
     <rule ref="category/java/design.xml/ExcessivePublicCount"/>
     <rule ref="category/java/design.xml/GodClass"/>
-<!--    <rule ref="category/java/design.xml/LogicInversion"/>-->
-<!--    <rule ref="category/java/design.xml/NcssCount"/>-->
-<!--    <rule ref="category/java/design.xml/NPathComplexity"/>-->
+    <rule ref="category/java/design.xml/LogicInversion"/>
     <rule ref="category/java/design.xml/SimplifiedTernary"/>
     <rule ref="category/java/design.xml/SimplifyBooleanAssertion"/>
     <rule ref="category/java/design.xml/SimplifyBooleanExpressions"/>
@@ -117,12 +108,12 @@
     <rule ref="category/java/design.xml/UselessOverridingMethod"/>
     <rule ref="category/java/design.xml/UseObjectForClearerAPI"/>
 
-    <!-- Documentation rules -->
-    <rule ref="category/java/documentation.xml/CommentContent"/>
+    <!-- Documentation -->
     <rule ref="category/java/documentation.xml/UncommentedEmptyConstructor"/>
     <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody"/>
 
     <!-- Error-prone -->
+    <rule ref="category/java/errorprone.xml/AssignmentInOperand"/>
     <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/>
     <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/>
     <rule ref="category/java/errorprone.xml/AvoidCallingFinalize"/>
@@ -134,23 +125,24 @@
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingMethodName"/>
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName"/>
     <rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/>
+    <rule ref="category/java/errorprone.xml/AvoidLiteralsInIfCondition"/>
     <rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation"/>
     <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
     <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
-    <rule ref="category/java/errorprone.xml/BadComparison"/>
     <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/CloseResource"/>-->
     <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
+    <rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
     <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>
     <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>
     <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
     <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
-      <properties>
-        <property name="allowCommentedBlocks" value="true"/>
-      </properties>
+        <properties>
+            <property name="allowCommentedBlocks" value="true"/>
+        </properties>
     </rule>
+    <rule ref="category/java/errorprone.xml/EmptyFinalizer"/>
     <rule ref="category/java/errorprone.xml/EmptyFinallyBlock"/>
     <rule ref="category/java/errorprone.xml/EmptyIfStmt"/>
     <rule ref="category/java/errorprone.xml/EmptyInitializer"/>
@@ -161,13 +153,12 @@
     <rule ref="category/java/errorprone.xml/EmptyTryBlock"/>
     <rule ref="category/java/errorprone.xml/EmptyWhileStmt"/>
     <rule ref="category/java/errorprone.xml/EqualsNull"/>
-    <rule ref="category/java/errorprone.xml/EmptyFinalizer"/>
     <rule ref="category/java/errorprone.xml/FinalizeDoesNotCallSuperFinalize"/>
     <rule ref="category/java/errorprone.xml/FinalizeOnlyCallsSuperFinalize"/>
     <rule ref="category/java/errorprone.xml/FinalizeOverloaded"/>
     <rule ref="category/java/errorprone.xml/FinalizeShouldBeProtected"/>
     <rule ref="category/java/errorprone.xml/IdempotentOperations"/>
-    <rule ref="category/java/errorprone.xml/ImportFromSamePackage"/>
+    <rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
     <rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
     <rule ref="category/java/errorprone.xml/MethodWithSameNameAsEnclosingClass"/>
     <rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
@@ -191,30 +182,28 @@
     <rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary"/>
     <rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/>
 
-    <!-- Multithreading rules -->
+    <!-- Multithreading -->
     <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/multithreading.xml/UnsynchronizedStaticFormatter"/>
     <rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify"/>
 
-    <!-- Security rules -->
+    <!-- Security -->
     <rule ref="category/java/security.xml/HardCodedCryptoKey"/>
     <rule ref="category/java/security.xml/InsecureCryptoIv"/>
 
-    <!-- Performance rules -->
+    <!-- Performance -->
+    <rule ref="category/java/performance.xml/AddEmptyString"/>
     <rule ref="category/java/performance.xml/AvoidArrayLoops"/>
-<!--    <rule ref="category/java/performance.xml/AvoidFileStream"/>-->
-    <rule ref="category/java/performance.xml/AvoidUsingShortType"/>
-    <rule ref="category/java/performance.xml/BigIntegerInstantiation"/>
     <rule ref="category/java/performance.xml/ConsecutiveAppendsShouldReuse"/>
     <rule ref="category/java/performance.xml/ConsecutiveLiteralAppends"/>
+    <rule ref="category/java/performance.xml/InefficientStringBuffering"/>
     <rule ref="category/java/performance.xml/OptimizableToArrayCall"/>
-    <rule ref="category/java/performance.xml/SimplifyStartsWith"/>
+    <rule ref="category/java/performance.xml/StringToString"/>
     <rule ref="category/java/performance.xml/TooFewBranchesForASwitchStatement"/>
     <rule ref="category/java/performance.xml/UnnecessaryWrapperObjectCreation"/>
     <rule ref="category/java/performance.xml/UseArraysAsList"/>
-    <rule ref="category/java/performance.xml/StringToString"/>
     <rule ref="category/java/performance.xml/UselessStringValueOf"/>
     <rule ref="category/java/performance.xml/UseStringBufferLength"/>
 

src/python/review/inspectors/pmd/files/bin/designerold.bat

@@ -0,0 +1,6 @@
+@echo off
+set TOPDIR=%~dp0..
+set OPTS=
+set MAIN_CLASS=net.sourceforge.pmd.util.designer.Designer
+
+java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*

src/python/review/inspectors/pmd/files/bin/run.sh

@@ -10,7 +10,7 @@ usage() {
 }
 
 valid_app_options () {
-    echo "pmd, cpd, cpdgui, designer, bgastviewer, designerold"
+    echo "pmd, cpd, cpdgui, designer, bgastviewer, designerold, ast-dump"
 }
 
 is_cygwin() {
@@ -193,6 +193,9 @@ case "${APPNAME}" in
   "cpdgui")
     readonly CLASSNAME="net.sourceforge.pmd.cpd.GUI"
     ;;
+  "ast-dump")
+    readonly CLASSNAME="net.sourceforge.pmd.util.treeexport.TreeExportCli"
+    ;;
   *)
     echo "${APPNAME} is NOT a valid application name, valid options are:$(valid_app_options)"
     ;;

src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0.pom → src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.36.0.pom

@@ -8,15 +8,13 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.20.0</version>
+    <version>6.36.0</version>
+    <relativePath>../</relativePath>
   </parent>
 
   <properties>
     <java.version>8</java.version>
-    <!-- Workaround for https://youtrack.jetbrains.com/issue/IDEA-188690 -->
-    <maven.compiler.source>1.${java.version}</maven.compiler.source>
-    <maven.compiler.target>1.${java.version}</maven.compiler.target>
-    <apex.jorje.version>2019-01-18-a041d7</apex.jorje.version>
+    <apex.jorje.version>2020-09-10-5a5192</apex.jorje.version>
   </properties>
 
   <build>
@@ -56,12 +54,12 @@
     <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.1.7</version>
+        <version>1.2.3</version>
     </dependency>
     <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.1.7</version>
+        <version>1.2.3</version>
     </dependency>
     <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -81,7 +79,6 @@
     <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>26.0-jre</version>
     </dependency>
     <dependency>
         <groupId>com.google.j2objc</groupId>
@@ -91,7 +88,6 @@
     <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>antlr-runtime</artifactId>
-        <version>3.5.2</version>
     </dependency>
     <dependency>
         <groupId>org.antlr</groupId>
@@ -121,7 +117,7 @@
     <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
-        <version>1.17</version>
+        <version>1.26</version>
     </dependency>
     <dependency>
         <groupId>aopalliance</groupId>