Merge pull request #428 from danthe1st/small-cleanup

MoonTM-GIT · web-flow · commit c0e3a44e4c6a · 2023-08-16T13:55:19.000+02:00
remove unused stuff, replace PostConstruct with listener
diff --git a/src/main/java/net/javadiscord/javabot/Bot.java b/src/main/java/net/javadiscord/javabot/Bot.java
@@ -7,12 +7,12 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
-
 import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -46,7 +46,7 @@
 )
 @EnableScheduling
 @RequiredArgsConstructor
-public class Bot {
+public class Bot implements ApplicationListener<ApplicationReadyEvent> {
 
 	private final DIH4JDA dih4jda;
 	private final BotConfig config;
@@ -64,12 +64,12 @@ private void addEventListeners(final List<ListenerAdapter> listeners) {
 		}
 		dih4jda.getJDA().addEventListener(dih4jda);
 	}
-
+	
 	/**
 	 * Initializes Sentry, interactions and listeners.
 	 */
-	@PostConstruct
-	public void init() {
+	@Override
+	public void onApplicationEvent(ApplicationReadyEvent event) {
 		Sentry.init(options -> {
 			options.setDsn(config.getSystems().getSentryDsn());
 			options.setTracesSampleRate(1.0);
diff --git a/src/main/java/net/javadiscord/javabot/SpringConfig.java b/src/main/java/net/javadiscord/javabot/SpringConfig.java
@@ -38,27 +38,27 @@
 @RequiredArgsConstructor
 public class SpringConfig {
 	@Bean
-	public PresenceUpdater standardActivityPresenceUpdater() {
+	PresenceUpdater standardActivityPresenceUpdater() {
 		return PresenceUpdater.standardActivities();
 	}
 
 	@Bean
-	public DataSource getDataSource(BotConfig config) {
+	DataSource getDataSource(BotConfig config) {
 		return DbHelper.initDataSource(config);
 	}
 
 	@Bean
-	public ScheduledExecutorService asyncPool(BotConfig config) {
+	ScheduledExecutorService asyncPool(BotConfig config) {
 		return Executors.newScheduledThreadPool(config.getSystems().getAsyncPoolSize());
 	}
 
 	@Bean
-	public BotConfig config() {
+	BotConfig config() {
 		return new BotConfig(Path.of("config"));
 	}
 
 	@Bean
-	public SystemsConfig systemsConfig(BotConfig botConfig) {
+	SystemsConfig systemsConfig(BotConfig botConfig) {
 		return botConfig.getSystems();
 	}
 
@@ -70,7 +70,7 @@ public SystemsConfig systemsConfig(BotConfig botConfig) {
 	 * @throws LoginException if the token is invalid
 	 */
 	@Bean
-	public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
+	JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
 		Collection<Object> listeners = ctx.getBeansWithAnnotation(PreRegisteredListener.class).values();
 		return JDABuilder.createDefault(botConfig.getSystems().getJdaBotToken())
 			.setStatus(OnlineStatus.DO_NOT_DISTURB)
@@ -89,7 +89,7 @@ public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginExceptio
 	 * @throws DIH4JDAException if an error occurs while initializing {@link DIH4JDA}
 	 */
 	@Bean
-	public DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
+	DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
 		DIH4JDA.setDefaultRegistrationType(RegistrationType.GLOBAL);
 		return DIH4JDABuilder.setJDA(jda)
 			.setGlobalSmartQueue(false)
@@ -99,7 +99,7 @@ public DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
 	}
 
 	@Bean
-	public BotConfig botConfig() {
+	BotConfig botConfig() {
 		return new BotConfig(Path.of("config"));
 	}
 }
diff --git a/src/main/java/net/javadiscord/javabot/api/TomcatConfig.java b/src/main/java/net/javadiscord/javabot/api/TomcatConfig.java
@@ -40,7 +40,7 @@ public TomcatConfig(@Value("${tomcat.ajp.port}") int ajpPort, @Value("${tomcat.a
 	 * @return The {@link TomcatServletWebServerFactory}.
 	 */
 	@Bean
-	public TomcatServletWebServerFactory servletContainer() {
+	TomcatServletWebServerFactory servletContainer() {
 		TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
 		if (tomcatAjpEnabled) {
 			Connector ajpConnector = new Connector("org.apache.coyote.ajp.AjpNioProtocol");
diff --git a/src/main/java/net/javadiscord/javabot/api/routes/metrics/MetricsController.java b/src/main/java/net/javadiscord/javabot/api/routes/metrics/MetricsController.java
@@ -1,15 +1,13 @@
 package net.javadiscord.javabot.api.routes.metrics;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
-import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.javadiscord.javabot.api.exception.InvalidEntityIdException;
 import net.javadiscord.javabot.api.routes.CaffeineCache;
 import net.javadiscord.javabot.api.routes.metrics.model.MetricsData;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.config.guild.MetricsConfig;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@
 /**
  * Handles all GET-Requests on the guilds/{guild_id}/metrics/ route.
  */
-@Slf4j
 @RestController
 public class MetricsController extends CaffeineCache<Long, MetricsData> {
 	private final JDA jda;
@@ -33,7 +30,6 @@ public class MetricsController extends CaffeineCache<Long, MetricsData> {
 	 * @param jda The {@link Autowired} {@link JDA} instance to use.
 	 * @param botConfig The main configuration of the bot
 	 */
-	@Autowired
 	public MetricsController(final JDA jda, BotConfig botConfig) {
 		super(Caffeine.newBuilder()
 				.expireAfterWrite(15, TimeUnit.MINUTES)
diff --git a/src/main/java/net/javadiscord/javabot/listener/HugListener.java b/src/main/java/net/javadiscord/javabot/listener/HugListener.java
@@ -1,7 +1,8 @@
 package net.javadiscord.javabot.listener;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Webhook;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildChannel;
@@ -19,7 +20,6 @@
 /**
  * Replaces all occurrences of 'fuck' in incoming messages with 'hug'.
  */
-@Slf4j
 @RequiredArgsConstructor
 public class HugListener extends ListenerAdapter {
 	private static final Pattern FUCKER = Pattern.compile(
diff --git a/src/main/java/net/javadiscord/javabot/listener/StateListener.java b/src/main/java/net/javadiscord/javabot/listener/StateListener.java
@@ -12,9 +12,6 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.javadiscord.javabot.annotations.PreRegisteredListener;
 import net.javadiscord.javabot.data.config.BotConfig;
-import net.javadiscord.javabot.data.h2db.DbActions;
-import net.javadiscord.javabot.systems.help.checks.ChannelSemanticCheck;
-import net.javadiscord.javabot.systems.help.HelpExperienceService;
 import net.javadiscord.javabot.systems.notification.NotificationService;
 import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
 import net.javadiscord.javabot.util.ExceptionLogger;
@@ -23,8 +20,6 @@
 
 import java.sql.SQLException;
 import java.time.Instant;
-import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.stream.Collectors;
 
 /**
@@ -36,11 +31,7 @@
 public class StateListener extends ListenerAdapter {
 	private final NotificationService notificationService;
 	private final CustomTagManager customTagManager;
-	private final List<ChannelSemanticCheck> channelSemanticChecks;
 	private final BotConfig botConfig;
-	private final ScheduledExecutorService asyncPool;
-	private final DbActions dbActions;
-	private final HelpExperienceService helpExperienceService;
 
 	@Override
 	public void onReady(@NotNull ReadyEvent event) {
diff --git a/src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnsListContext.java b/src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnsListContext.java
@@ -4,7 +4,6 @@
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.javadiscord.javabot.data.config.BotConfig;
-import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
@@ -20,20 +19,17 @@
  */
 public class WarnsListContext extends ContextCommand.User {
 	private final BotConfig botConfig;
-	private final DbHelper dbHelper;
 	private final ExecutorService asyncPool;
 	private final WarnRepository warnRepository;
 
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.CommandData}.
 	 * @param botConfig The main configuration of the bot
-	 * @param dbHelper An object managing databse operations
 	 * @param asyncPool The main thread pool for asynchronous operations
 	 * @param warnRepository DAO for interacting with the set of {@link net.javadiscord.javabot.systems.moderation.warn.model.Warn} objects.
 	 */
-	public WarnsListContext(BotConfig botConfig, DbHelper dbHelper, ExecutorService asyncPool, WarnRepository warnRepository) {
+	public WarnsListContext(BotConfig botConfig, ExecutorService asyncPool, WarnRepository warnRepository) {
 		this.botConfig = botConfig;
-		this.dbHelper = dbHelper;
 		this.asyncPool = asyncPool;
 		this.warnRepository = warnRepository;
 		setCommandData(Commands.user("Show Warns")
diff --git a/src/main/java/net/javadiscord/javabot/systems/starboard/StarboardManager.java b/src/main/java/net/javadiscord/javabot/systems/starboard/StarboardManager.java
@@ -17,7 +17,6 @@
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.api.utils.FileUpload;
 import net.javadiscord.javabot.data.config.guild.StarboardConfig;
-import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.systems.starboard.dao.StarboardRepository;
 import net.javadiscord.javabot.systems.starboard.model.StarboardEntry;
 import net.javadiscord.javabot.util.ExceptionLogger;
@@ -30,8 +29,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 
-import javax.sql.DataSource;
-
 /**
  * Handles & manages all starboard interactions.
  */
@@ -40,8 +37,6 @@
 public class StarboardManager extends ListenerAdapter {
 	private final BotConfig botConfig;
 	private final ExecutorService asyncPool;
-	private final DataSource dataSource;
-	private final DbHelper dbHelper;
 	private final StarboardRepository starboardRepository;
 
 	@Override
diff --git a/src/main/java/net/javadiscord/javabot/util/InteractionUtils.java b/src/main/java/net/javadiscord/javabot/util/InteractionUtils.java
@@ -27,7 +27,6 @@
 import net.javadiscord.javabot.annotations.AutoDetectableComponentHandler;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.config.GuildConfig;
-import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.systems.moderation.ModerationService;
 import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
 import net.javadiscord.javabot.systems.moderation.warn.model.WarnSeverity;
@@ -71,7 +70,6 @@ public class InteractionUtils implements ButtonHandler, ModalHandler, StringSele
 
 	private final NotificationService notificationService;
 	private final BotConfig botConfig;
-	private final DbHelper dbHelper;
 	private final WarnRepository warnRepository;
 	private final ExecutorService asyncPool;
 
