Deprecate pmd-core::lang.rule.ImportWrapper

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/internal/ImportWrapper.java

@@ -0,0 +1,127 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.java.ast.internal;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
+
+/**
+ * Helper class to analyze {@link ASTImportDeclaration}s.
+ */
+public class ImportWrapper {
+    private ASTImportDeclaration node;
+    private String name;
+    private String fullname;
+    private boolean isStaticDemand;
+    private Set<String> allDemands = new HashSet<>();
+
+    public ImportWrapper(String fullname, String name) {
+        this(fullname, name, null);
+    }
+
+    public ImportWrapper(String fullname, String name, ASTImportDeclaration node) {
+        this(fullname, name, node, false);
+    }
+
+    public ImportWrapper(String fullname, String name, ASTImportDeclaration node, boolean isStaticDemand) {
+        this.fullname = fullname;
+        this.name = name;
+        this.node = node;
+        this.isStaticDemand = isStaticDemand;
+
+        if (node != null && node.getType() != null) {
+            Class<?> type = node.getType();
+            for (Method m : type.getMethods()) {
+                allDemands.add(m.getName());
+            }
+            for (Field f : type.getFields()) {
+                allDemands.add(f.getName());
+            }
+            // also consider static fields, that are not public
+            for (Field f : type.getDeclaredFields()) {
+                if (Modifier.isStatic(f.getModifiers())) {
+                    allDemands.add(f.getName());
+                }
+            }
+            // and methods, too
+            for (Method m : type.getDeclaredMethods()) {
+                if (Modifier.isStatic(m.getModifiers())) {
+                    allDemands.add(m.getName());
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == null) {
+            return false;
+        }
+        if (other == this) {
+            return true;
+        }
+        if (other.getClass() != ImportWrapper.class) {
+            return false;
+        }
+
+        ImportWrapper i = (ImportWrapper) other;
+        if (isStaticDemand != i.isStaticDemand) {
+            return false;
+        }
+        if (name == null) {
+            return fullname.equals(i.getFullName());
+        }
+        return name.equals(i.getName());
+    }
+
+    public boolean matches(ImportWrapper i) {
+        if (isStaticDemand) {
+            if (allDemands.contains(i.fullname)) {
+                return true;
+            }
+        }
+        if (name == null && i.getName() == null) {
+            return i.getFullName().equals(fullname);
+        }
+        return i.getName().equals(name);
+    }
+
+    @Override
+    public int hashCode() {
+        if (name == null) {
+            return Objects.hash(fullname, isStaticDemand);
+        }
+        return Objects.hash(name, isStaticDemand);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getFullName() {
+        return fullname;
+    }
+
+    public Node getNode() {
+        return node;
+    }
+
+    public boolean isStaticOnDemand() {
+        return isStaticDemand;
+    }
+
+    @Override
+    public String toString() {
+        return "Import[name=" + name + ",fullname=" + fullname + ",static*=" + isStaticDemand + ']';
+    }
+}

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedImportsRule.java

@@ -22,8 +22,8 @@ import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
 import net.sourceforge.pmd.lang.java.ast.Comment;
 import net.sourceforge.pmd.lang.java.ast.FormalComment;
 import net.sourceforge.pmd.lang.java.ast.TypeNode;
+import net.sourceforge.pmd.lang.java.ast.internal.ImportWrapper;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
-import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class UnusedImportsRule extends AbstractJavaRule {
 
@@ -117,7 +117,7 @@ public class UnusedImportsRule extends AbstractJavaRule {
     public Object visit(ASTImportDeclaration node, Object data) {
         if (node.isImportOnDemand()) {
             ASTName importedType = (ASTName) node.getChild(0);
-            imports.add(new ImportWrapper(importedType.getImage(), null, node, node.getType(), node.isStatic()));
+            imports.add(new ImportWrapper(importedType.getImage(), null, node, node.isStatic()));
         } else {
             if (!node.isImportOnDemand()) {
                 ASTName importedType = (ASTName) node.getChild(0);

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/DuplicateImportsRule.java

@@ -11,8 +11,8 @@ import java.util.Set;
 
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
+import net.sourceforge.pmd.lang.java.ast.internal.ImportWrapper;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
-import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class DuplicateImportsRule extends AbstractJavaRule {