From 4c40d33050b896e4aba5b3c2470ffefac56df6dc Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Fri, 23 Oct 2020 11:56:48 -0500 Subject: [PATCH] Rework --- pom.xml | 18 +++++++++--------- .../AbstractDiscordEventListener.java | 7 +++++++ .../DiscordEventListener.java} | 11 ++++------- .../DiscordGuildJoinEventListener.java | 5 +---- .../eighttrack/services/EightTrackService.java | 17 ++++++++--------- src/main/resources/eighttrack.properties | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 src/main/java/net/locusworks/discord/eighttrack/listeners/AbstractDiscordEventListener.java rename src/main/java/net/locusworks/discord/eighttrack/{handlers/DiscordEventHandler.java => listeners/DiscordEventListener.java} (92%) diff --git a/pom.xml b/pom.xml index 3d1d899..07b93ca 100644 --- a/pom.xml +++ b/pom.xml @@ -18,13 +18,13 @@ - 6.4.3 - 8.0.20 - 5.4.17.Final - 5.2.6.RELEASE - 2.3.0.RELEASE - 2.3.0.RELEASE - 2.11.0 + 7.0.4 + 8.0.22 + 5.4.22.Final + 5.2.9.RELEASE + 2.3.4.RELEASE + 2.3.4.RELEASE + 2.11.3 2.13.3 1.7.30 3.0.0-M3 @@ -154,7 +154,7 @@ net.dv8tion JDA - 4.1.1_155 + 4.2.0_209 com.fasterxml.jackson.core @@ -174,7 +174,7 @@ com.sedmelluq lavaplayer - 1.3.49 + 1.3.50 diff --git a/src/main/java/net/locusworks/discord/eighttrack/listeners/AbstractDiscordEventListener.java b/src/main/java/net/locusworks/discord/eighttrack/listeners/AbstractDiscordEventListener.java new file mode 100644 index 0000000..e26f9d3 --- /dev/null +++ b/src/main/java/net/locusworks/discord/eighttrack/listeners/AbstractDiscordEventListener.java @@ -0,0 +1,7 @@ +package net.locusworks.discord.eighttrack.listeners; + +import net.dv8tion.jda.api.hooks.ListenerAdapter; + +public abstract class AbstractDiscordEventListener extends ListenerAdapter { + +} diff --git a/src/main/java/net/locusworks/discord/eighttrack/handlers/DiscordEventHandler.java b/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordEventListener.java similarity index 92% rename from src/main/java/net/locusworks/discord/eighttrack/handlers/DiscordEventHandler.java rename to src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordEventListener.java index f0c9034..ceec287 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/handlers/DiscordEventHandler.java +++ b/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordEventListener.java @@ -25,7 +25,7 @@ * IS". LOCUSWORKS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, * ENHANCEMENTS, OR MODIFICATIONS. */ -package net.locusworks.discord.eighttrack.handlers; +package net.locusworks.discord.eighttrack.listeners; import java.awt.Color; import java.io.IOException; @@ -34,7 +34,6 @@ import java.nio.file.Path; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -46,23 +45,21 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.events.ExceptionEvent; -import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.locusworks.discord.eighttrack.database.entities.DiscordGuild; import net.locusworks.discord.eighttrack.events.main.AbstractMainEventHandler; +import net.locusworks.discord.eighttrack.handlers.ReactionHandler; import net.locusworks.discord.eighttrack.services.ConfigurationService; import net.locusworks.discord.eighttrack.services.RepositoryService; import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLoggerFactory; @Service -public class DiscordEventHandler extends ListenerAdapter { +public class DiscordEventListener extends AbstractDiscordEventListener { private Path musicDir; - private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordEventHandler.class); + private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordEventListener.class); @Autowired private RepositoryService guildSongRepoService; diff --git a/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordGuildJoinEventListener.java b/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordGuildJoinEventListener.java index ff019cf..9dba76b 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordGuildJoinEventListener.java +++ b/src/main/java/net/locusworks/discord/eighttrack/listeners/DiscordGuildJoinEventListener.java @@ -4,16 +4,13 @@ import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.locusworks.discord.eighttrack.annotations.DiscordEventListener; import net.locusworks.discord.eighttrack.database.entities.DiscordGuild; import net.locusworks.discord.eighttrack.services.RepositoryService; import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLoggerFactory; @Service -@DiscordEventListener -public class DiscordGuildJoinEventListener extends ListenerAdapter { +public class DiscordGuildJoinEventListener extends AbstractDiscordEventListener { private ApplicationLogger logger = ApplicationLoggerFactory.getLogger(DiscordGuildJoinEventListener.class); diff --git a/src/main/java/net/locusworks/discord/eighttrack/services/EightTrackService.java b/src/main/java/net/locusworks/discord/eighttrack/services/EightTrackService.java index efd1a0a..44e30fc 100644 --- a/src/main/java/net/locusworks/discord/eighttrack/services/EightTrackService.java +++ b/src/main/java/net/locusworks/discord/eighttrack/services/EightTrackService.java @@ -31,15 +31,12 @@ import java.util.List; import javax.security.auth.login.LoginException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.core.type.filter.TypeFilter; import org.springframework.stereotype.Service; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.locusworks.discord.eighttrack.annotations.DiscordEventListener; -import net.locusworks.discord.eighttrack.utils.BeanFinder; +import net.locusworks.discord.eighttrack.listeners.AbstractDiscordEventListener; import net.locusworks.logger.ApplicationLogger; import net.locusworks.logger.ApplicationLoggerFactory; @@ -52,14 +49,16 @@ public class EightTrackService { @Autowired private ConfigurationService confService; + + private List eventListeners; + + @Autowired + private void setup(List eventListeners) { + this.eventListeners = eventListeners; + } public void begin() throws LoginException { try { - - final TypeFilter serviceFilter = new AnnotationTypeFilter(Service.class); - final TypeFilter eventListenerFilter = new AnnotationTypeFilter(DiscordEventListener.class); - - List eventListeners = BeanFinder.autowireBeans(ListenerAdapter.class, "net.locusworks.discord.eighttrack", serviceFilter, eventListenerFilter); if (eventListeners == null ||eventListeners.size() < 1) { throw new LoginException("No event listeners found. Exiting"); } diff --git a/src/main/resources/eighttrack.properties b/src/main/resources/eighttrack.properties index bf6d46c..6a272c9 100644 --- a/src/main/resources/eighttrack.properties +++ b/src/main/resources/eighttrack.properties @@ -5,6 +5,6 @@ dbUserPassword=RaamWDMgA2p09R3kAiKHqauu6mmKU2HLQ4nAfEGMNOs= dbHost=localhost dbPort=3306 logLevel=INFO -musicDir=E:/Music +musicDir=D:/Music discordToken=NjMzMDA2ODIzNzk1OTgyMzQ0.XtLtpA.sramb2b8w4itTFPQ92HqZgyeBJU