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

@@ -15,9 +15,6 @@
  */
 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;
@@ -48,6 +45,7 @@
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.collect.HashBasedTable;
 import com.diffplug.common.collect.Table;
+import com.diffplug.spotless.FileSignature;
 
 /**
  * How to use:
@@ -59,7 +57,9 @@
 public abstract class GitRatchet<Project> implements AutoCloseable {
 
 	public boolean isClean(Project project, ObjectId treeSha, File file) throws IOException {
-		return isClean(project, treeSha, pathNativeToUnix(repositoryFor(project).getWorkTree().toPath().relativize(file.toPath()).toString()));
+		Repository repo = repositoryFor(project);
+		String relativePath = FileSignature.pathNativeToUnix(repo.getWorkTree().toPath().relativize(file.toPath()).toString());
+		return isClean(project, treeSha, relativePath);
 	}
 
 	private final Map<Repository, DirCache> dirCaches = new HashMap<>();
@@ -210,7 +210,8 @@ public synchronized ObjectId subtreeShaOf(Project project, ObjectId rootTreeSha)
 				if (repo.getWorkTree().equals(directory)) {
 					subtreeSha = rootTreeSha;
 				} else {
-					TreeWalk treeWalk = forPath(repo, pathNativeToUnix(repo.getWorkTree().toPath().relativize(directory.toPath()).toString()), rootTreeSha);
+					String subpath = FileSignature.pathNativeToUnix(repo.getWorkTree().toPath().relativize(directory.toPath()).toString());
+					TreeWalk treeWalk = TreeWalk.forPath(repo, subpath, rootTreeSha);
 					subtreeSha = treeWalk == null ? ObjectId.zeroId() : treeWalk.getObjectId(0);
 				}
 				subtreeShaCache.put(project, subtreeSha.copy());