From cd6402bf8e1e3cbc74f0b54a7b6798890813c1f1 Mon Sep 17 00:00:00 2001
From: malintha1996 <malintha1996@gmail.com>
Date: Thu, 19 Mar 2020 22:34:31 +0530
Subject: [PATCH] Issue #7805: Resolve Pitest Issues - CustomImportOrderCheck
 (4)

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

diff --git a/.ci/pitest.sh b/.ci/pitest.sh
index aecb3c9eefa1..690bf9e82f88 100755
--- a/.ci/pitest.sh
+++ b/.ci/pitest.sh
@@ -71,9 +71,7 @@ pitest-header)
 pitest-imports)
   mvn -e -P$1 clean test org.pitest:pitest-maven:mutationCoverage;
   declare -a ignoredItems=(
-  "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>"
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (regexp) {</span></pre></td></tr>"
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (!result &#38;&#38; illegalClasses != null) {</span></pre></td></tr>"
   "IllegalImportCheck.java.html:<td class='covered'><pre><span  class='survived'>        if (!result) {</span></pre></td></tr>"
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
index 5f9005ee26e5..ce58bfec8d37 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
@@ -525,10 +525,8 @@ public void beginTree(DetailAST rootAST) {
     @Override
     public void visitToken(DetailAST ast) {
         if (ast.getType() == TokenTypes.PACKAGE_DEF) {
-            if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) {
-                samePackageDomainsRegExp = createSamePackageRegexp(
-                        samePackageMatchingDepth, ast);
-            }
+            samePackageDomainsRegExp = createSamePackageRegexp(
+                    samePackageMatchingDepth, ast);
         }
         else {
             final String importFullPath = getFullImportIdent(ast);