prevent false resolving of wildcard subpackages

Author: Plunts

lib/src/javaParser/java/com/diffplug/spotless/glue/javaParser/ExpandWildcardsFormatterFunc.java

@@ -135,9 +135,15 @@ public void visit(final ClassOrInterfaceType n,
 
 		private void matchTypeName(Map<ImportDeclaration, Set<ImportDeclaration>> importMap, String qualifiedName,
 				boolean isStatic) {
+			int lastDot = qualifiedName.lastIndexOf('.');
+			if (lastDot < 0) {
+				return;
+			}
+
+			String packageName = qualifiedName.substring(0, lastDot);
 			for (var entry : importMap.entrySet()) {
 				if (entry.getKey().isStatic() == isStatic
-						&& qualifiedName.startsWith(entry.getKey().getName().asString())) {
+						&& packageName.equals(entry.getKey().getName().asString())) {
 					entry.getValue().add(new ImportDeclaration(qualifiedName, isStatic, false));
 					break;
 				}

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

@@ -73,7 +73,7 @@ public State(Collection<File> typeSolverClasspath, JarState jarState) {
 		FormatterFunc toFormatter() {
 			try {
 				Class<?> formatterFunc = jarState.getClassLoader()
-						.loadClass("com.diffplug.spotless.glue.javaParser.ExpandWildcardsFormatterFunc");
+						.loadClass("com.diffplug.spotless.glue.javaparser.ExpandWildcardsFormatterFunc");
 				Constructor<?> constructor = formatterFunc.getConstructor(Collection.class);
 				return (FormatterFunc) constructor.newInstance(typeSolverClasspath);
 			} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException

testlib/src/main/resources/java/expandwildcardimports/JavaClassWithWildcardsFormatted.test

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.Callable;
 import foo.bar.baz.AnotherImportedClass;
 import org.example.SomeAnnotation;
 
@@ -26,7 +27,7 @@ public class JavaClassWithWildcards {
     /**
      * Some JavaDoc
      */
-    public Optional<Integer> testMethod() {
+    public Optional<Integer> testMethod(Callable callable) {
         AnotherClassInSamePackage test1 = null;
         AnotherImportedClass test2 = null;
         return Optional.empty();

testlib/src/main/resources/java/expandwildcardimports/JavaClassWithWildcardsUnformatted.test

@@ -1,6 +1,7 @@
 package foo.bar;
 
 import java.util.*;
+import java.util.concurrent.Callable;
 import foo.bar.baz.*;
 import org.example.*;
 import java.io.*;
@@ -23,7 +24,7 @@ public class JavaClassWithWildcards {
     /**
      * Some JavaDoc
      */
-    public Optional<Integer> testMethod() {
+    public Optional<Integer> testMethod(Callable callable) {
         AnotherClassInSamePackage test1 = null;
         AnotherImportedClass test2 = null;
         return Optional.empty();