[java] Move category rulesets into own category directory

restore previous design rulesest
pmd · Oct 30, 2017 · 68a56ee · 68a56ee
1 parent bf6eacf
commit 68a56ee
Show file tree

Hide file tree

Showing 34 changed files with 1,919 additions and 1,892 deletions.
diff --git a/...resources/rulesets/java/bestpractices.xml → ...resources/category/java/bestpractices.xml b/...resources/rulesets/java/bestpractices.xml → ...resources/category/java/bestpractices.xml
diff --git a/...ain/resources/rulesets/java/codestyle.xml → ...ain/resources/category/java/codestyle.xml b/...ain/resources/rulesets/java/codestyle.xml → ...ain/resources/category/java/codestyle.xml
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
diff --git a/...resources/rulesets/java/documentation.xml → ...resources/category/java/documentation.xml b/...resources/rulesets/java/documentation.xml → ...resources/category/java/documentation.xml
diff --git a/...in/resources/rulesets/java/errorprone.xml → ...in/resources/category/java/errorprone.xml b/...in/resources/rulesets/java/errorprone.xml → ...in/resources/category/java/errorprone.xml
diff --git a/...esources/rulesets/java/multithreading.xml → ...esources/category/java/multithreading.xml b/...esources/rulesets/java/multithreading.xml → ...esources/category/java/multithreading.xml
diff --git a/...n/resources/rulesets/java/performance.xml → ...n/resources/category/java/performance.xml b/...n/resources/rulesets/java/performance.xml → ...n/resources/category/java/performance.xml
diff --git a/...main/resources/rulesets/java/security.xml → ...main/resources/category/java/security.xml b/...main/resources/rulesets/java/security.xml → ...main/resources/category/java/security.xml
diff --git a/pmd-java/src/main/resources/rulesets/java/android.xml b/pmd-java/src/main/resources/rulesets/java/android.xml
@@ -10,8 +10,8 @@ To get better results, make sure that the auxclasspath is defined for type resol
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-errorprone/CallSuperFirst" deprecated="true" />
-    <rule ref="java-errorprone/CallSuperLast" deprecated="true" />
-    <rule ref="java-errorprone/DoNotHardCodeSDCard" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CallSuperFirst" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CallSuperLast" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/DoNotHardCodeSDCard" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/basic.xml b/pmd-java/src/main/resources/rulesets/java/basic.xml
@@ -9,33 +9,33 @@ The Basic ruleset contains a collection of good practices which should be follow
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-errorprone/AvoidBranchingStatementAsLastInLoop" deprecated="true" />
-    <rule ref="java-errorprone/AvoidDecimalLiteralsInBigDecimalConstructor" deprecated="true" />
-    <rule ref="java-errorprone/AvoidMultipleUnaryOperators" deprecated="true" />
-    <rule ref="java-errorprone/AvoidUsingOctalValues" deprecated="true" />
-    <rule ref="java-errorprone/BrokenNullCheck" deprecated="true" />
-    <rule ref="java-errorprone/CheckResultSet" deprecated="true" />
-    <rule ref="java-errorprone/CheckSkipResult" deprecated="true" />
-    <rule ref="java-errorprone/ClassCastExceptionWithToArray" deprecated="true" />
-    <rule ref="java-errorprone/DontUseFloatTypeForLoopIndices" deprecated="true" />
-    <rule ref="java-errorprone/ExtendsObject" deprecated="true" />
-    <rule ref="java-errorprone/ForLoopShouldBeWhileLoop" deprecated="true" />
-    <rule ref="java-errorprone/JumbledIncrementer" deprecated="true" />
-    <rule ref="java-errorprone/MisplacedNullCheck" deprecated="true" />
-    <rule ref="java-errorprone/OverrideBothEqualsAndHashcode" deprecated="true" />
-    <rule ref="java-errorprone/ReturnFromFinallyBlock" deprecated="true" />
-    <rule ref="java-errorprone/UnconditionalIfStatement" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/BrokenNullCheck" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CheckResultSet" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CheckSkipResult" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/ExtendsObject" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/ForLoopShouldBeWhileLoop" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/JumbledIncrementer" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/MisplacedNullCheck" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/UnconditionalIfStatement" deprecated="true" />
 
-    <rule ref="java-multithreading/AvoidThreadGroup" deprecated="true" />
-    <rule ref="java-multithreading/DontCallThreadRun" deprecated="true" />
-    <rule ref="java-multithreading/DoubleCheckedLocking" deprecated="true" />
+    <rule ref="category/java/multithreading.xml/AvoidThreadGroup" deprecated="true" />
+    <rule ref="category/java/multithreading.xml/DontCallThreadRun" deprecated="true" />
+    <rule ref="category/java/multithreading.xml/DoubleCheckedLocking" deprecated="true" />
 
-    <rule ref="java-bestpractices/AvoidUsingHardCodedIP" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" deprecated="true" />
 
-    <rule ref="java-performance/BigIntegerInstantiation" deprecated="true" />
-    <rule ref="java-performance/BooleanInstantiation" deprecated="true" />
+    <rule ref="category/java/performance.xml/BigIntegerInstantiation" deprecated="true" />
+    <rule ref="category/java/performance.xml/BooleanInstantiation" deprecated="true" />
 
