phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-1503'

Browse Source
This commit is contained in:
Andreas Dangel
2018-12-13 08:38:09 +01:00
parent c9d9b74d1a 89f23f73b3
commit 5639222e95
4 changed files with 98 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pmd-java/src/main/resources/category/java/errorprone.xml
+2 -1
View File
@@ -2666,8 +2666,9 @@ Avoid returning from a finally block, this can discard exceptions.
</description>
<priority>3</priority>
<properties>
<property name="version" value="2.0"/>
<property name="xpath">
<value>//FinallyStatement//ReturnStatement</value>
<value>//FinallyStatement//ReturnStatement except //FinallyStatement//(MethodDeclaration|LambdaExpression)//ReturnStatement</value>
</property>
</properties>
<example>
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ReturnFromFinallyBlock.xml
+92 -9
View File
@@ -4,9 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
<test-code>
<description><![CDATA[
throw exception but return from finally
]]></description>
<description>throw exception but return from finally</description>
<expected-problems>1</expected-problems>
<code><![CDATA[
public class Foo {
@@ -23,9 +21,7 @@ public class Foo {
]]></code>
</test-code>
<test-code>
<description><![CDATA[
lots of returns
]]></description>
<description>lots of returns</description>
<expected-problems>1</expected-problems>
<code><![CDATA[
public class Foo {
@@ -42,9 +38,7 @@ public class Foo {
]]></code>
</test-code>
<test-code>
<description><![CDATA[
ok
]]></description>
<description>ok</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
@@ -57,4 +51,93 @@ public class Foo {
}
]]></code>
</test-code>
<test-code>
<description>#1035 [java] ReturnFromFinallyBlock: False positive on lambda expression in finally block</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
String bar() {
try {
} finally {
Object o = new Object() {
@Override
public String toString() {
return "";
}
};
}
}
}
]]></code>
</test-code>
<test-code>
<description>Return from Lambda in Finally</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
String getBar() {
try {
} finally {
Collection<ServiceExecutionEntry> untracked = serviceExecutionTracker.untrackMatchingEntries(e -> {
ServiceExecutionIdentifiers ids = e.getIdentifiers();
Long execBqiId = (ids == null) ? null : ids.getBqiId();
return Objects.equals(bqiId, execBqiId);
});
untracked.forEach(e -> logger.info("overwriteLastBqi(bqId={}, bqiId={}) untracked {}", bqId, bqiId, e));
}
}
}
]]></code>
</test-code>
<test-code>
<description>return from a lambda should not cause issues</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
void printSomething() {
try {
System.out.println("Integers: ");
} finally {
Arrays.asList(0, 1, 2).map(i -> { return i + 1; }).forEach(i -> System.out.println(i));
}
}
}
]]></code>
</test-code>
<test-code>
<description>Return in finally should give error but not in lambda</description>
<expected-problems>1</expected-problems>
<code><![CDATA[
public class Foo {
String printSomething() {
try {
System.out.println("Integers: ");
} finally {
Arrays.asList(0, 1, 2).map(i -> { return i + 1; }).forEach(i -> System.out.println(i));
return "foo";
}
}
}
]]></code>
</test-code>
<test-code>
<description>Return from anonyous class should not give any error</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class Foo {
void printSomething() {
try {
System.out.println("Integers: ");
} finally {
Arrays.asList(0, 1, 2).map(new Function<Integer, Integer>() {
@Override
public Integer apply(Integer i) {
return i + 1;
}
}).forEach(i -> System.out.println(i));
}
}
}
]]></code>
</test-code>
</test-data>