UIse wrapped provider, since slf4j doesnt always exist!

Author: RealMangorage

build.gradle

@@ -60,7 +60,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.mangorage:mangobotbootstrap:1.0.87")
+    compileOnly("org.mangorage:mangobotbootstrap:1.0.90")
 }
 
 test {

src/main/java/org/mangorage/mangobotlaunch/launch/ClassTransformers.java

@@ -1,5 +1,7 @@
 package org.mangorage.mangobotlaunch.launch;
 
+import org.mangorage.bootstrap.api.logging.ILoggerFactory;
+import org.mangorage.bootstrap.api.logging.IMangoLogger;
 import org.mangorage.bootstrap.api.transformer.IClassTransformer;
 import org.mangorage.bootstrap.api.transformer.IClassTransformerHistory;
 import org.mangorage.bootstrap.api.transformer.ITransformerResultHistory;
@@ -10,12 +12,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public final class ClassTransformers implements IClassTransformerHistory {
 
-    private static final Logger LOGGER = Logger.getLogger(ClassTransformers.class.getName());
+    private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(ClassTransformers.class);
     private static final boolean DEBUG_CLASS_TRANSFORMING = Boolean.getBoolean("DEBUG_CLASS_TRANSFORMING");
 
     record TransformerHistoryEntry(Class<?> transformer, String transformerName, TransformerFlag transformerFlag, byte[] classData, byte[] transformerResult, ITransformerResultHistory previous)
@@ -28,12 +28,12 @@ record TransformerHistoryEntry(Class<?> transformer, String transformerName, Tra
 
     void add(IClassTransformer transformer) {
         transformers.add(transformer);
-        LOGGER.log(Level.INFO, "Added transformer: {0}", transformer.getName());
+        LOGGER.info("Added transformer: {0}", transformer.getName());
     }
 
     byte[] transform(String name, byte[] classData) {
         if (transformers.isEmpty()) {
-            LOGGER.log(Level.FINE, "No transformers registered for class: {0}", name);
+            LOGGER.info("No transformers registered for class: {0}", name);
             return null;
         }
 
@@ -59,18 +59,18 @@ byte[] transform(String name, byte[] classData) {
                 historyList.add(entry);
                 previous = entry; // update previous for the next iteration
 
-                LOGGER.log(Level.FINE, "Transformer history recorded for {0} using {1}", new Object[]{name, transformer.getName()});
+                LOGGER.info("Transformer history recorded for {0} using {1}", new Object[]{name, transformer.getName()});
             }
 
             if (result.flag() != TransformerFlag.NO_REWRITE) {
-                LOGGER.log(Level.INFO, "Class {0} transformed by {1}", new Object[]{name, transformer.getName()});
+                LOGGER.info("Class {0} transformed by {1}", new Object[]{name, transformer.getName()});
                 return result.classData();
             }
 
             // currentData remains the same if NO_REWRITE
         }
 
-        LOGGER.log(Level.FINE, "No transformation applied to class: {0}", name);
+        LOGGER.info("No transformation applied to class: {0}", name);
         return null;
     }
 

src/main/java/org/mangorage/mangobotlaunch/launch/MangoBotLaunchTarget.java

@@ -4,6 +4,8 @@
 import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
 import org.mangorage.bootstrap.api.launch.ILaunchTarget;
 import org.mangorage.bootstrap.api.launch.ILaunchTargetEntrypoint;
+import org.mangorage.bootstrap.api.logging.ILoggerFactory;
+import org.mangorage.bootstrap.api.logging.IMangoLogger;
 import org.mangorage.mangobotlaunch.util.Util;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
@@ -18,14 +20,15 @@
 import java.util.Set;
 
 public final class MangoBotLaunchTarget implements ILaunchTarget {
+    private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(MangoBotLaunchTarget.class);
 
     @Override
     public String getId() {
         return "mangobot";
     }
 
     @Override
-    public void launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args) {
+    public ModuleLayer launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args) {
         final var pluginsPath = Path.of("plugins");
 
         List<IDependencyLocator> dependencyLocators = ServiceLoader.load(bootstrapLayer, IDependencyLocator.class)
@@ -57,19 +60,19 @@ public void launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args
         moduleNames.addAll(Util.getModuleNames(pluginsPath));
         moduleNames.addAll(finalDependencies.keySet());
 
-        System.out.println("----------------------------------------------");
-        System.out.println("Module Info");
-        System.out.println("----------------------------------------------");
+        LOGGER.info("----------------------------------------------");
+        LOGGER.info("Module Info");
+        LOGGER.info("----------------------------------------------");
         moduleNames.forEach(name -> {
-            System.out.println("Module Name -> " + name);
+            LOGGER.info("Module Name -> " + name);
         });
-        System.out.println("----------------------------------------------");
-        System.out.println("Module -> Jar Info");
-        System.out.println("----------------------------------------------");
+        LOGGER.info("----------------------------------------------");
+        LOGGER.info("Module -> Jar Info");
+        LOGGER.info("----------------------------------------------");
         finalDependencies.forEach((module, result) -> {
-            System.out.println("Module -> " + module + " Jar -> " + result.resolveJar() + " Name -> " + result.getName() + " Origin -> " + result.getModuleNameOrigin());
+            LOGGER.info("Module -> " + module + " Jar -> " + result.resolveJar() + " Name -> " + result.getName() + " Origin -> " + result.getModuleNameOrigin());
         });
-        System.out.println("----------------------------------------------");
+        LOGGER.info("----------------------------------------------");
 
         final var moduleCfg = Configuration.resolve(
                 ModuleFinder.of(
@@ -103,5 +106,8 @@ public void launch(ModuleLayer bootstrapLayer, ModuleLayer parent, String[] args
                 .findAny()
                 .orElseThrow(() -> new IllegalStateException("Unable to find entrypoint for mangobot launch target"))
                 .init(args);
+
+        // Allow bootstrap to see the moduleLayer!
+        return moduleLayer;
     }
 }

src/main/java/org/mangorage/mangobotlaunch/util/Util.java

@@ -1,5 +1,8 @@
 package org.mangorage.mangobotlaunch.util;
 
+import org.mangorage.bootstrap.api.logging.ILoggerFactory;
+import org.mangorage.bootstrap.api.logging.IMangoLogger;
+
 import java.io.File;
 import java.lang.module.ModuleFinder;
 import java.lang.module.ModuleReference;
@@ -8,6 +11,8 @@
 import java.util.Set;
 
 public final class Util {
+    private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(Util.class);
+
     public static Set<String> getModuleNames(Path folder) {
         final Set<String> moduleNames = new HashSet<>();