Merge pull request #4342 from adangel/pmd7-issue-881-deprecation-removals

[core] Remove deprecated classes/methods (finish #881)

pmd-core/src/main/java/net/sourceforge/pmd/RuleSetWriter.java

@@ -47,12 +47,6 @@ public class RuleSetWriter {
 
     public static final String RULESET_2_0_0_NS_URI = "http://pmd.sourceforge.net/ruleset/2.0.0";
 
-    /**
-     * @deprecated use {@link #RULESET_2_0_0_NS_URI} instead
-     */
-    @Deprecated // To be removed in PMD 7.0.0
-    public static final String RULESET_NS_URI = RULESET_2_0_0_NS_URI;
-
     private final OutputStream outputStream;
     private Document document;
     private Set<String> ruleSetFileNames;

pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java

@@ -203,25 +203,6 @@ public class PMDParameters {
         }
     }
 
-    /** @deprecated Will be removed in 7.0.0 */
-    @Deprecated
-    public static class RulePriorityConverter implements IStringConverter<RulePriority> {
-
-        public int validate(String value) throws ParameterException {
-            int minPriorityValue = Integer.parseInt(value);
-            if (minPriorityValue < 1 || minPriorityValue > 5) {
-                throw new ParameterException(
-                        "Priority values can only be integer value, between 1 and 5," + value + " is not valid");
-            }
-            return minPriorityValue;
-        }
-
-        @Override
-        public RulePriority convert(String value) {
-            return RulePriority.valueOf(validate(value));
-        }
-    }
-
 
     /**
      * Converts these parameters into a configuration.

pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleReference.java

@@ -41,16 +41,6 @@ public class RuleReference extends AbstractDelegateRule {
     private RulePriority priority;
     private RuleSetReference ruleSetReference;
 
-
-    /**
-     * @deprecated to be removed with PMD 7.0.0. when creating a rule reference, always
-     * provide the rule and the ruleset, see the constructor RuleReference(Rule, RuleSetReference)
-     */
-    @Deprecated
-    public RuleReference() {
-        // default constructor
-    }
-
     /**
      * Create a new reference to the given rule.
      *

pmd-core/src/main/resources/net/sourceforge/pmd/util/viewer/resources/viewer_strings.properties

@@ -1,38 +0,0 @@
-#
-# BSD-style license; for more info see http://pmd.sourceforge.net/license.html
-#
-
-##########################################################################
-# English string translations for the viewer
-#
-##########################################################################
-
-# Main Frame
-MAIN.FRAME.TITLE                        = AST Viewer
-MAIN.FRAME.COMPILE_BUTTON.TITLE         = Compile
-MAIN.FRAME.EVALUATE_BUTTON.TITLE        = Evaluate XPath Expression
-MAIN.FRAME.COMPILATION.TOOK             = Compilation took
-MAIN.FRAME.COMPILATION.PROBLEM          = Compilation problem:
-MAIN.FRAME.EVALUATION.TOOK              = Evaluation took
-MAIN.FRAME.EVALUATION.PROBLEM           = Evaluation problem:
-
-
-# Source Panel
-SOURCE.PANEL.TITLE                      = Source code
-
-# Tree Panel
-AST.PANEL.TITLE                         = Abstract Syntax Tree
-AST.MENU.ATTRIBUTES                     = Add predicate from {0}'a attributes
-AST.MENU.NODE.TITLE                     = Add {0} to the XPath expression
-AST.MENU.NODE.ADD_ABSOLUTE_PATH         = Add with absolute path
-AST.MENU.NODE.ADD_ALLDESCENDANTS        = Add all descendants of this type
-
-# XPath Panel
-XPATH.PANEL.TITLE                       = XPath
-XPATH.PANEL.EXPRESSION                  = Expression
-XPATH.PANEL.RESULTS                     = Results
-
-# Compile Error dialog
-COMPILE_ERROR.DIALOG.TITLE              = Compilation error
-COMPILE_ERROR.PANEL.TITLE               = Error message
-COMPILE_ERROR.OK_BUTTON.CAPTION         = Ok

pmd-core/src/test/java/net/sourceforge/pmd/RuleReferenceTest.java

@@ -24,9 +24,8 @@ class RuleReferenceTest {
 
     @Test
     void testRuleSetReference() {
-        RuleReference ruleReference = new RuleReference();
         RuleSetReference ruleSetReference = new RuleSetReference("somename");
-        ruleReference.setRuleSetReference(ruleSetReference);
+        RuleReference ruleReference = new RuleReference(null, ruleSetReference);
         assertEquals(ruleSetReference, ruleReference.getRuleSetReference(), "Not same rule set reference");
     }
 
@@ -46,8 +45,7 @@ class RuleReferenceTest {
         rule.setPriority(RulePriority.HIGH);
 
         final PropertyDescriptor<String> PROPERTY2_DESCRIPTOR = PropertyFactory.stringProperty("property2").desc("Test property").defaultValue("").build();
-        RuleReference ruleReference = new RuleReference();
-        ruleReference.setRule(rule);
+        RuleReference ruleReference = new RuleReference(rule, null);
         ruleReference.definePropertyDescriptor(PROPERTY2_DESCRIPTOR);
         ruleReference.setMinimumLanguageVersion(dummyLang.getVersion("1.3"));
         ruleReference.setMaximumLanguageVersion(dummyLang.getVersion("1.7"));
@@ -70,8 +68,7 @@ class RuleReferenceTest {
         Language dummyLang = dummyLanguage();
         rule.setLanguage(dummyLang);
 
-        RuleReference ruleReference = new RuleReference();
-        ruleReference.setRule(rule);
+        RuleReference ruleReference = new RuleReference(rule, null);
 
         assertThrows(UnsupportedOperationException.class, () -> ruleReference.setLanguage(Dummy2LanguageModule.getInstance()));
         assertEquals(dummyLang, ruleReference.getLanguage());
@@ -97,8 +94,7 @@ class RuleReferenceTest {
         rule.setPriority(RulePriority.HIGH);
 
         final PropertyDescriptor<String> PROPERTY2_DESCRIPTOR = PropertyFactory.stringProperty("property2").desc("Test property").defaultValue("").build();
-        RuleReference ruleReference = new RuleReference();
-        ruleReference.setRule(rule);
+        RuleReference ruleReference = new RuleReference(rule, null);
         ruleReference.definePropertyDescriptor(PROPERTY2_DESCRIPTOR);
         ruleReference.setLanguage(dummyLang);
         ruleReference.setMinimumLanguageVersion(dummyLang.getVersion("1.3"));
@@ -187,8 +183,7 @@ class RuleReferenceTest {
         rule.setExternalInfoUrl("externalInfoUrl1");
         rule.setPriority(RulePriority.HIGH);
 
-        RuleReference ruleReference = new RuleReference();
-        ruleReference.setRule(rule);
+        RuleReference ruleReference = new RuleReference(rule, null);
         ruleReference
             .setMinimumLanguageVersion(dummyLanguage().getVersion("1.3"));
         ruleReference

pmd-core/src/test/java/net/sourceforge/pmd/RuleSetWriterTest.java

@@ -75,9 +75,9 @@ class RuleSetWriterTest {
     void testRuleReferenceOverriddenName() throws Exception {
         RuleSet rs = new RuleSetLoader().loadFromResource("rulesets/dummy/basic.xml");
 
-        RuleReference ruleRef = new RuleReference();
-        ruleRef.setRule(rs.getRuleByName("DummyBasicMockRule"));
-        ruleRef.setRuleSetReference(new RuleSetReference("rulesets/dummy/basic.xml"));
+        RuleReference ruleRef = new RuleReference(
+                rs.getRuleByName("DummyBasicMockRule"),
+                new RuleSetReference("rulesets/dummy/basic.xml"));
         ruleRef.setName("Foo"); // override the name
 
         RuleSet ruleSet = RuleSet.forSingleRule(ruleRef);