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

Author: Vincent Potucek

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

@@ -47,6 +47,9 @@
 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:
  * - For best performance, you should have one instance of GitRatchet, shared by all projects.
@@ -57,9 +60,7 @@
 public abstract class GitRatchet<Project> implements AutoCloseable {
 
 	public boolean isClean(Project project, ObjectId treeSha, File file) throws IOException {
-		Repository repo = repositoryFor(project);
-		String relativePath = FileSignature.pathNativeToUnix(repo.getWorkTree().toPath().relativize(file.toPath()).toString());
-		return isClean(project, treeSha, relativePath);
+		return isClean(project, treeSha, pathNativeToUnix(repositoryFor(project).getWorkTree().toPath().relativize(file.toPath()).toString()));
 	}
 
 	private final Map<Repository, DirCache> dirCaches = new HashMap<>();
@@ -210,8 +211,7 @@ public synchronized ObjectId subtreeShaOf(Project project, ObjectId rootTreeSha)
 				if (repo.getWorkTree().equals(directory)) {
 					subtreeSha = rootTreeSha;
 				} else {
-					String subpath = FileSignature.pathNativeToUnix(repo.getWorkTree().toPath().relativize(directory.toPath()).toString());
-					TreeWalk treeWalk = TreeWalk.forPath(repo, subpath, rootTreeSha);
+					TreeWalk treeWalk = forPath(repo, pathNativeToUnix(repo.getWorkTree().toPath().relativize(directory.toPath()).toString()), rootTreeSha);
 					subtreeSha = treeWalk == null ? ObjectId.zeroId() : treeWalk.getObjectId(0);
 				}
 				subtreeShaCache.put(project, subtreeSha.copy());

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

@@ -72,10 +72,9 @@ public State(Collection<File> typeSolverClasspath, JarState jarState) {
 
 		FormatterFunc toFormatter() {
 			try {
-				Class<?> formatterFunc = jarState.getClassLoader()
-						.loadClass("com.diffplug.spotless.glue.javaparser.ExpandWildcardsFormatterFunc");
-				Constructor<?> constructor = formatterFunc.getConstructor(Collection.class);
-				return (FormatterFunc) constructor.newInstance(typeSolverClasspath);
+				return (FormatterFunc) jarState.getClassLoader()
+						.loadClass("com.diffplug.spotless.glue.javaparser.ExpandWildcardsFormatterFunc")
+					.getConstructor(Collection.class).newInstance(typeSolverClasspath);
 			} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException
 					| InstantiationException | IllegalAccessException | NoClassDefFoundError cause) {
 				throw new IllegalStateException(INCOMPATIBLE_ERROR_MESSAGE, cause);