From 5608481cca631f7b8d92f9233baa0aa69eba6728 Mon Sep 17 00:00:00 2001
From: Wilfried Bounsi <wilcoln99@gmail.com>
Date: Sun, 15 Mar 2020 21:33:39 +0100
Subject: [PATCH] Issue #7799: Resolve Pitest Issues - AvoidStarImportCheck (1)

---
 .ci/pitest.sh                                         |  1 -
 .../checks/imports/AvoidStarImportCheck.java          | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/pitest.sh b/.ci/pitest.sh
index c3bf3a1eed91..aecb3c9eefa1 100755
--- a/.ci/pitest.sh
+++ b/.ci/pitest.sh
@@ -71,7 +71,6 @@ pitest-header)
 pitest-imports)
   mvn -e -P$1 clean test org.pitest:pitest-maven:mutationCoverage;
   declare -a ignoredItems=(
-  "AvoidStarImportCheck.java.html:<td class='covered'><pre><span  class='survived'>            &#38;&#38; ast.getType() == TokenTypes.STATIC_IMPORT) {</span></pre></td></tr>"
   "CustomImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {</span></pre></td></tr>"
   "CustomImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)) {</span></pre></td></tr>"
   "CustomImportOrderCheck.java.html:<td class='covered'><pre><span  class='survived'>            if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {</span></pre></td></tr>"
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
index f5da30ed92f5..d0f1ab6872f0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java
@@ -216,12 +216,13 @@ public void setAllowStaticMemberImports(boolean allow) {
 
     @Override
     public void visitToken(final DetailAST ast) {
-        if (!allowClassImports && ast.getType() == TokenTypes.IMPORT) {
-            final DetailAST startingDot = ast.getFirstChild();
-            logsStarredImportViolation(startingDot);
+        if(ast.getType() == TokenTypes.IMPORT) {
+            if (!allowClassImports) {
+                final DetailAST startingDot = ast.getFirstChild();
+                logsStarredImportViolation(startingDot);
+            }
         }
-        else if (!allowStaticMemberImports
-            && ast.getType() == TokenTypes.STATIC_IMPORT) {
+        else if (!allowStaticMemberImports) {
             // must navigate past the static keyword
             final DetailAST startingDot = ast.getFirstChild().getNextSibling();
             logsStarredImportViolation(startingDot);