From eea1597b15d157886a2e6ecdd2222d4391db7bf7 Mon Sep 17 00:00:00 2001 From: Tueem Date: Wed, 16 Apr 2025 00:00:25 +0200 Subject: [PATCH] fix(wrapper): also remove LoggerUtil in wrapper --- .../marinara/wrapper/discord4j/Discord4JWrapper.java | 4 ++-- .../tomatentum/marinara/test/discord4j/SlashCommandTest.java | 1 + .../tomatentum/marinara/wrapper/javacord/JavacordWrapper.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java index a4d1569..74f710f 100644 --- a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java +++ b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.function.UnaryOperator; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import discord4j.core.GatewayDiscordClient; import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent; @@ -13,7 +14,6 @@ import discord4j.core.object.command.ApplicationCommandOption.Type; import discord4j.discordjson.json.ApplicationCommandOptionChoiceData; import discord4j.discordjson.json.ApplicationCommandRequest; -import net.tomatentum.marinara.util.LoggerUtil; import net.tomatentum.marinara.wrapper.CommandConverter; import net.tomatentum.marinara.wrapper.CommandRegisterer; import net.tomatentum.marinara.wrapper.ContextObjectProvider; @@ -37,7 +37,7 @@ public class Discord4JWrapper extends LibraryWrapper { private Discord4JContextObjectProvider contextObjectProvider; private CommandRegisterer commandRegisterer; - private Logger logger = LoggerUtil.getLogger(getClass()); + private Logger logger = LoggerFactory.getLogger(getClass()); public Discord4JWrapper(GatewayDiscordClient api) { this.contextObjectProvider = new Discord4JContextObjectProvider(); diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java index 54ff156..17764f7 100644 --- a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java +++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java @@ -21,6 +21,7 @@ import discord4j.core.object.command.ApplicationCommandOption.Type; import net.tomatentum.marinara.Marinara; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.discord4j.Discord4JWrapper; + @TestInstance(Lifecycle.PER_CLASS) class SlashCommandTest { diff --git a/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java b/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java index 0bf1718..62a9cf1 100644 --- a/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java +++ b/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java @@ -7,12 +7,12 @@ import org.javacord.api.interaction.AutocompleteInteraction; import org.javacord.api.interaction.SlashCommandBuilder; import org.javacord.api.interaction.SlashCommandOptionChoice; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import net.tomatentum.marinara.wrapper.CommandConverter; import net.tomatentum.marinara.wrapper.CommandRegisterer; import net.tomatentum.marinara.wrapper.ContextObjectProvider; import net.tomatentum.marinara.wrapper.IdentifierProvider; -import net.tomatentum.marinara.util.LoggerUtil; import net.tomatentum.marinara.wrapper.LibraryWrapper; import net.tomatentum.marinara.wrapper.javacord.identifierconverter.AutocompleteIdentifierConverter; import net.tomatentum.marinara.wrapper.javacord.identifierconverter.ButtonIdentifierConverter; @@ -23,7 +23,7 @@ public class JavacordWrapper extends LibraryWrapper { private JavacordContextObjectProvider contextObjectProvider; private CommandRegisterer commandRegisterer; - private Logger logger = LoggerUtil.getLogger(getClass()); + private Logger logger = LoggerFactory.getLogger(getClass()); public JavacordWrapper(DiscordApi api) { this.contextObjectProvider = new JavacordContextObjectProvider();