fixup! Introduce semantics-aware Java import ordering. (fixes #522)

Frettman · Frettman · commit 10610f8a8d12 · 2023-05-22T21:03:16.000+02:00
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -40,7 +41,7 @@
 
 public final class ImportOrderStep {
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
-	private static final boolean SEMANTIC_SORT_DEFAULT = true;
+	private static final boolean SEMANTIC_SORT_DEFAULT = false;
 	private static final Set<String> TREAT_AS_PACKAGE_DEFAULT = null;
 	private static final Set<String> TREAT_AS_CLASS_DEFAULT = null;
 
@@ -84,9 +85,8 @@ public FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set
 	private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Set<String> treatAsPackage,
 			Set<String> treatAsClass, Supplier<List<String>> importOrder) {
 		return FormatterStep.createLazy("importOrder",
-				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort,
-						treatAsPackage == null ? Set.of() : treatAsPackage,
-						treatAsClass == null ? Set.of() : treatAsClass),
+				() -> new State(importOrder.get(), lineFormat, wildcardsLast, semanticSort, treatAsPackage,
+						treatAsClass),
 				State::toFormatter);
 	}
 
@@ -118,17 +118,17 @@ private static final class State implements Serializable {
 		private final String lineFormat;
 		private final boolean wildcardsLast;
 		private final boolean semanticSort;
-		private final Set<String> treatAsPackage;
-		private final Set<String> treatAsClass;
+		private final TreeSet<String> treatAsPackage;
+		private final TreeSet<String> treatAsClass;
 
 		State(List<String> importOrder, String lineFormat, boolean wildcardsLast, boolean semanticSort,
 				Set<String> treatAsPackage, Set<String> treatAsClass) {
 			this.importOrder = importOrder;
 			this.lineFormat = lineFormat;
 			this.wildcardsLast = wildcardsLast;
 			this.semanticSort = semanticSort;
-			this.treatAsPackage = treatAsPackage;
-			this.treatAsClass = treatAsClass;
+			this.treatAsPackage = treatAsPackage == null ? null : new TreeSet<>(treatAsPackage);
+			this.treatAsClass = treatAsClass == null ? null : new TreeSet<>(treatAsClass);
 		}
 
 		FormatterFunc toFormatter() {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -415,7 +415,7 @@ private String[] splitPackageAndClasses(String fqcn) {
 		 */
 		private boolean treatAsPackage(String prefix) {
 			// This would be the place to introduce wild cards or even regex matching.
-			return treatAsPackage.contains(prefix);
+			return treatAsPackage != null && treatAsPackage.contains(prefix);
 		}
 
 		/**
@@ -424,7 +424,7 @@ private boolean treatAsPackage(String prefix) {
 		 */
 		private boolean treatAsClass(String prefix) {
 			// This would be the place to introduce wild cards or even regex matching.
-			return treatAsClass.contains(prefix);
+			return treatAsClass != null && treatAsClass.contains(prefix);
 		}
 
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -77,7 +77,7 @@ public class ImportOrderConfig {
 		final File importOrderFile;
 
 		boolean wildcardsLast = false;
-		boolean semanticSort = true;
+		boolean semanticSort = false;
 		Set<String> treatAsPackage = Set.of();
 		Set<String> treatAsClass = Set.of();
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/ImportOrder.java
@@ -44,7 +44,7 @@ public class ImportOrder implements FormatterStepFactory {
 	 * lexicographically.
 	 */
 	@Parameter
-	private boolean semanticSort = true;
+	private boolean semanticSort = false;
 
 	/**
 	 * The prefixes that should be treated as packages for

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ private String[] splitPackageAndClasses(String fqcn) {`
`415`	`415`	`*/`
`416`	`416`	`private boolean treatAsPackage(String prefix) {`
`417`	`417`	`// This would be the place to introduce wild cards or even regex matching.`
`418`		`- return treatAsPackage.contains(prefix);`
	`418`	`+ return treatAsPackage != null && treatAsPackage.contains(prefix);`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`/**`
`@@ -424,7 +424,7 @@ private boolean treatAsPackage(String prefix) {`
`424`	`424`	`*/`
`425`	`425`	`private boolean treatAsClass(String prefix) {`
`426`	`426`	`// This would be the place to introduce wild cards or even regex matching.`
`427`		`- return treatAsClass.contains(prefix);`
	`427`	`+ return treatAsClass != null && treatAsClass.contains(prefix);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`}`