moved launch target logic to its own system...

Author: RealMangorage

src/main/java/module-info.java

@@ -8,12 +8,9 @@
     exports org.mangorage.bootstrap.api.launch;
     exports org.mangorage.bootstrap.api.loader;
     exports org.mangorage.bootstrap.api.dependency;
+    exports org.mangorage.bootstrap.api.util;
 
     opens org.mangorage.bootstrap;
-    exports org.mangorage.bootstrap.internal.launch;
-
-    provides org.mangorage.bootstrap.api.launch.ILaunchTarget with org.mangorage.bootstrap.internal.launch.MangoBotLaunchTarget;
-    provides org.mangorage.bootstrap.api.dependency.IDependencyLocator with org.mangorage.bootstrap.internal.launch.MangoBotDependencyLocator;
 
     uses org.mangorage.bootstrap.api.transformer.IClassTransformer;
     uses org.mangorage.bootstrap.api.module.IModuleConfigurator;

src/main/java/org/mangorage/bootstrap/Bootstrap.java

@@ -1,12 +1,12 @@
 package org.mangorage.bootstrap;
 
 import com.google.gson.Gson;
-import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
 import org.mangorage.bootstrap.api.launch.ILaunchTarget;
 import org.mangorage.bootstrap.internal.util.Util;
-import org.mangorage.bootstrap.internal.launch.MangoBotLaunchTarget;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -32,17 +32,11 @@ public static void main(String[] args) throws Throwable {
 
         ModuleLayer parent = null;
 
-        if (Bootstrap.class.getModule() != null) {
-            parent = Bootstrap.class.getModule().getLayer();
-        }
-
         if (parent == null)
             parent = ModuleLayer.boot();
 
         // Where additional launch targets can be defined...
-        Path launchPath = Path.of(
-                "launch"
-        );
+        final Path launchPath = Path.of("boot").toAbsolutePath();
 
         final var moduleCfg = Configuration
                 .resolveAndBind(
@@ -65,25 +59,28 @@ public static void main(String[] args) throws Throwable {
                 Thread.currentThread().getContextClassLoader()
         );
         final var moduleLayer = moduleLayerController.layer();
+        final var moduleCL = new URLClassLoader(
+                new URL[]{
+                        Path.of("boot/boot.jar").toUri().toURL()
+                },
+                Thread.currentThread().getContextClassLoader()
+        );
+
+        moduleLayer.defineModulesWithOneLoader(moduleCfg, moduleCL);
+        Thread.currentThread().setContextClassLoader(moduleCL);
 
         final Map<String, ILaunchTarget> launchTargetMap = new HashMap<>();
 
-//        ServiceLoader.load(moduleLayer, ILaunchTarget.class)
-//                .stream()
-//                .forEach(provider -> {
-//                    try {
-//                        final var target = provider.get();
-//                        launchTargetMap.put(target.getId(), target);
-//                    } catch (Exception e) {
-//                        throw new IllegalStateException(e);
-//                    }
-//                });
-
-        // Only add if we dont have any other launch targets...
-        if (launchTargetMap.isEmpty()) {
-            final var defaultLaunchTarget = new MangoBotLaunchTarget();
-            launchTargetMap.put(defaultLaunchTarget.getId(), defaultLaunchTarget);
-        }
+        ServiceLoader.load(moduleLayer, ILaunchTarget.class)
+                .stream()
+                .forEach(provider -> {
+                    try {
+                        final var target = provider.get();
+                        launchTargetMap.put(target.getId(), target);
+                    } catch (Exception e) {
+                        throw new IllegalStateException(e);
+                    }
+                });
 
         if (!launchTargetMap.containsKey(launchTarget)) {
             throw new IllegalStateException("Cant find launch target '%s'".formatted(launchTarget));

src/main/java/org/mangorage/bootstrap/api/loader/IMangoLoader.java

@@ -1,8 +1,7 @@
 package org.mangorage.bootstrap.api.loader;
 
-import org.mangorage.bootstrap.internal.launch.MangoLoaderImpl;
 
-public sealed interface IMangoLoader permits MangoLoaderImpl {
+public interface IMangoLoader {
     byte[] getClassBytes(String name);
     boolean hasClass(String name);
 }

src/main/java/org/mangorage/bootstrap/api/module/IModuleLayer.java

@@ -1,10 +1,8 @@
 package org.mangorage.bootstrap.api.module;
 
-import org.mangorage.bootstrap.internal.launch.ModuleLayerImpl;
-
 import java.util.List;
 
-public sealed interface IModuleLayer permits ModuleLayerImpl {
+public interface IModuleLayer {
     void addOpens(String sourceModule, String pkg, String targetModule);
     void addExports(String sourceModule, String pkg, String targetModule);
     void addReads(String sourceModule, String targetModule);

src/main/java/org/mangorage/bootstrap/api/util/GsonUtil.java

@@ -0,0 +1,12 @@
+package org.mangorage.bootstrap.api.util;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public final class GsonUtil {
+    private static final Gson GSON = new GsonBuilder().create();
+
+    public static <T> T get(Class<T> tClass, String json) {
+        return GSON.fromJson(json, tClass);
+    }
+}