-    <rule ref="java-design/CollapsibleIfStatements" deprecated="true" />
-    <rule ref="java-design/SimplifiedTernary" deprecated="true" />
+    <rule ref="category/java/design.xml/CollapsibleIfStatements" deprecated="true" />
+    <rule ref="category/java/design.xml/SimplifiedTernary" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/braces.xml b/pmd-java/src/main/resources/rulesets/java/braces.xml
@@ -9,9 +9,9 @@ The Braces ruleset contains rules regarding the use and placement of braces.
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-codestyle/ForLoopsMustUseBraces" deprecated="true" />
-    <rule ref="java-codestyle/IfElseStmtsMustUseBraces" deprecated="true" />
-    <rule ref="java-codestyle/IfStmtsMustUseBraces" deprecated="true" />
-    <rule ref="java-codestyle/WhileLoopsMustUseBraces" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/ForLoopsMustUseBraces" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/IfElseStmtsMustUseBraces" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/IfStmtsMustUseBraces" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/WhileLoopsMustUseBraces" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/clone.xml b/pmd-java/src/main/resources/rulesets/java/clone.xml
@@ -9,10 +9,10 @@ The Clone Implementation ruleset contains a collection of rules that find questi
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-errorprone/CloneMethodMustBePublic" deprecated="true" />
-    <rule ref="java-errorprone/CloneMethodMustImplementCloneable" deprecated="true" />
-    <rule ref="java-errorprone/CloneMethodReturnTypeMustMatchClassName" deprecated="true" />
-    <rule ref="java-errorprone/CloneThrowsCloneNotSupportedException" deprecated="true" />
-    <rule ref="java-errorprone/ProperCloneImplementation" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CloneMethodMustBePublic" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CloneMethodMustImplementCloneable" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CloneMethodReturnTypeMustMatchClassName" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CloneThrowsCloneNotSupportedException" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/ProperCloneImplementation" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/codesize.xml b/pmd-java/src/main/resources/rulesets/java/codesize.xml
@@ -10,19 +10,19 @@ The Code Size ruleset contains rules that find problems related to code size or
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-design/CyclomaticComplexity" deprecated="true" />
-    <rule ref="java-design/ExcessiveClassLength" deprecated="true" />
-    <rule ref="java-design/ExcessiveMethodLength" deprecated="true" />
-    <rule ref="java-design/ExcessiveParameterList" deprecated="true" />
-    <rule ref="java-design/ExcessivePublicCount" deprecated="true" />
-    <rule ref="java-design/ModifiedCyclomaticComplexity" deprecated="true" />
-    <rule ref="java-design/NcssConstructorCount" deprecated="true" />
-    <rule ref="java-design/NcssCount" deprecated="true" />
-    <rule ref="java-design/NcssMethodCount" deprecated="true" />
-    <rule ref="java-design/NcssTypeCount" deprecated="true" />
-    <rule ref="java-design/NPathComplexity" deprecated="true" />
-    <rule ref="java-design/StdCyclomaticComplexity" deprecated="true" />
-    <rule ref="java-design/TooManyFields" deprecated="true" />
-    <rule ref="java-design/TooManyMethods" deprecated="true" />
+    <rule ref="category/java/design.xml/CyclomaticComplexity" deprecated="true" />
+    <rule ref="category/java/design.xml/ExcessiveClassLength" deprecated="true" />
+    <rule ref="category/java/design.xml/ExcessiveMethodLength" deprecated="true" />
+    <rule ref="category/java/design.xml/ExcessiveParameterList" deprecated="true" />
+    <rule ref="category/java/design.xml/ExcessivePublicCount" deprecated="true" />
+    <rule ref="category/java/design.xml/ModifiedCyclomaticComplexity" deprecated="true" />
+    <rule ref="category/java/design.xml/NcssConstructorCount" deprecated="true" />
+    <rule ref="category/java/design.xml/NcssCount" deprecated="true" />
+    <rule ref="category/java/design.xml/NcssMethodCount" deprecated="true" />
+    <rule ref="category/java/design.xml/NcssTypeCount" deprecated="true" />
+    <rule ref="category/java/design.xml/NPathComplexity" deprecated="true" />
+    <rule ref="category/java/design.xml/StdCyclomaticComplexity" deprecated="true" />
+    <rule ref="category/java/design.xml/TooManyFields" deprecated="true" />
+    <rule ref="category/java/design.xml/TooManyMethods" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/comments.xml b/pmd-java/src/main/resources/rulesets/java/comments.xml
@@ -10,10 +10,10 @@ Rules intended to catch errors related to code comments
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-codestyle/CommentDefaultAccessModifier" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/CommentDefaultAccessModifier" deprecated="true" />
 
