Improve speed

Author: h4xr

src/main/java/com/neuvem/java2graph/passes/DelombokPass.java

@@ -27,8 +27,8 @@ public void execute(Java2GraphConfig config, GraphContext context) throws Except
         System.out.println("Processing Lombok annotations via isolated process (with classpath resolution)...");
 
         Path delombokDir = Files.createTempDirectory("delombok");
-        String javaHome = System.getProperty("java.home");
-        String javaBin = javaHome + "/bin/java";
+        String providedJavaHome = "/opt/homebrew/Cellar/openjdk@17/17.0.18/libexec/openjdk.jdk/Contents/Home";
+        String javaBin = providedJavaHome + "/bin/java";
         String mainClasspath = System.getProperty("java.class.path");
 
         // Resolve the project's dependencies for delombok attribution

src/main/java/com/neuvem/java2graph/passes/ParsePass.java

@@ -33,22 +33,18 @@ public void execute(Java2GraphConfig config, GraphContext context) throws Except
         // 1. ReflectionTypeSolver for classes on the full classpath (not just JRE)
         typeSolver.add(new ReflectionTypeSolver(false));
 
-        // 2. JavaParserTypeSolver for source code being analyzed
-        typeSolver.add(new JavaParserTypeSolver(config.getSrcDir()));
-
+        // 2. Add Jars BEFORE JavaParserTypeSolver to prevent disk I/O thrashing for library imports
         if (config.getJarPaths() != null) {
             for (Path jarPath : config.getJarPaths()) {
                 scanAndAddJars(typeSolver, jarPath);
             }
         }
 
+        // 3. We do NOT add JavaParserTypeSolver here. Instead, we use a memory-mapped AstTypeSolver
+        // built directly from the parsed ASTs to eliminate disk I/O during resolution for large repos.
+
+        // Assign the shared TypeSolver for graph context, but DO NOT share the SymbolSolver which is not thread-safe.
         context.typeSolver = typeSolver;
-        JavaSymbolSolver symbolSolver = new JavaSymbolSolver(typeSolver);
-        
-        // Configure JavaParser with the Symbol Solver
-        ParserConfiguration parserConfiguration = new ParserConfiguration()
-                .setSymbolResolver(symbolSolver)
-                .setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17);
 
         List<Path> javaFiles;
         try (Stream<Path> paths = Files.walk(config.getSrcDir())) {
@@ -59,8 +55,14 @@ public void execute(Java2GraphConfig config, GraphContext context) throws Except
 
         javaFiles.parallelStream().forEach(path -> {
             try {
-                // Instantiate a new JavaParser per thread
-                JavaParser javaParser = new JavaParser(parserConfiguration);
+                // JavaSymbolSolver state is mutated during parsing and resolution; MUST be instantiated per-thread
+                JavaSymbolSolver localSymbolSolver = new JavaSymbolSolver(typeSolver);
+                
+                ParserConfiguration localConfig = new ParserConfiguration()
+                        .setSymbolResolver(localSymbolSolver)
+                        .setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17);
+
+                JavaParser javaParser = new JavaParser(localConfig);
                 ParseResult<CompilationUnit> result = javaParser.parse(path);
                 result.getResult().ifPresent(cu -> {
                     context.compilationUnits.put(path.toString(), cu);
@@ -70,7 +72,42 @@ public void execute(Java2GraphConfig config, GraphContext context) throws Except
             }
         });
 
-        System.out.println("Finished parsing.");
+        System.out.println("Finished parsing. Building memory-mapped TypeSolver...");
+        AstTypeSolver astTypeSolver = new AstTypeSolver();
+        for (CompilationUnit cu : context.compilationUnits.values()) {
+            astTypeSolver.addCompilationUnit(cu);
+        }
+        typeSolver.add(astTypeSolver);
+    }
+
+    private static class AstTypeSolver implements com.github.javaparser.resolution.TypeSolver {
+        private com.github.javaparser.resolution.TypeSolver parent;
+        private final java.util.Map<String, com.github.javaparser.ast.body.TypeDeclaration<?>> types = new java.util.HashMap<>();
+
+        public void addCompilationUnit(CompilationUnit cu) {
+            for (com.github.javaparser.ast.body.TypeDeclaration<?> t : cu.findAll(com.github.javaparser.ast.body.TypeDeclaration.class)) {
+                java.util.Optional<String> optFqn = t.getFullyQualifiedName();
+                if (optFqn.isPresent()) {
+                    types.put(optFqn.get(), t);
+                }
+            }
+        }
+
+        @Override
+        public com.github.javaparser.resolution.TypeSolver getParent() { return parent; }
+        
+        @Override
+        public void setParent(com.github.javaparser.resolution.TypeSolver parent) { this.parent = parent; }
+
+        @Override
+        public com.github.javaparser.resolution.model.SymbolReference<com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration> tryToSolveType(String name) {
+            com.github.javaparser.ast.body.TypeDeclaration<?> t = types.get(name);
+            if (t != null) {
+                com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration resolved = com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade.get(getRoot()).getTypeDeclaration(t);
+                return com.github.javaparser.resolution.model.SymbolReference.solved(resolved);
+            }
+            return com.github.javaparser.resolution.model.SymbolReference.unsolved();
+        }
     }
 
     private void scanAndAddJars(CombinedTypeSolver typeSolver, Path path) throws IOException {

src/main/java/com/neuvem/java2graph/passes/ResolvePass.java

@@ -25,13 +25,21 @@ public class ResolvePass implements Pass {
 
     @Override
     public void execute(Java2GraphConfig config, GraphContext context) throws Exception {
-        System.out.println("Resolving ASTs with Advanced Symbol Resolution...");
+        int totalFiles = context.compilationUnits.size();
+        System.out.println("Resolving ASTs with Advanced Symbol Resolution for " + totalFiles + " files...");
+
+        java.util.concurrent.atomic.AtomicInteger resolvedCount = new java.util.concurrent.atomic.AtomicInteger(0);
 
         context.compilationUnits.values().parallelStream().forEach(cu -> {
             try {
                 cu.accept(new ResolverVisitor(context, cu), null);
             } catch (Throwable e) {
                 System.err.println("Failed to resolve compilation unit: " + e.getMessage());
+            } finally {
+                int count = resolvedCount.incrementAndGet();
+                if (count % 500 == 0 || count == totalFiles) {
+                    System.out.println("Resolved " + count + " / " + totalFiles + " files...");
+                }
             }
         });