From f7d8ecc6b06af0e0d9ba7a9980e90d8e32f3038b Mon Sep 17 00:00:00 2001
From: rnveach <rveach02@gmail.com>
Date: Wed, 31 Aug 2022 11:38:11 -0400
Subject: [PATCH] Issue #12145: corrected tokens so all are required

---
 .../checks/imports/ImportOrderCheck.java      | 14 +++-----------
 .../meta/checks/imports/ImportOrderCheck.xml  |  6 ------
 .../checks/imports/ImportOrderCheckTest.java  |  2 ++
 ...InputImportOrder_HonorsTokensProperty.java |  4 ++--
 src/xdocs/config_imports.xml                  | 19 -------------------
 5 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
index e767697e9a1..2e7449a1e93 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
@@ -128,14 +128,6 @@
  * Type is {@code boolean}.
  * Default value is {@code false}.
  * </li>
- * <li>
- * Property {@code tokens} - tokens to check
- * Type is {@code java.lang.String[]}.
- * Validation type is {@code tokenSet}.
- * Default value is:
- * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
- * STATIC_IMPORT</a>.
- * </li>
  * </ul>
  * <p>
  * To configure the check:
@@ -773,17 +765,17 @@ public void setUseContainerOrderingForStatic(boolean useContainerOrdering) {
 
     @Override
     public int[] getDefaultTokens() {
-        return getAcceptableTokens();
+        return getRequiredTokens();
     }
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
+        return getRequiredTokens();
     }
 
     @Override
     public int[] getRequiredTokens() {
-        return new int[] {TokenTypes.IMPORT};
+        return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
     }
 
     @Override
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
index 4e5f4b7b738..4369a4a390f 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/imports/ImportOrderCheck.xml
@@ -91,12 +91,6 @@
                <description>control whether to use container
  ordering (Eclipse IDE term) for static imports or not.</description>
             </property>
-            <property default-value="STATIC_IMPORT"
-                       name="tokens"
-                       type="java.lang.String[]"
-                       validation-type="tokenSet">
-               <description>tokens to check</description>
-            </property>
          </properties>
          <message-keys>
             <message-key key="import.groups.separated.internally"/>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
index dfae061f4c1..7a0a8e24e28 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheckTest.java
@@ -303,6 +303,8 @@ public void testGetGroupNumber() throws Exception {
     @Test
     public void testHonorsTokenProperty() throws Exception {
         final String[] expected = {
+            "20:1: " + getCheckMessage(MSG_ORDERING, "java.awt.Button.ABORT"),
+            "21:1: " + getCheckMessage(MSG_ORDERING, "java.awt.Dialog"),
             "22:1: " + getCheckMessage(MSG_ORDERING, "java.awt.Button"),
         };
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
index 67a76988081..42769fec9f1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/importorder/InputImportOrder_HonorsTokensProperty.java
@@ -17,8 +17,8 @@
 package com.puppycrawl.tools.checkstyle.checks.imports.importorder;
 
 import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; // ok
-import static java.awt.Button.ABORT; // ok
-import java.awt.Dialog; // ok
+import static java.awt.Button.ABORT; // violation
+import java.awt.Dialog; // violation
 import java.awt.Button; // violation
 
 public class InputImportOrder_HonorsTokensProperty {
diff --git a/src/xdocs/config_imports.xml b/src/xdocs/config_imports.xml
index 2f730cb0427..7a5fc267a38 100644
--- a/src/xdocs/config_imports.xml
+++ b/src/xdocs/config_imports.xml
@@ -1927,25 +1927,6 @@ import java.util.stream.IntStream;
               <td><code>false</code></td>
               <td>7.1</td>
             </tr>
-
-            <tr>
-              <td>tokens</td>
-              <td>tokens to check</td>
-
-              <td>
-                subset of tokens
-                <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                    STATIC_IMPORT</a>
-                  .
-              </td>
-
-              <td>
-                <a href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#STATIC_IMPORT">
-                    STATIC_IMPORT</a>
-                  .
-              </td>
-              <td>3.2</td>
-            </tr>
           </table>
         </div>
       </subsection>