Remove default ctor of RuleReference (#881)

This commit is contained in:
Andreas Dangel committed 2023-01-18 13:45:38 +01:00
1 parent e4ea224316
commit f2ab6ebeb4
3 files changed
+8 -23

No files matched your search

@@ -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.
*
@@ -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
@@ -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);