Remove custom file manager from javac demo

Author: patrick96

native-image/wasm-javac/src/main/java/com/example/JavaFileManagerImpl.java

@@ -7,35 +7,25 @@
 package com.example;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Stream;
 
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
+import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
 import com.example.preload.PreLoadedCompiler;
 import com.example.preload.PreLoadedFiles;
 
 public class JavacCompilerWrapper {
-    private static JavaFileManagerImpl fileManagerInstance = null;
-
-    /**
-     * Initializes the filesystem.
-     * <p>
-     * This is usually done lazily, call this method if you want to control when this happens.
-     */
-    public static void init() {
-        System.setProperty("java.home", PreLoadedFiles.JAVA_HOME);
-        getFm();
-    }
+    private static JavaFileManager fileManagerInstance = null;
 
-    public static JavaFileManagerImpl getFm() {
+    public static JavaFileManager getFm() {
         if (fileManagerInstance == null) {
             try {
                 fileManagerInstance = PreLoadedFiles.initFileSystem();
@@ -47,9 +37,26 @@ public static JavaFileManagerImpl getFm() {
         return fileManagerInstance;
     }
 
+    static void deleteDirectory(Path directoryToBeDeleted) throws IOException {
+        try (Stream<Path> paths = Files.list(directoryToBeDeleted)) {
+            paths.forEach(f -> {
+                try {
+                    if (Files.isDirectory(f)) {
+                        deleteDirectory(directoryToBeDeleted);
+                    }
+
+                    Files.delete(f);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+    }
+
     public static Result compileFiles(List<String> options, FileContent[] files) throws IOException {
-        JavaFileManagerImpl fm = getFm();
-        fm.generatedClasses.clear();
+        JavaFileManager fm = getFm();
+        Path outputPath = Path.of(PreLoadedFiles.OUTPUT_PATH);
+        deleteDirectory(outputPath);
         List<JavaFileObject> inputs = new ArrayList<>();
 
         for (FileContent content : files) {
@@ -60,19 +67,18 @@ public static Result compileFiles(List<String> options, FileContent[] files) thr
             Path fileNamePath = sourceFile.getFileName();
             assert fileNamePath != null : "Could not get filename for source file path";
             String fileName = fileNamePath.toString();
-            String className = JavaFileManagerImpl.removeExtension(fileName);
+            String className = PackageNamingUtil.removeExtension(fileName);
 
             Path parent = sourceFile.getParent();
             if (parent != null) {
                 Files.createDirectories(parent);
             }
 
             Files.write(sourceFile, source);
+            System.err.println("Added file at " + sourceFile);
             JavaFileObject fileObject = fm.getJavaFileForInput(StandardLocation.SOURCE_PATH, className, JavaFileObject.Kind.SOURCE);
-            assert fileObject != null : "JavaFileManager.getJavaFileForInput returned null";
+            assert fileObject != null : "JavaFileManager.getJavaFileForInput returned null for class name " + className;
             inputs.add(fileObject);
-
-            System.err.println("Added file at " + sourceFile);
         }
 
         System.err.println("Compiling with options: " + options);
@@ -84,15 +90,17 @@ public static Result compileFiles(List<String> options, FileContent[] files) thr
             return Result.failure(collector.diagnostics);
         }
 
-        List<FileContent> outputFile = new ArrayList<>(fm.generatedClasses.size());
+        List<FileContent> outputFiles = new ArrayList<>();
 
-        for (Map.Entry<String, JavaFileObject> entry : fm.generatedClasses.entrySet()) {
-            try (InputStream os = entry.getValue().openInputStream()) {
-                outputFile.add(new FileContent(entry.getKey() + entry.getValue().getKind().extension, os.readAllBytes()));
+        try (Stream<Path> s = Files.walk(outputPath)) {
+            for (Path f : s.toList()) {
+                if (Files.isRegularFile(f)) {
+                    outputFiles.add(new FileContent(outputPath.relativize(f).toString(), Files.readAllBytes(f)));
+                }
             }
         }
 
-        return Result.success(outputFile, collector.diagnostics);
+        return Result.success(outputFiles, collector.diagnostics);
     }
 
     public record FileContent(String name, byte[] content) {

native-image/wasm-javac/src/main/java/com/example/JavacCompilerWrapper.java

@@ -19,7 +19,6 @@
 
 public class JavacMain {
     public static void main(String[] args) throws IOException {
-        JavacCompilerWrapper.init();
         String filePath = args[0];
         String source = readFile(filePath);
         Path path = Path.of(filePath);