violations) throws IOException {
String filename = null;
@@ -102,10 +131,10 @@ public class XMLRenderer extends AbstractIncrementingRenderer {
xmlWriter.writeEndElement();
}
filename = nextFilename;
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeStartElement("file");
xmlWriter.writeAttribute("name", filename);
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
}
xmlWriter.writeStartElement("violation");
@@ -121,11 +150,11 @@ public class XMLRenderer extends AbstractIncrementingRenderer {
maybeAdd("variable", rv.getVariableName());
maybeAdd("externalInfoUrl", rv.getRule().getExternalInfoUrl());
xmlWriter.writeAttribute("priority", String.valueOf(rv.getRule().getPriority().getPriority()));
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeCharacters(StringUtil.removedInvalidXml10Characters(rv.getDescription()));
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeEndElement();
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
}
if (filename != null) { // Not first file ?
xmlWriter.writeEndElement();
@@ -140,20 +169,20 @@ public class XMLRenderer extends AbstractIncrementingRenderer {
try {
// errors
for (Report.ProcessingError pe : errors) {
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeStartElement("error");
xmlWriter.writeAttribute("filename", determineFileName(pe.getFile()));
xmlWriter.writeAttribute("msg", pe.getMsg());
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeCData(pe.getDetail());
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeEndElement();
}
// suppressed violations
if (showSuppressedViolations) {
for (Report.SuppressedViolation s : suppressed) {
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeStartElement("suppressedviolation");
xmlWriter.writeAttribute("filename", determineFileName(s.getRuleViolation().getFilename()));
xmlWriter.writeAttribute("suppressiontype", s.getSuppressor().getId().toLowerCase(Locale.ROOT));
@@ -165,14 +194,15 @@ public class XMLRenderer extends AbstractIncrementingRenderer {
// config errors
for (final Report.ConfigurationError ce : configErrors) {
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeEmptyElement("configerror");
xmlWriter.writeAttribute("rule", ce.rule().getName());
xmlWriter.writeAttribute("msg", ce.issue());
}
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
xmlWriter.writeEndElement(); //
- xmlWriter.writeCharacters(PMD.EOL);
+ writeNewLine();
+ xmlWriter.writeEndDocument();
xmlWriter.flush();
} catch (XMLStreamException e) {
throw new IOException(e);
diff --git a/pmd-core/src/main/resources/rulesets/releases/6290.xml b/pmd-core/src/main/resources/rulesets/releases/6290.xml
new file mode 100644
index 0000000000..59e64c0e46
--- /dev/null
+++ b/pmd-core/src/main/resources/rulesets/releases/6290.xml
@@ -0,0 +1,13 @@
+
+
+
+
+This ruleset contains links to rules that are new in PMD v6.29.0
+
+
+
+
+
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
index 1a3aa47c96..209dea08f5 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
@@ -246,6 +246,30 @@ public class RuleSetFactoryTest {
assertTrue(logging.getLog().isEmpty());
}
+ /**
+ * This is an example of a category (built-in) ruleset, which contains a rule, that has been renamed.
+ * This means: a rule definition for "NewName" and a rule reference "OldName", that is deprecated
+ * and exists for backwards compatibility.
+ *
+ * When loading this ruleset at a whole for generating the documentation, we should still
+ * include the deprecated rule reference, so that we can create a nice documentation.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testRuleSetWithDeprecatedRenamedRuleForDoc() throws Exception {
+ RuleSetFactory rsf = RulesetsFactoryUtils.createFactory(RulePriority.LOW, false, false, true);
+ RuleSet rs = rsf.createRuleSet(createRuleSetReferenceId("\n" + "\n"
+ + " ruleset desc\n"
+ + " "
+ + " "
+ + " d\n" + " 2\n" + " "
+ + ""));
+ assertEquals(2, rs.getRules().size());
+ assertNotNull(rs.getRuleByName("NewName"));
+ assertNotNull(rs.getRuleByName("OldName"));
+ }
+
/**
* This is an example of a custom user ruleset, that references a rule, that has been renamed.
* The user should get a deprecation warning.
diff --git a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/GenerateRuleDocsCmd.java b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/GenerateRuleDocsCmd.java
index 75c56f7f49..2256a21d18 100644
--- a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/GenerateRuleDocsCmd.java
+++ b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/GenerateRuleDocsCmd.java
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
import org.apache.commons.io.FilenameUtils;
+import net.sourceforge.pmd.RulePriority;
import net.sourceforge.pmd.RuleSet;
import net.sourceforge.pmd.RuleSetFactory;
import net.sourceforge.pmd.RuleSetNotFoundException;
@@ -39,7 +40,8 @@ public final class GenerateRuleDocsCmd {
Path output = FileSystems.getDefault().getPath(args[0]).resolve("..").toAbsolutePath().normalize();
System.out.println("Generating docs into " + output);
- RuleSetFactory ruleSetFactory = RulesetsFactoryUtils.defaultFactory();
+ // important: use a RuleSetFactory that includes all rules, e.g. deprecated rule references
+ RuleSetFactory ruleSetFactory = RulesetsFactoryUtils.createFactory(RulePriority.LOW, false, false, true);
Iterator registeredRuleSets = ruleSetFactory.getRegisteredRuleSets();
List additionalRulesets = findAdditionalRulesets(output);
diff --git a/pmd-doc/src/test/java/net/sourceforge/pmd/docs/RuleDocGeneratorTest.java b/pmd-doc/src/test/java/net/sourceforge/pmd/docs/RuleDocGeneratorTest.java
index 00a84abf6e..5e7561cdf3 100644
--- a/pmd-doc/src/test/java/net/sourceforge/pmd/docs/RuleDocGeneratorTest.java
+++ b/pmd-doc/src/test/java/net/sourceforge/pmd/docs/RuleDocGeneratorTest.java
@@ -21,6 +21,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import net.sourceforge.pmd.RulePriority;
import net.sourceforge.pmd.RuleSet;
import net.sourceforge.pmd.RuleSetFactory;
import net.sourceforge.pmd.RuleSetNotFoundException;
@@ -61,7 +62,7 @@ public class RuleDocGeneratorTest {
public void testSingleRuleset() throws RuleSetNotFoundException, IOException {
RuleDocGenerator generator = new RuleDocGenerator(writer, root);
- RuleSetFactory rsf = RulesetsFactoryUtils.defaultFactory();
+ RuleSetFactory rsf = RulesetsFactoryUtils.createFactory(RulePriority.LOW, false, false, true);
RuleSet ruleset = rsf.createRuleSet("rulesets/ruledoctest/sample.xml");
generator.generate(Arrays.asList(ruleset).iterator(),
diff --git a/pmd-doc/src/test/resources/expected/java.md b/pmd-doc/src/test/resources/expected/java.md
index a20c0aa803..0ba141b68c 100644
--- a/pmd-doc/src/test/resources/expected/java.md
+++ b/pmd-doc/src/test/resources/expected/java.md
@@ -15,7 +15,10 @@ folder: pmd/rules
* [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer): Avoid jumbled loop incrementers - its usually a mistake, and is confusing even if intentional.
* [MovedRule](pmd_rules_java_sample.html#movedrule): Deprecated The rule has been moved to another ruleset. Use instead [JumbledIncrementer](pmd_rules_java_sample2.html#jumbledincrementer).
* [OverrideBothEqualsAndHashcode](pmd_rules_java_sample.html#overridebothequalsandhashcode): Override both 'public boolean Object.equals(Object other)', and 'public int Object.hashCode()', o...
-* [RenamedRule](pmd_rules_java_sample.html#renamedrule): Deprecated The rule has been renamed. Use instead [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer).
+* [RenamedRule1](pmd_rules_java_sample.html#renamedrule1): Deprecated The rule has been renamed. Use instead [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer).
+* [RenamedRule2](pmd_rules_java_sample.html#renamedrule2): Deprecated The rule has been renamed. Use instead [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer).
+* [RenamedRule3](pmd_rules_java_sample.html#renamedrule3): Deprecated The rule has been renamed. Use instead [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer).
+* [RenamedRule4](pmd_rules_java_sample.html#renamedrule4): Deprecated The rule has been renamed. Use instead [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer).
* [XSSInDocumentation](pmd_rules_java_sample.html#xssindocumentation): <script>alert('XSS at the beginning');</script> HTML tags might appear at various places. ...
## Additional rulesets
diff --git a/pmd-doc/src/test/resources/expected/sample.md b/pmd-doc/src/test/resources/expected/sample.md
index ff3c6fc81d..c1f20199a4 100644
--- a/pmd-doc/src/test/resources/expected/sample.md
+++ b/pmd-doc/src/test/resources/expected/sample.md
@@ -5,7 +5,7 @@ permalink: pmd_rules_java_sample.html
folder: pmd/rules/java
sidebaractiveurl: /pmd_rules_java.html
editmepath: ../rulesets/ruledoctest/sample.xml
-keywords: Sample, XSSInDocumentation, OverrideBothEqualsAndHashcode, JumbledIncrementer, DeprecatedSample, RenamedRule, MovedRule
+keywords: Sample, XSSInDocumentation, OverrideBothEqualsAndHashcode, JumbledIncrementer, DeprecatedSample, RenamedRule1, RenamedRule2, RenamedRule3, RenamedRule4, MovedRule
language: Java
---
@@ -204,7 +204,7 @@ public class Foo {
```
-## RenamedRule
+## RenamedRule1
Deprecated
@@ -257,12 +257,235 @@ Avoid jumbled loop incrementers - its usually a mistake, and is confusing even i
**Use this rule with the default properties by just referencing it:**
``` xml
-
+
```
**Use this rule and customize it:**
``` xml
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+## RenamedRule2
+
+Deprecated
+
+This rule has been renamed. Use instead: [JumbledIncrementer](#jumbledincrementer)
+
+**Since:** PMD 1.0
+
+**Priority:** Medium (3)
+
+Avoid jumbled loop incrementers - its usually a mistake, and is confusing even if intentional.
+
+**This rule is defined by the following XPath expression:**
+``` xpath
+//ForStatement
+ [
+ ForUpdate/StatementExpressionList/StatementExpression/PostfixExpression/PrimaryExpression/PrimaryPrefix/Name/@Image
+ =
+ ancestor::ForStatement/ForInit//VariableDeclaratorId/@Image
+ ]
+```
+
+**Example(s):**
+
+``` java
+{%raw%}public class JumbledIncrementerRule1 {
+ public void foo() {
+ for (int i = 0; i < 10; i++) { // only references 'i'
+ for (int k = 0; k < 20; i++) { // references both 'i' and 'k'
+ System.out.println("Hello");
+ }
+ }
+ }
+}{%endraw%}
+```
+
+**This rule has the following properties:**
+
+|Name|Default Value|Description|Multivalued|
+|----|-------------|-----------|-----------|
+|sampleAdditionalProperty|the value|This is a additional property for tests|no|
+|sampleMultiStringProperty|Value1 \| Value2|Test property with multiple strings|yes. Delimiter is '\|'.|
+|sampleDeprecatedProperty|test|Deprecated This is a sample deprecated property for tests|no|
+|sampleRegexProperty1|\\/\\\*\\s+(default\|package)\\s+\\\*\\/|The property is of type regex|no|
+|sampleRegexProperty2|\[a-z\]\*|The property is of type regex|no|
+|sampleRegexProperty3|\\s+|The property is of type regex|no|
+|sampleRegexProperty4|\_dd\_|The property is of type regex|no|
+|sampleRegexProperty5|\[0-9\]{1,3}|The property is of type regex|no|
+|sampleRegexProperty6|\\b|The property is of type regex|no|
+|sampleRegexProperty7|\\n|The property is of type regex|no|
+
+**Use this rule with the default properties by just referencing it:**
+``` xml
+
+```
+
+**Use this rule and customize it:**
+``` xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+## RenamedRule3
+
+Deprecated
+
+This rule has been renamed. Use instead: [JumbledIncrementer](#jumbledincrementer)
+
+Deprecated
+
+**Since:** PMD 1.0
+
+**Priority:** Medium (3)
+
+Avoid jumbled loop incrementers - its usually a mistake, and is confusing even if intentional.
+
+**This rule is defined by the following XPath expression:**
+``` xpath
+//ForStatement
+ [
+ ForUpdate/StatementExpressionList/StatementExpression/PostfixExpression/PrimaryExpression/PrimaryPrefix/Name/@Image
+ =
+ ancestor::ForStatement/ForInit//VariableDeclaratorId/@Image
+ ]
+```
+
+**Example(s):**
+
+``` java
+{%raw%}public class JumbledIncrementerRule1 {
+ public void foo() {
+ for (int i = 0; i < 10; i++) { // only references 'i'
+ for (int k = 0; k < 20; i++) { // references both 'i' and 'k'
+ System.out.println("Hello");
+ }
+ }
+ }
+}{%endraw%}
+```
+
+**This rule has the following properties:**
+
+|Name|Default Value|Description|Multivalued|
+|----|-------------|-----------|-----------|
+|sampleAdditionalProperty|the value|This is a additional property for tests|no|
+|sampleMultiStringProperty|Value1 \| Value2|Test property with multiple strings|yes. Delimiter is '\|'.|
+|sampleDeprecatedProperty|test|Deprecated This is a sample deprecated property for tests|no|
+|sampleRegexProperty1|\\/\\\*\\s+(default\|package)\\s+\\\*\\/|The property is of type regex|no|
+|sampleRegexProperty2|\[a-z\]\*|The property is of type regex|no|
+|sampleRegexProperty3|\\s+|The property is of type regex|no|
+|sampleRegexProperty4|\_dd\_|The property is of type regex|no|
+|sampleRegexProperty5|\[0-9\]{1,3}|The property is of type regex|no|
+|sampleRegexProperty6|\\b|The property is of type regex|no|
+|sampleRegexProperty7|\\n|The property is of type regex|no|
+
+**Use this rule with the default properties by just referencing it:**
+``` xml
+
+```
+
+**Use this rule and customize it:**
+``` xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+## RenamedRule4
+
+Deprecated
+
+This rule has been renamed. Use instead: [JumbledIncrementer](#jumbledincrementer)
+
+Deprecated
+
+**Since:** PMD 1.0
+
+**Priority:** Medium (3)
+
+Avoid jumbled loop incrementers - its usually a mistake, and is confusing even if intentional.
+
+**This rule is defined by the following XPath expression:**
+``` xpath
+//ForStatement
+ [
+ ForUpdate/StatementExpressionList/StatementExpression/PostfixExpression/PrimaryExpression/PrimaryPrefix/Name/@Image
+ =
+ ancestor::ForStatement/ForInit//VariableDeclaratorId/@Image
+ ]
+```
+
+**Example(s):**
+
+``` java
+{%raw%}public class JumbledIncrementerRule1 {
+ public void foo() {
+ for (int i = 0; i < 10; i++) { // only references 'i'
+ for (int k = 0; k < 20; i++) { // references both 'i' and 'k'
+ System.out.println("Hello");
+ }
+ }
+ }
+}{%endraw%}
+```
+
+**This rule has the following properties:**
+
+|Name|Default Value|Description|Multivalued|
+|----|-------------|-----------|-----------|
+|sampleAdditionalProperty|the value|This is a additional property for tests|no|
+|sampleMultiStringProperty|Value1 \| Value2|Test property with multiple strings|yes. Delimiter is '\|'.|
+|sampleDeprecatedProperty|test|Deprecated This is a sample deprecated property for tests|no|
+|sampleRegexProperty1|\\/\\\*\\s+(default\|package)\\s+\\\*\\/|The property is of type regex|no|
+|sampleRegexProperty2|\[a-z\]\*|The property is of type regex|no|
+|sampleRegexProperty3|\\s+|The property is of type regex|no|
+|sampleRegexProperty4|\_dd\_|The property is of type regex|no|
+|sampleRegexProperty5|\[0-9\]{1,3}|The property is of type regex|no|
+|sampleRegexProperty6|\\b|The property is of type regex|no|
+|sampleRegexProperty7|\\n|The property is of type regex|no|
+
+**Use this rule with the default properties by just referencing it:**
+``` xml
+
+```
+
+**Use this rule and customize it:**
+``` xml
+
diff --git a/pmd-doc/src/test/resources/rulesets/ruledoctest/sample.xml b/pmd-doc/src/test/resources/rulesets/ruledoctest/sample.xml
index da81d702d1..4037c8ffb8 100644
--- a/pmd-doc/src/test/resources/rulesets/ruledoctest/sample.xml
+++ b/pmd-doc/src/test/resources/rulesets/ruledoctest/sample.xml
@@ -216,8 +216,18 @@ RuleTag with full category and without quotes: Use {% rule java/sample/RenamedRu
-
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceRule.java
index 34d9e6d794..3f2058eb54 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceRule.java
@@ -37,6 +37,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTPrimaryPrefix;
import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
import net.sourceforge.pmd.lang.java.ast.ASTResourceList;
import net.sourceforge.pmd.lang.java.ast.ASTReturnStatement;
+import net.sourceforge.pmd.lang.java.ast.ASTStatementExpression;
import net.sourceforge.pmd.lang.java.ast.ASTTryStatement;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclarator;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
@@ -44,6 +45,7 @@ import net.sourceforge.pmd.lang.java.ast.JavaNode;
import net.sourceforge.pmd.lang.java.ast.TypeNode;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
import net.sourceforge.pmd.lang.java.types.TypeTestUtil;
+import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
import net.sourceforge.pmd.properties.PropertyDescriptor;
/**
@@ -65,6 +67,7 @@ import net.sourceforge.pmd.properties.PropertyDescriptor;
public class CloseResourceRule extends AbstractJavaRule {
private static final String WRAPPING_TRY_WITH_RES_VAR_MESSAGE = "it is recommended to wrap resource in try-with-resource declaration directly";
+ private static final String REASSIGN_BEFORE_CLOSED_MESSAGE = "'' is reassigned, but the original instance is not closed";
private static final String CLOSE_IN_FINALLY_BLOCK_MESSAGE = "'' is not closed within a finally block, thus might not be closed at all in case of exceptions";
private static final PropertyDescriptor> CLOSE_TARGETS_DESCRIPTOR =
@@ -164,6 +167,12 @@ public class CloseResourceRule extends AbstractJavaRule {
} else if (shouldVarOfTypeBeClosedInMethod(resVar, resVarType, methodOrConstructor)) {
reportedVarNames.add(resVar.getVarId().getName());
addCloseResourceViolation(resVar.getVarId(), resVarType, data);
+ } else {
+ ASTStatementExpression reassigningStatement = getFirstReassigningStatementBeforeBeingClosed(resVar, methodOrConstructor);
+ if (reassigningStatement != null) {
+ reportedVarNames.add(resVar.getVarId().getName());
+ addViolationWithMessage(data, reassigningStatement, reassignBeforeClosedMessageForVar(resVar.getName()));
+ }
}
}
}
@@ -660,4 +669,77 @@ public class CloseResourceRule extends AbstractJavaRule {
private String closeInFinallyBlockMessageForVar(String var) {
return "''" + var + CLOSE_IN_FINALLY_BLOCK_MESSAGE;
}
+
+ private String reassignBeforeClosedMessageForVar(String var) {
+ return "''" + var + REASSIGN_BEFORE_CLOSED_MESSAGE;
+ }
+
+ private ASTStatementExpression getFirstReassigningStatementBeforeBeingClosed(ASTVariableDeclarator variable, ASTMethodOrConstructorDeclaration methodOrConstructor) {
+ List statements = methodOrConstructor.findDescendantsOfType(ASTStatementExpression.class);
+ boolean variableClosed = false;
+ boolean isInitialized = !hasNullInitializer(variable);
+ ASTExpression initializingExpression = initializerExpressionOf(variable);
+ for (ASTStatementExpression statement : statements) {
+ if (isClosingVariableStatement(statement, variable)) {
+ variableClosed = true;
+ }
+
+ if (isAssignmentForVariable(statement, variable)) {
+ if (isInitialized && !variableClosed) {
+ if (initializingExpression != null && !inSameIfBlock(statement, initializingExpression)) {
+ return statement;
+ }
+ }
+
+ if (variableClosed) {
+ variableClosed = false;
+ }
+ if (!isInitialized) {
+ isInitialized = true;
+ initializingExpression = statement.getFirstDescendantOfType(ASTExpression.class);
+ }
+ }
+ }
+ return null;
+ }
+
+ private boolean inSameIfBlock(ASTStatementExpression statement1, ASTExpression statement2) {
+ List parents1 = statement1.getParentsOfType(ASTIfStatement.class);
+ List parents2 = statement2.getParentsOfType(ASTIfStatement.class);
+ parents1.retainAll(parents2);
+ return !parents1.isEmpty();
+ }
+
+ private boolean isClosingVariableStatement(ASTStatementExpression statement, ASTVariableDeclarator variable) {
+ List expressions = statement.findDescendantsOfType(ASTPrimaryExpression.class);
+ for (ASTPrimaryExpression expression : expressions) {
+ if (isMethodCallClosingResourceVariable(expression, variable.getName())) {
+ return true;
+ }
+ }
+ List names = statement.findDescendantsOfType(ASTName.class);
+ for (ASTName name : names) {
+ if (isCloseCallOnVariable(name, variable.getName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isAssignmentForVariable(ASTStatementExpression statement, ASTVariableDeclarator variable) {
+ if (statement == null || variable == null) {
+ return false;
+ }
+ ASTName name = statement.getFirstDescendantOfType(ASTName.class);
+ if (name == null) {
+ return false;
+ }
+ NameDeclaration statementVariable = name.getNameDeclaration();
+ if (statementVariable == null) {
+ return false;
+ }
+
+ return statement.hasDescendantOfType(ASTAssignmentOperator.class)
+ && statementVariable.equals(variable.getVarId().getNameDeclaration());
+ }
}
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 7968b6ec57..8b743427ae 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -411,11 +411,11 @@ public class Foo {
private Bar var2;
//followed by many imports of unique objects
- void ObjectC doWork() {
+ ObjectC doWork() {
Bardo var55;
ObjectA var44;
ObjectZ var93;
- return something;
+ return something();
}
}
]]>
@@ -616,7 +616,7 @@ user-specified threshold.
+
+
+
+ #2764 false-negative when re-assigning connection
+ java.sql.Connection,java.sql.Statement,java.sql.ResultSet
+ 1
+ 7
+
+ 'c' is reassigned, but the original instance is not closed
+
+