From 7249c99b6912e16da7d4d679068f4e423e3b9eae Mon Sep 17 00:00:00 2001 From: Tueem Date: Thu, 19 Dec 2024 20:38:04 +0100 Subject: [PATCH] add Logging to Parsers --- .../tomatentum/marinara/parser/ButtonParser.java | 7 +++++++ .../marinara/parser/InteractionCheckParser.java | 13 +++++++++++-- .../marinara/parser/SlashCommandParser.java | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/net/tomatentum/marinara/parser/ButtonParser.java b/lib/src/main/java/net/tomatentum/marinara/parser/ButtonParser.java index 1b7dcbb..1e5bdb4 100644 --- a/lib/src/main/java/net/tomatentum/marinara/parser/ButtonParser.java +++ b/lib/src/main/java/net/tomatentum/marinara/parser/ButtonParser.java @@ -3,13 +3,19 @@ package net.tomatentum.marinara.parser; import java.lang.reflect.Method; import java.util.function.Consumer; +import org.apache.logging.log4j.Logger; + import net.tomatentum.marinara.interaction.annotation.Button; +import net.tomatentum.marinara.util.LoggerUtil; +import net.tomatentum.marinara.util.ReflectionUtil; public class ButtonParser implements AnnotationParser { private Method method; private Consumer consumer; + private Logger logger = LoggerUtil.getLogger(getClass()); + public ButtonParser(Method method, Consumer consumer) { this.method = method; this.consumer = consumer; @@ -18,6 +24,7 @@ public class ButtonParser implements AnnotationParser { @Override public void parse() { Button button = getMethod().getAnnotation(Button.class); + logger.trace("Parsed Button annotation {} for method {}", button.toString(), ReflectionUtil.getFullMethodName(method)); this.consumer.accept(button.value()); } diff --git a/lib/src/main/java/net/tomatentum/marinara/parser/InteractionCheckParser.java b/lib/src/main/java/net/tomatentum/marinara/parser/InteractionCheckParser.java index abba9e9..a397168 100644 --- a/lib/src/main/java/net/tomatentum/marinara/parser/InteractionCheckParser.java +++ b/lib/src/main/java/net/tomatentum/marinara/parser/InteractionCheckParser.java @@ -6,9 +6,13 @@ import java.util.Arrays; import java.util.Optional; import java.util.function.Consumer; +import org.apache.logging.log4j.Logger; + import net.tomatentum.marinara.checks.AppliedCheck; import net.tomatentum.marinara.checks.InteractionCheck; import net.tomatentum.marinara.registry.InteractionCheckRegistry; +import net.tomatentum.marinara.util.LoggerUtil; +import net.tomatentum.marinara.util.ReflectionUtil; public class InteractionCheckParser implements AnnotationParser { @@ -16,6 +20,8 @@ public class InteractionCheckParser implements AnnotationParser { private Method method; private Consumer consumer; + private Logger logger = LoggerUtil.getLogger(getClass()); + public InteractionCheckParser(Method method, Consumer consumer, InteractionCheckRegistry checkRegistry) { this.checkRegistry = checkRegistry; this.method = method; @@ -30,8 +36,11 @@ public class InteractionCheckParser implements AnnotationParser { private void convertAnnotation(Annotation annotation) { Optional> check = this.checkRegistry.getCheckFromAnnotation(annotation.annotationType()); - if (check.isPresent()) - consumer.accept(new AppliedCheck(check.get(), annotation)); + if (check.isPresent()) { + AppliedCheck appliedCheck = new AppliedCheck(check.get(), annotation); + logger.trace("Parsed InteractionCheck {} for annotation {} for method {}", check.getClass().getName(), annotation.toString(), ReflectionUtil.getFullMethodName(method)); + consumer.accept(appliedCheck); + } } @Override diff --git a/lib/src/main/java/net/tomatentum/marinara/parser/SlashCommandParser.java b/lib/src/main/java/net/tomatentum/marinara/parser/SlashCommandParser.java index 8997d9f..cf2a244 100644 --- a/lib/src/main/java/net/tomatentum/marinara/parser/SlashCommandParser.java +++ b/lib/src/main/java/net/tomatentum/marinara/parser/SlashCommandParser.java @@ -3,10 +3,13 @@ package net.tomatentum.marinara.parser; import java.lang.reflect.Method; import java.util.function.Consumer; +import org.apache.logging.log4j.Logger; + import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition; import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand; import net.tomatentum.marinara.interaction.commands.annotation.SubCommand; import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup; +import net.tomatentum.marinara.util.LoggerUtil; import net.tomatentum.marinara.util.ReflectionUtil; public class SlashCommandParser implements AnnotationParser { @@ -14,6 +17,8 @@ public class SlashCommandParser implements AnnotationParser { private Method method; private Consumer consumer; + private Logger logger = LoggerUtil.getLogger(getClass()); + public SlashCommandParser(Method method, Consumer consumer) { this.method = method; this.consumer = consumer; @@ -37,6 +42,9 @@ public class SlashCommandParser implements AnnotationParser { builder.setSubCommand(subCmd); } + ExecutableSlashCommandDefinition def = builder.build(); + + logger.trace("Parsed using SlashCommandParser for method {} with the result:\n{}", ReflectionUtil.getFullMethodName(method), def.toString()); consumer.accept(builder.build()); }