From 988931c43d4b2437ff7e2bfca3e7e4cd30c1c44f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Fri, 20 Nov 2015 10:05:49 +0100
Subject: [PATCH] #1422 UselessQualifiedThis: False positive with Java 8
 Function

---
 .../resources/rulesets/java/unnecessary.xml   | 10 ++++++----
 .../unnecessary/xml/UselessQualifiedThis.xml  | 19 +++++++++++++++++++
 src/site/markdown/overview/changelog.md       |  2 ++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/pmd-java/src/main/resources/rulesets/java/unnecessary.xml b/pmd-java/src/main/resources/rulesets/java/unnecessary.xml
index 24b68c16e2..a488c88eac 100644
--- a/pmd-java/src/main/resources/rulesets/java/unnecessary.xml
+++ b/pmd-java/src/main/resources/rulesets/java/unnecessary.xml
@@ -297,10 +297,12 @@ public class Foo {
        <property name="xpath">
           <value>
           <![CDATA[
-//PrimaryExpression[
-  PrimaryPrefix/Name[@Image] and PrimarySuffix[@Arguments='false']
-  and ancestor::ClassOrInterfaceBodyDeclaration[1][@AnonymousInnerClass='false']
-]/PrimaryPrefix/Name[@Image = ancestor::ClassOrInterfaceDeclaration[1]/@Image]
+//PrimaryExpression
+[PrimaryPrefix/Name[@Image]]
+[PrimarySuffix[@Arguments='false']]
+[not(PrimarySuffix/MemberSelector)]
+[ancestor::ClassOrInterfaceBodyDeclaration[1][@AnonymousInnerClass='false']]
+/PrimaryPrefix/Name[@Image = ancestor::ClassOrInterfaceDeclaration[1]/@Image]
           ]]>
           </value>
        </property>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessQualifiedThis.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessQualifiedThis.xml
index 3b426d7f15..c9809767d7 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessQualifiedThis.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessQualifiedThis.xml
@@ -130,4 +130,23 @@ public class Foo {
         </code>
     </test-code>
 
+    <test-code>
+        <description>#1422 UselessQualifiedThis: False positive with Java 8 Function</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class ApiExceptionCtrlAdvice {
+    public final List<ApiError> handleApiAggregateException(final ApiAggregateException e) {
+        return e.getCauses().stream().map(
+            ApiExceptionCtrlAdvice::toApiError
+        ).collect(Collectors.toList());
+    }
+    private static ApiError toApiError(final Throwable e) {
+        return new ApiError()
+                .withException(e.getClass().getName())
+                .withCause(Optional.ofNullable(e.getCause()).map(Throwable::getClass).map(Class::getName).orElse(EMPTY))
+                .withMessage(Optional.ofNullable(e.getMessage()).orElse(EMPTY));
+    }
+}
+        ]]></code>
+    </test-code>
 </test-data>
\ No newline at end of file
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 0208fb45ba..779a5320c6 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -30,6 +30,8 @@
     *   [#1431](https://sourceforge.net/p/pmd/bugs/1431/): SuspiciousEqualsMethodName false positive
 *   java-optimizations/RedundantFieldInitializer
     *   [#1443](https://sourceforge.net/p/pmd/bugs/1443/): RedundantFieldInitializer: False positive for small floats
+*   java-unnecessary/UselessQualifiedThis
+    *   [#1422](https://sourceforge.net/p/pmd/bugs/1422/): UselessQualifiedThis: False positive with Java 8 Function
 *   java-unusedcode/UnusedPrivateField
     *   [#1428](https://sourceforge.net/p/pmd/bugs/1428/): False positive in UnusedPrivateField when local variable
         hides member variable