clean: JavaCompiler merge Input & Options into single joint Builder class

Author: vorburger

src/ch/vorburger/jvmtools/Bootstrap.java

@@ -1,24 +1,25 @@
 package ch.vorburger.jvmtools;
 
-import ch.vorburger.main.StdIO;
+import static ch.vorburger.test.Assert.assertTrue;
+
+import java.nio.file.Path;
 
 public class Bootstrap {
 
     public static void main(String[] args) throws Exception {
-        var compiler = new JavaCompiler();
 
-        // TODO Glob
-        var sourcepath = new Sourcepath();
-        sourcepath.addClasspathResource("ch/vorburger/jvmtools/JavaCompiler.java");
-        sourcepath.addClasspathResource("ch/vorburger/jvmtools/JavaCompilerTest.java");
+        // TODO Use a (TBD) JavaCompilerTask instead of JavaCompiler directly here...
 
-        var options =
-                new JavaCompiler.Options.Builder()
+        var input =
+                new JavaCompiler.Input.Builder()
+                        // TODO Glob
+                        .sourceAdd(Path.of("src/ch/vorburger/jvmtools/JavaCompiler.java"))
+                        .sourceAdd(Path.of("src/ch/vorburger/jvmtools/JavaCompilerTest.java"))
                         .outputDirectory(".build/bootstrap-classes")
                         .build();
+        assertTrue(new JavaCompiler().invoke(input));
 
-        compiler.invoke(
-                new JavaCompiler.Input(StdIO.system(), sourcepath /* TODO, classpath */, options));
+        // TODO Test loading and running compiled classes, in parallel!
 
         // TODO JAR
     }

src/ch/vorburger/jvmtools/JavaCompiler.java

@@ -19,17 +19,34 @@ public class JavaCompiler implements Service<JavaCompiler.Input, Boolean> {
     // dev.enola.be.jvm module that uses this JavaCompiler class. Note that they have different
     // lifecycles - this is a Singleton service, while Task is per-invocation.
 
-    // TODO Merge Input & Options into single joint record & class Builder?
-
     public record Input(
-            StdIO stdIO, Sourcepath sourcepath /*, Classpath classpath*/, Options options) {}
-
-    public static record Options(Path outputDirectory) {
-        // TODO Support in-memory; see https://www.baeldung.com/java-string-compile-execute-code
+            StdIO stdIO, Sourcepath sourcepath /*, Classpath classpath*/, Options options) {
 
         public static class Builder {
+            private StdIO stdIO = StdIO.system();
+            private Sourcepath sourcepath = new Sourcepath();
             private Path outputDirectory;
 
+            public Builder stdIO(StdIO stdIO) {
+                this.stdIO = stdIO;
+                return this;
+            }
+
+            // TODO Glob
+            public Builder sourceAdd(Path path) {
+                this.sourcepath.addPath(path);
+                return this;
+            }
+
+            public Sourcepath sourcepath() {
+                return sourcepath;
+            }
+
+            public Builder sourcepath(Sourcepath sourcepath) {
+                this.sourcepath = sourcepath;
+                return this;
+            }
+
             public Builder outputDirectory(Path outputDirectory) {
                 this.outputDirectory = outputDirectory;
                 return this;
@@ -39,12 +56,16 @@ public Builder outputDirectory(String outputDirectory) {
                 return outputDirectory(Path.of(outputDirectory));
             }
 
-            public Options build() {
-                return new Options(outputDirectory);
+            public Input build() {
+                var options = new Options(outputDirectory);
+                return new Input(stdIO, sourcepath, options);
             }
         }
     }
 
+    // TODO Support in-memory output; see https://www.baeldung.com/java-string-compile-execute-code
+    public static record Options(Path outputDirectory) {}
+
     @Override
     public Boolean invoke(Input input) throws Exception {
         var err = input.stdIO().errWriter();

src/ch/vorburger/jvmtools/JavaCompilerTest.java

@@ -8,7 +8,6 @@
 public class JavaCompilerTest {
 
     public static void main(String[] args) throws Exception {
-        var compiler = new JavaCompiler();
 
         var sourcepath = new Sourcepath();
         // sourcepath.addClasspathResource("ch/vorburger/jvmtools/Hello.java");
@@ -20,9 +19,14 @@ public static void main(String[] args) throws Exception {
         outputClassFile.delete();
         assertTrue(!outputClassFile.exists());
 
-        var options = new JavaCompiler.Options.Builder().outputDirectory(outputDirectory).build();
         var stdIO = ch.vorburger.main.StdIO.inMemory();
-        assertTrue(compiler.invoke(new JavaCompiler.Input(stdIO, sourcepath, options)) == true);
+        var input =
+                new JavaCompiler.Input.Builder()
+                        .stdIO(stdIO)
+                        .sourcepath(sourcepath)
+                        .outputDirectory(outputDirectory)
+                        .build();
+        assertTrue(new JavaCompiler().invoke(input) == true);
         stdIO.assertErrorEmpty();
 
         assertExists(outputClassFile);