[java] Avoid double rule de-referincing in controversial and migrating_*

This commit is contained in:
Andreas Dangel
2018-01-21 15:42:28 +01:00
parent 15db5ad0b4
commit 02989303a6
5 changed files with 17 additions and 25 deletions

View File

@ -38,7 +38,8 @@ They are held here to allow people to include them as they see fit within their
<rule ref="category/java/design.xml/UseObjectForClearerAPI" deprecated="true" />
<!-- The rule UnnecessaryParentheses has been merged into unnecessary.xml/UselessParentheses -->
<rule name="UnnecessaryParentheses" deprecated="true" ref="rulesets/java/unnecessary.xml/UselessParentheses" />
<!-- The rule UnnecessaryParentheses has been merged into unnecessary.xml/UselessParentheses,
which now lives in codestyle -->
<rule name="UnnecessaryParentheses" deprecated="true" ref="category/java/codestyle.xml/UselessParentheses" />
</ruleset>

View File

@ -9,11 +9,8 @@
Contains rules for migrating to JDK 1.3
</description>
<rule ref="rulesets/java/migrating.xml/ReplaceVectorWithList"/>
<rule ref="rulesets/java/migrating.xml/ReplaceHashtableWithMap"/>
<rule ref="rulesets/java/migrating.xml/ReplaceEnumerationWithIterator"/>
<rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator" deprecated="true" />
<rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap" deprecated="true" />
<rule ref="category/java/bestpractices.xml/ReplaceVectorWithList" deprecated="true" />
</ruleset>

View File

@ -8,7 +8,7 @@
Contains rules for migrating to JDK 1.4
</description>
<rule ref="rulesets/java/migrating.xml/AvoidAssertAsIdentifier"/>
<rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier" deprecated="true" />
</ruleset>

View File

@ -8,13 +8,10 @@
Contains rules for migrating to JDK 1.5
</description>
<rule ref="rulesets/java/migrating.xml/AvoidEnumAsIdentifier"/>
<rule ref="rulesets/java/migrating.xml/IntegerInstantiation"/>
<rule ref="rulesets/java/migrating.xml/LongInstantiation"/>
<rule ref="rulesets/java/migrating.xml/ShortInstantiation"/>
<rule ref="rulesets/java/migrating.xml/ByteInstantiation"/>
<rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier" deprecated="true" />
<rule ref="category/java/performance.xml/ByteInstantiation" deprecated="true" />
<rule ref="category/java/performance.xml/IntegerInstantiation" deprecated="true" />
<rule ref="category/java/performance.xml/LongInstantiation" deprecated="true" />
<rule ref="category/java/performance.xml/ShortInstantiation" deprecated="true" />
</ruleset>

View File

@ -8,13 +8,10 @@
Contains rules for migrating to JUnit 4
</description>
<rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseBeforeAnnotation"/>
<rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseTestAnnotation"/>
<rule ref="rulesets/java/migrating.xml/JUnit4TestShouldUseAfterAnnotation"/>
<rule ref="rulesets/java/migrating.xml/JUnit4SuitesShouldUseSuiteAnnotation"/>
<rule ref="rulesets/java/migrating.xml/JUnitUseExpected"/>
<rule ref="category/java/bestpractices.xml/JUnit4SuitesShouldUseSuiteAnnotation" deprecated="true" />
<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseAfterAnnotation" deprecated="true" />
<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseBeforeAnnotation" deprecated="true" />
<rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseTestAnnotation" deprecated="true" />
<rule ref="category/java/bestpractices.xml/JUnitUseExpected" deprecated="true" />
</ruleset>