Issue #17487: Add importOrder

Vincent Potucek · romani · commit a65b39c193e9 · 2025-10-25T15:44:59.000-07:00
diff --git a/config/spotless/import.order b/config/spotless/import.order
@@ -0,0 +1,4 @@
+3=
+2=org
+1=javax
+0=java
diff --git a/config/spotless/licence.header b/config/spotless/licence.header
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code and other text files for adherence to a set of rules.
+// Copyright (C) 2001-$YEAR the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+///////////////////////////////////////////////////////////////////////////////////////////////
+
diff --git a/pom.xml b/pom.xml
@@ -611,7 +611,14 @@
           <version>3.0.0</version>
           <configuration>
             <java>
+              <forbidWildcardImports />
               <removeUnusedImports />
+              <importOrder>
+                <file>config/spotless/import.order</file>
+              </importOrder>
+              <licenseHeader>
+                <file>config/spotless/licence.header</file>
+              </licenseHeader>
             </java>
             <upToDateChecking>
               <enabled>true</enabled>
@@ -1897,22 +1904,24 @@
             <validationSet>
               <dir>config</dir>
               <excludes>
-                <exclude>java.header</exclude>
-                <exclude>java-regexp.header</exclude>
-                <exclude>org.eclipse.jdt.core.prefs</exclude>
-                <exclude>intellij-idea-inspections.properties</exclude>
-                <exclude>markdownlint.rb</exclude>
-                <exclude>signatures.txt</exclude>
-                <exclude>signatures-test.txt</exclude>
-                <exclude>codenarc-rules.groovy.txt</exclude>
-                <!-- until https://github.com/checkstyle/checkstyle/issues/11572 -->
-                <exclude>linkcheck-suppressions.txt</exclude>
                 <exclude>archunit-store/**</exclude>
+                <exclude>codenarc-rules.groovy.txt</exclude>
                 <exclude>google-java-format/**</exclude>
+                <exclude>intellij-idea-inspections.properties</exclude>
+                <exclude>java-regexp.header</exclude>
+                <exclude>java.header</exclude>
                 <exclude>jsoref-spellchecker/**</exclude>
+                <exclude>markdownlint.rb</exclude>
+                <exclude>openrewrite-recipes-checkstyle.properties</exclude>
+                <exclude>org.eclipse.jdt.core.prefs</exclude>
                 <exclude>projects-to-test/**</exclude>
+                <exclude>signatures-test.txt</exclude>
+                <exclude>signatures.txt</exclude>
+                <exclude>spotless/import.order</exclude>
+                <exclude>spotless/licence.header</exclude>
                 <exclude>yamllint.yaml</exclude>
-                <exclude>openrewrite-recipes-checkstyle.properties</exclude>
+                <!-- until https://github.com/checkstyle/checkstyle/issues/11572 -->
+                <exclude>linkcheck-suppressions.txt</exclude>
               </excludes>
             </validationSet>
             <validationSet>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
@@ -218,4 +218,3 @@ public void finishTree(DetailAST rootAST) {
         }
     }
 }
-
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java
@@ -190,4 +190,3 @@ private static void writeToFile(Document document, ModuleDetails moduleDetails)
 
     }
 }
-
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheckTest.java
@@ -117,4 +117,3 @@ public void testMissingNullCaseInSwitchWithPrimitives() throws Exception {
             expected);
     }
 }
-
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheckTest.java
@@ -160,4 +160,3 @@ public void testGetAcceptableTokens() {
     }
 
 }
-

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +3=
 +2=org
 +1=javax
 +0=java
Original file line number	Diff line number	Diff line change
`@@ -218,4 +218,3 @@ public void finishTree(DetailAST rootAST) {`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`}`
`221`		`-`
Original file line number	Diff line number	Diff line change
`@@ -190,4 +190,3 @@ private static void writeToFile(Document document, ModuleDetails moduleDetails)`
`190`	`190`
`191`	`191`	`}`
`192`	`192`	`}`
`193`		`-`
Original file line number	Diff line number	Diff line change
`@@ -117,4 +117,3 @@ public void testMissingNullCaseInSwitchWithPrimitives() throws Exception {`
`117`	`117`	`expected);`
`118`	`118`	`}`
`119`	`119`	`}`
`120`		`-`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,3 @@ public void testGetAcceptableTokens() {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`}`
`163`		`-`