From 70a03a6a680db59d423ef9b07f1a7a45fb713db4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sat, 23 Jun 2018 10:15:54 +0200
Subject: [PATCH] [java] UnnecessaryFullyQualifiedName: check for package name
 java.lang

---
 .../UnnecessaryFullyQualifiedNameRule.java    | 24 +++++++++++++------
 .../xml/UnnecessaryFullyQualifiedName.xml     | 13 ++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
index 4181e315f1..0300cd4d1d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java
@@ -17,7 +17,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTName;
 import net.sourceforge.pmd.lang.java.ast.ASTPackageDeclaration;
-import net.sourceforge.pmd.lang.java.ast.JavaNode;
+import net.sourceforge.pmd.lang.java.ast.AbstractJavaTypeNode;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 import net.sourceforge.pmd.lang.java.symboltable.SourceFileScope;
 
@@ -79,7 +79,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
                 && name.lastIndexOf('.') == decl.getImportedName().length();
     }
 
-    private void checkImports(JavaNode node, Object data) {
+    private void checkImports(AbstractJavaTypeNode node, Object data) {
         String name = node.getImage();
         List<ASTImportDeclaration> matches = new ArrayList<>();
 
@@ -142,7 +142,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
             }
         }
 
-        if (matches.isEmpty() && isJavaLangImplicit(name)) {
+        if (matches.isEmpty() && isJavaLangImplicit(node)) {
             addViolation(data, node, new Object[] { node.getImage(), "java.lang.*", "implicit "});
         }
 
@@ -159,12 +159,22 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule {
         }
     }
 
-    private boolean isJavaLangImplicit(String name) {
-        // only java.lang.* is implicitly imported, but not e.g. java.lang.reflection.*
-        return name != null && name.startsWith("java.lang.") && StringUtils.countMatches(name, '.') == 2;
+    private boolean isJavaLangImplicit(AbstractJavaTypeNode node) {
+        String name = node.getImage();
+        boolean isJavaLang = name != null && name.startsWith("java.lang.");
+
+        if (isJavaLang && node.getType() != null) {
+            // valid would be ProcessBuilder.Redirect.PIPE but not java.lang.ProcessBuilder.Redirect.PIPE
+            String packageName = node.getType().getPackage().getName();
+            return "java.lang".equals(packageName);
+        } else if (isJavaLang) {
+            // only java.lang.* is implicitly imported, but not e.g. java.lang.reflection.*
+            return StringUtils.countMatches(name, '.') == 2;
+        }
+        return false;
     }
 
-    private boolean isAvoidingConflict(final JavaNode node, final String name,
+    private boolean isAvoidingConflict(final AbstractJavaTypeNode node, final String name,
             final ASTImportDeclaration firstMatch) {
         // is it a conflict between different imports?
         if (firstMatch.isImportOnDemand() && firstMatch.isStatic()) {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
index 7fc011324d..fbc79c8550 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
@@ -424,6 +424,19 @@ import org.foo.String;
 public class JavaLang {
     public void convert(java.lang.String s) { // no violation
     }
+}
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>#1186 [java] UnnecessaryFullyQualifiedName doesn't detect java.lang FQ names as violations: static members of classes in java.lang</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+public class JavaLang {
+    public void foo() {
+        ProcessBuilder pb = new ProcessBuilder("echo");
+        pb.redirectError(java.lang.ProcessBuilder.Redirect.DISCARD); // violation
+    }
 }
         ]]></code>
     </test-code>