hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'issue-232' into pmd/5.4.x

Browse Source
This commit is contained in:
Andreas Dangel
2017-02-12 09:37:31 +01:00
parent 49c0b20362 fc1e90b7d3
commit e16ee448da
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pmd-java/src/main/resources/rulesets/java/basic.xml
View File

@@ -805,24 +805,24 @@ public class Count {
externalInfoUrl="${pmd.website.baseurl}/rules/java/basic.html#SimplifiedTernary">
<description>
<![CDATA[
Look for ternary operators with the form condition ? literalBoolean : foo
or condition ? foo : literalBoolean.
Look for ternary operators with the form `condition ? literalBoolean : foo`
or `condition ? foo : literalBoolean`.
These expressions can be simplified respectively to
condition || foo when the literalBoolean is true
!condition && foo when the literalBoolean is false
`condition || foo` when the literalBoolean is true
`!condition && foo` when the literalBoolean is false
or
!condition || foo when the literalBoolean is true
condition && foo when the literalBoolean is false
`!condition || foo` when the literalBoolean is true
`condition && foo` when the literalBoolean is false
]]>
</description>
<priority>3</priority>
<properties>
<property name="xpath">
<value><![CDATA[
//ConditionalExpression[@Ternary='true'][not(PrimaryExpression/*/Literal/BooleanLiteral) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
//ConditionalExpression[@Ternary='true'][not(PrimaryExpression/*/Literal) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
|
//ConditionalExpression[@Ternary='true'][not(Expression/PrimaryExpression/*/Literal/BooleanLiteral) and (PrimaryExpression/*/Literal/BooleanLiteral)]
//ConditionalExpression[@Ternary='true'][not(Expression/PrimaryExpression/*/Literal) and (PrimaryExpression/*/Literal/BooleanLiteral)]
]]>
</value>
</property>

12
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/SimplifiedTernary.xml
View File

@@ -94,6 +94,18 @@ public class SimplifiedTernary {
private SomeValue doStuff(SomeValue someValue) {
return THE_VALUE.equals(rangeValue.to) ? new SomeValue(someValue.from, null, true) : someValue;
}
}
]]></code>
</test-code>
<test-code>
<description>#232 False positive with ternary operator using nullables</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class SimplifiedTernary {
public Boolean getHasCustomName() {
return mHasCustomName ? true : null;
}
}
]]></code>
</test-code>

2
src/site/markdown/overview/changelog.md
View File

@@ -22,6 +22,8 @@ This is a bug fixing release, no major changes were introduced.
* general
* [#234](https://github.com/pmd/pmd/issues/234): \[core] Zip file stream closes spuriously when loading rulesets
* java-basic
* [#232](https://github.com/pmd/pmd/issues/232): \[java] SimplifiedTernary: Incorrect ternary operation can be simplified.
* java-design
* [#216](https://github.com/pmd/pmd/issues/216): \[java] \[doc] NonThreadSafeSingleton: Be more explicit as to why double checked locking is not recommended
* [#219](https://github.com/pmd/pmd/issues/219): \[java] UnnecessaryLocalBeforeReturn: ClassCastException in switch case with local variable returned