-    <rule ref="java-documentation/CommentContent" deprecated="true" />
-    <rule ref="java-documentation/CommentRequired" deprecated="true" />
-    <rule ref="java-documentation/CommentSize" deprecated="true" />
+    <rule ref="category/java/documentation.xml/CommentContent" deprecated="true" />
+    <rule ref="category/java/documentation.xml/CommentRequired" deprecated="true" />
+    <rule ref="category/java/documentation.xml/CommentSize" deprecated="true" />
 
  </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/controversial.xml b/pmd-java/src/main/resources/rulesets/java/controversial.xml
@@ -14,31 +14,31 @@ They are held here to allow people to include them as they see fit within their
     <rule name="UnnecessaryParentheses" deprecated="true" ref="rulesets/java/unnecessary.xml/UselessParentheses" />
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-errorprone/AssignmentInOperand" deprecated="true" />
-    <rule ref="java-errorprone/AvoidAccessibilityAlteration" deprecated="true" />
-    <rule ref="java-errorprone/AvoidLiteralsInIfCondition" deprecated="true" />
-    <rule ref="java-errorprone/CallSuperInConstructor" deprecated="true" />
-    <rule ref="java-errorprone/DataflowAnomalyAnalysis" deprecated="true" />
-    <rule ref="java-errorprone/DontImportSun" deprecated="true" />
-    <rule ref="java-errorprone/OneDeclarationPerLine" deprecated="true" />
-    <rule ref="java-errorprone/SuspiciousOctalEscape" deprecated="true" />
-
-    <rule ref="java-codestyle/AtLeastOneConstructor" deprecated="true" />
-    <rule ref="java-codestyle/AvoidFinalLocalVariable" deprecated="true" />
-    <rule ref="java-codestyle/AvoidPrefixingMethodParameters" deprecated="true" />
-    <rule ref="java-codestyle/AvoidUsingNativeCode" deprecated="true" />
-    <rule ref="java-codestyle/DefaultPackage" deprecated="true" />
-    <rule ref="java-codestyle/OnlyOneReturn" deprecated="true" />
-    <rule ref="java-codestyle/UnnecessaryConstructor" deprecated="true" />
-
-    <rule ref="java-multithreading/AvoidUsingVolatile" deprecated="true" />
-    <rule ref="java-multithreading/UseConcurrentHashMap" deprecated="true" />
-
-    <rule ref="java-bestpractices/NullAssignment" deprecated="true" />
-
-    <rule ref="java-performance/AvoidUsingShortType" deprecated="true" />
-    <rule ref="java-performance/DoNotCallGarbageCollectionExplicitly" deprecated="true" />
-
-    <rule ref="java-design/UseObjectForClearerAPI" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AssignmentInOperand" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidAccessibilityAlteration" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/AvoidLiteralsInIfCondition" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/CallSuperInConstructor" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/DataflowAnomalyAnalysis" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/DontImportSun" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/OneDeclarationPerLine" deprecated="true" />
+    <rule ref="category/java/errorprone.xml/SuspiciousOctalEscape" deprecated="true" />
+
+    <rule ref="category/java/codestyle.xml/AtLeastOneConstructor" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/AvoidFinalLocalVariable" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/AvoidPrefixingMethodParameters" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/AvoidUsingNativeCode" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/DefaultPackage" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/OnlyOneReturn" deprecated="true" />
+    <rule ref="category/java/codestyle.xml/UnnecessaryConstructor" deprecated="true" />
+
+    <rule ref="category/java/multithreading.xml/AvoidUsingVolatile" deprecated="true" />
+    <rule ref="category/java/multithreading.xml/UseConcurrentHashMap" deprecated="true" />
+
+    <rule ref="category/java/bestpractices.xml/NullAssignment" deprecated="true" />
+
+    <rule ref="category/java/performance.xml/AvoidUsingShortType" deprecated="true" />
+    <rule ref="category/java/performance.xml/DoNotCallGarbageCollectionExplicitly" deprecated="true" />
+
+    <rule ref="category/java/design.xml/UseObjectForClearerAPI" deprecated="true" />
 
 </ruleset>
diff --git a/pmd-java/src/main/resources/rulesets/java/coupling.xml b/pmd-java/src/main/resources/rulesets/java/coupling.xml
@@ -10,11 +10,11 @@ Rules which find instances of high or inappropriate coupling between objects and
   </description>
 
     <!-- Rules, that have been moved into a category -->
-    <rule ref="java-bestpractices/LooseCoupling" deprecated="true" />
+    <rule ref="category/java/bestpractices.xml/LooseCoupling" deprecated="true" />
 
-    <rule ref="java-design/CouplingBetweenObjects" deprecated="true" />
-    <rule ref="java-design/ExcessiveImports" deprecated="true" />
-    <rule ref="java-design/LawOfDemeter" deprecated="true" />
-    <rule ref="java-design/LoosePackageCoupling" deprecated="true" />
+    <rule ref="category/java/design.xml/CouplingBetweenObjects" deprecated="true" />
+    <rule ref="category/java/design.xml/ExcessiveImports" deprecated="true" />
+    <rule ref="category/java/design.xml/LawOfDemeter" deprecated="true" />
+    <rule ref="category/java/design.xml/LoosePackageCoupling" deprecated="true" />
 
 </ruleset>