Skip to content

Commit 6e08bd2

Browse files
committed
Updated Launch Target
1 parent bd4fbd0 commit 6e08bd2

4 files changed

Lines changed: 21 additions & 20 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ repositories {
6060
}
6161

6262
dependencies {
63-
compileOnly("org.mangorage:mangobotbootstrap:1.0.91")
63+
compileOnly("org.mangorage:mangobotbootstrap:1.0.94")
6464
}
6565

6666
test {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mangorage.mangobotlaunch.launch;
22

3+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
34
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
4-
import org.mangorage.bootstrap.api.logging.IMangoLogger;
55
import org.mangorage.bootstrap.api.transformer.IClassTransformer;
66
import org.mangorage.bootstrap.api.transformer.IClassTransformerHistory;
77
import org.mangorage.bootstrap.api.transformer.ITransformerResultHistory;
@@ -15,7 +15,7 @@
1515

1616
public final class ClassTransformers implements IClassTransformerHistory {
1717

18-
private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(ClassTransformers.class);
18+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", ClassTransformers.class);
1919
private static final boolean DEBUG_CLASS_TRANSFORMING = Boolean.getBoolean("DEBUG_CLASS_TRANSFORMING");
2020

2121
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
2828

2929
void add(IClassTransformer transformer) {
3030
transformers.add(transformer);
31-
LOGGER.info("Added transformer: {0}", transformer.getName());
31+
LOGGER.get().info("Added transformer: {0}", transformer.getName());
3232
}
3333

3434
byte[] transform(String name, byte[] classData) {
3535
if (transformers.isEmpty()) {
36-
LOGGER.info("No transformers registered for class: {0}", name);
36+
LOGGER.get().info("No transformers registered for class: {0}", name);
3737
return null;
3838
}
3939

@@ -59,18 +59,18 @@ byte[] transform(String name, byte[] classData) {
5959
historyList.add(entry);
6060
previous = entry; // update previous for the next iteration
6161

62-
LOGGER.info("Transformer history recorded for {0} using {1}", new Object[]{name, transformer.getName()});
62+
LOGGER.get().info("Transformer history recorded for {0} using {1}", new Object[]{name, transformer.getName()});
6363
}
6464

6565
if (result.flag() != TransformerFlag.NO_REWRITE) {
66-
LOGGER.info("Class {0} transformed by {1}", new Object[]{name, transformer.getName()});
66+
LOGGER.get().info("Class {0} transformed by {1}", new Object[]{name, transformer.getName()});
6767
return result.classData();
6868
}
6969

7070
// currentData remains the same if NO_REWRITE
7171
}
7272

73-
LOGGER.info("No transformation applied to class: {0}", name);
73+
LOGGER.get().info("No transformation applied to class: {0}", name);
7474
return null;
7575
}
7676

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
55
import org.mangorage.bootstrap.api.launch.ILaunchTarget;
66
import org.mangorage.bootstrap.api.launch.ILaunchTargetEntrypoint;
7+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
78
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
8-
import org.mangorage.bootstrap.api.logging.IMangoLogger;
99
import org.mangorage.mangobotlaunch.util.Util;
1010
import java.lang.module.Configuration;
1111
import java.lang.module.ModuleFinder;
@@ -20,7 +20,7 @@
2020
import java.util.Set;
2121

2222
public final class MangoBotLaunchTarget implements ILaunchTarget {
23-
private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(MangoBotLaunchTarget.class);
23+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", MangoBotLaunchTarget.class);
2424

2525
@Override
2626
public String getId() {
@@ -60,19 +60,19 @@ public ModuleLayer setup(ModuleLayer bootstrapLayer, ModuleLayer parent, String[
6060
moduleNames.addAll(Util.getModuleNames(pluginsPath));
6161
moduleNames.addAll(finalDependencies.keySet());
6262

63-
LOGGER.info("----------------------------------------------");
64-
LOGGER.info("Module Info");
65-
LOGGER.info("----------------------------------------------");
63+
LOGGER.get().info("----------------------------------------------");
64+
LOGGER.get().info("Module Info");
65+
LOGGER.get().info("----------------------------------------------");
6666
moduleNames.forEach(name -> {
67-
LOGGER.info("Module Name -> " + name);
67+
LOGGER.get().info("Module Name -> " + name);
6868
});
69-
LOGGER.info("----------------------------------------------");
70-
LOGGER.info("Module -> Jar Info");
71-
LOGGER.info("----------------------------------------------");
69+
LOGGER.get().info("----------------------------------------------");
70+
LOGGER.get().info("Module -> Jar Info");
71+
LOGGER.get().info("----------------------------------------------");
7272
finalDependencies.forEach((module, result) -> {
73-
LOGGER.info("Module -> " + module + " Jar -> " + result.resolveJar() + " Name -> " + result.getName() + " Origin -> " + result.getModuleNameOrigin());
73+
LOGGER.get().info("Module -> " + module + " Jar -> " + result.resolveJar() + " Name -> " + result.getName() + " Origin -> " + result.getModuleNameOrigin());
7474
});
75-
LOGGER.info("----------------------------------------------");
75+
LOGGER.get().info("----------------------------------------------");
7676

7777
final var moduleCfg = Configuration.resolve(
7878
ModuleFinder.of(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.mangorage.mangobotlaunch.util;
22

3+
import org.mangorage.bootstrap.api.logging.IDeferredMangoLogger;
34
import org.mangorage.bootstrap.api.logging.ILoggerFactory;
45
import org.mangorage.bootstrap.api.logging.IMangoLogger;
56

@@ -11,7 +12,7 @@
1112
import java.util.Set;
1213

1314
public final class Util {
14-
private static final IMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j").getLogger(Util.class);
15+
private static final IDeferredMangoLogger LOGGER = ILoggerFactory.getDefault().getWrappedProvider("slf4j", Util.class);
1516

1617
public static Set<String> getModuleNames(Path folder) {
1718
final Set<String> moduleNames = new HashSet<>();

0 commit comments

Comments
 (0)