Added another Service Interface -> IModuleConfigurator

Author: RealMangorage

src/main/java/module-info.java

@@ -3,7 +3,9 @@
     requires java.scripting;
 
     opens org.mangorage.bootstrap;
-    exports org.mangorage.bootstrap.api;
+    exports org.mangorage.bootstrap.api.transformer;
+    exports org.mangorage.bootstrap.api.module;
 
-    uses org.mangorage.bootstrap.api.IClassTransformer;
+    uses org.mangorage.bootstrap.api.transformer.IClassTransformer;
+    uses org.mangorage.bootstrap.api.module.IModuleConfigurator;
 }

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

@@ -15,6 +15,7 @@
 
 public final class Bootstrap {
 
+    // --launchProfile mangobot
     public static void main(String[] args) throws IOException {
 
         final var librariesPath = Path.of("libraries");
@@ -48,7 +49,7 @@ public static void main(String[] args) throws IOException {
 
         Thread.currentThread().setContextClassLoader(moduleCl);
 
-        moduleCl.loadTransformers();
+        moduleCl.load();
 
         callMain("org.mangorage.entrypoint.MangoBotCore", args, moduleLayer.findModule("org.mangorage.mangobotcore").get());
     }

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

@@ -0,0 +1,7 @@
+package org.mangorage.bootstrap.api.module;
+
+import java.util.List;
+
+public interface IModuleConfigurator {
+    List<String> getChildren(String module);
+}

…age/bootstrap/api/IClassTransformer.java …p/api/transformer/IClassTransformer.javasrc/main/java/org/mangorage/bootstrap/api/IClassTransformer.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/IClassTransformer.java src/main/java/org/mangorage/bootstrap/api/IClassTransformer.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/IClassTransformer.java

@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.api;
+package org.mangorage.bootstrap.api.transformer;
 
 public interface IClassTransformer {
     TransformResult transform(String className, byte[] classData);

…orage/bootstrap/api/TransformResult.java …rap/api/transformer/TransformResult.javasrc/main/java/org/mangorage/bootstrap/api/TransformResult.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/TransformResult.java src/main/java/org/mangorage/bootstrap/api/TransformResult.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/TransformResult.java

@@ -1,3 +1,3 @@
-package org.mangorage.bootstrap.api;
+package org.mangorage.bootstrap.api.transformer;
 
 public record TransformResult(byte[] classData, TransformerFlag flag) {}

…orage/bootstrap/api/TransformerFlag.java …rap/api/transformer/TransformerFlag.javasrc/main/java/org/mangorage/bootstrap/api/TransformerFlag.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/TransformerFlag.java src/main/java/org/mangorage/bootstrap/api/TransformerFlag.java renamed to src/main/java/org/mangorage/bootstrap/api/transformer/TransformerFlag.java

@@ -1,4 +1,4 @@
-package org.mangorage.bootstrap.api;
+package org.mangorage.bootstrap.api.transformer;
 
 public enum TransformerFlag {
     NO_REWRITE,

src/main/java/org/mangorage/bootstrap/internal/ClassTransformers.java

@@ -1,8 +1,8 @@
 package org.mangorage.bootstrap.internal;
 
-import org.mangorage.bootstrap.api.IClassTransformer;
-import org.mangorage.bootstrap.api.TransformResult;
-import org.mangorage.bootstrap.api.TransformerFlag;
+import org.mangorage.bootstrap.api.transformer.IClassTransformer;
+import org.mangorage.bootstrap.api.transformer.TransformResult;
+import org.mangorage.bootstrap.api.transformer.TransformerFlag;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/org/mangorage/bootstrap/internal/LoadedModule.java

@@ -3,14 +3,22 @@
 import java.io.IOException;
 import java.lang.module.ModuleReader;
 import java.lang.module.ModuleReference;
+import java.net.URI;
 import java.security.CodeSigner;
 import java.security.CodeSource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public final class LoadedModule implements ModuleReader {
+    private final List<LoadedModule> children = new ArrayList<>();
 
-public final class LoadedModule {
     private final ModuleReference moduleReference;
     private final ModuleReader moduleReader;
     private final CodeSource codeSource;
 
+
     LoadedModule(ModuleReference moduleReference) throws IOException {
         this.moduleReference = moduleReference;
         this.moduleReader = moduleReference.open();
@@ -28,4 +36,32 @@ ModuleReader getModuleReader() {
     CodeSource getCodeSource() {
         return codeSource;
     }
+
+    void addChild(LoadedModule module) {
+        this.children.add(module);
+    }
+
+    @Override
+    public Optional<URI> find(String name) throws IOException {
+        final var optional = getModuleReader().find(name);
+        if (optional.isPresent()) return optional;
+
+        for (LoadedModule child : children) {
+            final var optionalChild = child.getModuleReader().find(name);
+            if (optionalChild.isPresent())
+                return optionalChild;
+        }
+
+        return Optional.empty();
+    }
+
+    @Override
+    public Stream<String> list() throws IOException {
+        return Stream.empty();
+    }
+
+    @Override
+    public void close() throws IOException {
+
+    }
 }

src/main/java/org/mangorage/bootstrap/internal/MangoLoader.java

@@ -1,6 +1,7 @@
 package org.mangorage.bootstrap.internal;
 
-import org.mangorage.bootstrap.api.IClassTransformer;
+import org.mangorage.bootstrap.api.module.IModuleConfigurator;
+import org.mangorage.bootstrap.api.transformer.IClassTransformer;
 
 import java.io.IOException;
 import java.lang.module.ModuleReader;
@@ -44,14 +45,37 @@ public MangoLoader(URL[] urls, Set<ResolvedModule> modules, ClassLoader parent)
         });
     }
 
-    public void loadTransformers() {
+    public void load() {
+        loadTransformers();
+        loadModuleConfiguration();
+    }
+
+    void loadTransformers() {
         ServiceLoader.load(IClassTransformer.class)
                 .stream()
                 .forEach(provider -> {
                     transformers.add(provider.get());
                 });
     }
 
+    void loadModuleConfiguration() {
+        ServiceLoader.load(IModuleConfigurator.class)
+                .stream()
+                .forEach(provider -> {
+                    final var configurator = provider.get();
+
+                    moduleMap.forEach((id, module) -> {
+                        final var children = configurator.getChildren(id);
+
+                        children
+                                .stream()
+                                .filter(moduleMap::containsKey)
+                                .map(moduleMap::get)
+                                .forEach(module::addChild);
+                    });
+                });
+    }
+
     @Override
     protected Class<?> findClass(String name) throws ClassNotFoundException {
         if (transformers == null || transformers.isEmpty())
@@ -94,14 +118,12 @@ private Class<?> defineClass(String name, byte[] bytes) {
         return super.defineClass(name, bytes, 0, bytes.length);
     }
 
-
-
     @Override
     protected URL findResource(String moduleName, String name) throws IOException {
         final var loadedModule = moduleMap.get(moduleName);
 
         if (loadedModule != null) {
-            final var uri = loadedModule.getModuleReader().find(name);
+            final var uri = loadedModule.find(name);
             if (uri.isPresent())
                 return uri.get().toURL();
         }
@@ -168,5 +190,4 @@ private String packageName(String cn) {
         int pos = cn.lastIndexOf('.');
         return (pos < 0) ? "" : cn.substring(0, pos);
     }
-
 }