new step to expand java wildcard imports diffplug#2744 diffplug#2594

Author: Vincent Potucek

gradle/spotless.gradle

@@ -5,7 +5,7 @@ spotless {
 		java {
 			bumpThisNumberIfACustomStepChanges(1)
 			eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
-			expandWildcardImports()
+			// expandWildcardImports()
 			forbidRegex('ForbidGradleInternal', 'import org\\.gradle\\.api\\.internal\\.(.*)', "Don't use Gradle's internal API")
 			formatAnnotations()
 			importOrderFile   rootProject.file('gradle/spotless.importorder')

lib-extra/src/main/java/com/diffplug/spotless/extra/GitRatchet.java

@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.extra;
 
+import static com.diffplug.spotless.FileSignature.pathNativeToUnix;
+import static org.eclipse.jgit.treewalk.TreeWalk.forPath;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -45,10 +48,6 @@
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.collect.HashBasedTable;
 import com.diffplug.common.collect.Table;
-import com.diffplug.spotless.FileSignature;
-
-import static com.diffplug.spotless.FileSignature.pathNativeToUnix;
-import static org.eclipse.jgit.treewalk.TreeWalk.forPath;
 
 /**
  * How to use:

lib/src/main/java/com/diffplug/spotless/java/ExpandWildcardImportsStep.java

@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.Serial;
 import java.io.Serializable;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Objects;
@@ -74,7 +73,7 @@ FormatterFunc toFormatter() {
 			try {
 				return (FormatterFunc) jarState.getClassLoader()
 						.loadClass("com.diffplug.spotless.glue.javaparser.ExpandWildcardsFormatterFunc")
-					.getConstructor(Collection.class).newInstance(typeSolverClasspath);
+						.getConstructor(Collection.class).newInstance(typeSolverClasspath);
 			} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException
 					| InstantiationException | IllegalAccessException | NoClassDefFoundError cause) {
 				throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);