Make wildcard imports work again #330

pom.xml

@@ -29,14 +29,14 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<version>2.6</version>
 		</dependency>
 		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>22.0</version>
+			<groupId>io.github.classgraph</groupId>
+			<artifactId>classgraph</artifactId>
+			<version>4.8.172</version>
 		</dependency>
 		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>33.2.0-jre</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>

resources/bytecode/javFiles/ImportWildcard.jav

@@ -0,0 +1,5 @@
+import java.lang.*;
+
+public class ImportWildcard {
+    m(a, b) { return a * b; }
+}

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -98,7 +98,7 @@ public class JavaTXCompiler {
 		}
 		if (outputPath != null) path.add(outputPath);
 		classLoader = new DirectoryClassLoader(path, ClassLoader.getSystemClassLoader());
-		environment = new CompilationEnvironment(sources);
+		environment = new CompilationEnvironment(sources, classLoader);
 		classPath = path;
 		this.outputPath = outputPath;
 

src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java

@@ -34,7 +34,7 @@ public class CompilationEnvironment {
 	 * 
 	 * @param sourceFiles die zu kompilierenden Dateien
 	 */
-	public CompilationEnvironment(List<File> sourceFiles) {
+	public CompilationEnvironment(List<File> sourceFiles, DirectoryClassLoader classLoader) {
 		/**
 		 * Java 9 bringt einige Änderungen am Classloader So funktioniert der BootClassLoader nicht mehr. hier gibts ein paar Quellen zum nachlesen: http://java9.wtf/class-loading/ https://stackoverflow.com/questions/46494112/classloaders-hierarchy-in-java-9
 		 *
@@ -54,7 +54,7 @@ public class CompilationEnvironment {
 		// librarys = Arrays.asList(loader.getURLs());
 
 		this.sourceFiles = sourceFiles;
-		this.packageCrawler = new PackageCrawler(librarys);
+		this.packageCrawler = new PackageCrawler(classLoader);
 	}
 
 	public void addClassesToRegistry(JavaClassRegistry registry, SourceFileContext tree, File sourceFile, JavaTXCompiler compiler) throws ClassNotFoundException, IOException {
@@ -104,12 +104,4 @@ public class CompilationEnvironment {
 		return packageName;
 	}
 
-	public List<ClassOrInterface> getAllAvailableClasses() {
-		List<ClassOrInterface> ret = new ArrayList<>();
-		for (Class c : new PackageCrawler(librarys).getAllAvailableClasses()) {
-			ret.add(ASTFactory.createClass(c));
-		}
-		return ret;
-	}
-
 }

src/main/java/de/dhbwstuttgart/environment/PackageCrawler.java

@@ -1,17 +1,10 @@
 package de.dhbwstuttgart.environment;
 
-import java.net.URL;
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ScanResult;
+
 import java.util.*;
 
-import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import org.reflections.vfs.SystemDir;
-
 /**
  * Hilft beim Durchsuchen von Packages
  * Benutzt die Reflections-Library (https://github.com/ronmamo/reflections)
@@ -19,48 +12,30 @@ import org.reflections.vfs.SystemDir;
  */
 public class PackageCrawler {
 
-	final URL[] urls;
-	public PackageCrawler(List<URL> urlList) {
-		urls = urlList.toArray(new URL[0]);
+	final DirectoryClassLoader classLoader;
+	public PackageCrawler(DirectoryClassLoader classLoader) {
+		this.classLoader = classLoader;
 	}
 	
-    public Set<Class<?>> getClassesInPackage(String packageName){
-    	/*
-        List<DirectoryClassLoader> classLoadersList = new LinkedList<DirectoryClassLoader>();
-        classLoadersList.add(Thread.currentThread().getContextClassLoader());
-        classLoadersList.add(ClasspathHelper.staticClassLoader());
-        classLoadersList.add(Thread.currentThread().getContextClassLoader().getParent());
-        classLoadersList.add(DirectoryClassLoader.getSystemClassLoader());
-        String bootClassPath = System.getProperty("sun.boot.class.path");
-        ArrayList<URL> urlList = new ArrayList<>();
-        for(String path : bootClassPath.split(";")) {
-        	try {
-				urlList.add(new URL("file:"+path));
-			} catch (MalformedURLException e) {
-				new DebugException("Fehler im Classpath auf diesem System");
-			}
-        }
-        URL[] urls = urlList.toArray(new URL[0]);
-        classLoadersList.add(new URLClassLoader(urls, DirectoryClassLoader.getSystemClassLoader()));
-        */
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(urls)
-                .filterInputsBy(new FilterBuilder().include(FilterBuilder.prefix(packageName))));
+    public Set<Class<?>> getClassesInPackage(String packageName) {
+        var res = new HashSet<Class<?>>();
 
-        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
+        try (ScanResult result = new ClassGraph()
+            .enableClassInfo()
+            .enableSystemJarsAndModules()
+            .addClassLoader(classLoader)
+            .acceptPackages(packageName)
+            .scan()) {
 
-        return classes;
-    }
+            for (var info : result.getAllClasses()) {
+                try {
+                    var clazz = Class.forName(info.getName());
+                    res.add(clazz);
+                } catch (ClassNotFoundException ignored) {}
+            }
+        };
 
-    public Set<Class<?>> getAllAvailableClasses(){
-        Reflections reflections = new Reflections(new ConfigurationBuilder()
-                .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(urls));
-
-        Set<Class<?>> classes = reflections.getSubTypesOf(Object.class);
-
-        return classes;
+        return res;
     }
 
   public Map<String, Integer> getClassNames(String packageName){

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -71,10 +71,6 @@ import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.Void;
-import de.dhbwstuttgart.typeinference.constraints.GenericsResolver;
-import javassist.compiler.SyntaxError;
-
-import javax.swing.text.html.Option;
 
 public class SyntaxTreeGenerator {
   private JavaClassRegistry reg;

src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java

@@ -35,7 +35,6 @@ public class TypeInferenceBlockInformation extends TypeInferenceInformation {
 
     public ClassOrInterface getSuperClass() {
         for (var clazz : getAvailableClasses()) {
-            System.out.println(currentClass.getSuperClass().getName());
             if (clazz.getClassName().equals(currentClass.getSuperClass().getName()))
                 return clazz;
         }

src/test/java/TestComplete.java

@@ -934,6 +934,13 @@ public class TestComplete {
         assertEquals(clazz.getDeclaredMethod("m2").invoke(instance), 10);
     }
 
+    @Test
+    public void testImportWildcard() throws Exception {
+        var classFiles = generateClassFiles(new ByteArrayClassLoader(), "ImportWildcard.jav");
+        var clazz = classFiles.get("ImportWildcard");
+        var instance = clazz.getDeclaredConstructor().newInstance();
+    }
+
     @Test
     public void testBug122() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug122.jav");