Skip to content

Commit c0e3a44

Browse files
MoonTM-GITMoonTM-GIT
authored
Merge pull request #428 from danthe1st/small-cleanup
remove unused stuff, replace PostConstruct with listener
2 parents 8494700 + a85ac84 commit c0e3a44

9 files changed

Lines changed: 18 additions & 42 deletions

File tree

‎src/main/java/net/javadiscord/javabot/Bot.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import java.util.Map;
88
import java.util.TimeZone;
99

10-
import javax.annotation.PostConstruct;
11-
1210
import org.jetbrains.annotations.NotNull;
1311
import org.springframework.boot.SpringApplication;
1412
import org.springframework.boot.autoconfigure.SpringBootApplication;
13+
import org.springframework.boot.context.event.ApplicationReadyEvent;
1514
import org.springframework.context.ApplicationContext;
15+
import org.springframework.context.ApplicationListener;
1616
import org.springframework.context.annotation.ComponentScan;
1717
import org.springframework.context.annotation.FilterType;
1818
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -46,7 +46,7 @@
4646
)
4747
@EnableScheduling
4848
@RequiredArgsConstructor
49-
public class Bot {
49+
public class Bot implements ApplicationListener<ApplicationReadyEvent> {
5050

5151
private final DIH4JDA dih4jda;
5252
private final BotConfig config;
@@ -64,12 +64,12 @@ private void addEventListeners(final List<ListenerAdapter> listeners) {
6464
}
6565
dih4jda.getJDA().addEventListener(dih4jda);
6666
}
67-
67+
6868
/**
6969
* Initializes Sentry, interactions and listeners.
7070
*/
71-
@PostConstruct
72-
public void init() {
71+
@Override
72+
public void onApplicationEvent(ApplicationReadyEvent event) {
7373
Sentry.init(options -> {
7474
options.setDsn(config.getSystems().getSentryDsn());
7575
options.setTracesSampleRate(1.0);

‎src/main/java/net/javadiscord/javabot/SpringConfig.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@
3838
@RequiredArgsConstructor
3939
public class SpringConfig {
4040
@Bean
41-
public PresenceUpdater standardActivityPresenceUpdater() {
41+
PresenceUpdater standardActivityPresenceUpdater() {
4242
return PresenceUpdater.standardActivities();
4343
}
4444

4545
@Bean
46-
public DataSource getDataSource(BotConfig config) {
46+
DataSource getDataSource(BotConfig config) {
4747
return DbHelper.initDataSource(config);
4848
}
4949

5050
@Bean
51-
public ScheduledExecutorService asyncPool(BotConfig config) {
51+
ScheduledExecutorService asyncPool(BotConfig config) {
5252
return Executors.newScheduledThreadPool(config.getSystems().getAsyncPoolSize());
5353
}
5454

5555
@Bean
56-
public BotConfig config() {
56+
BotConfig config() {
5757
return new BotConfig(Path.of("config"));
5858
}
5959

6060
@Bean
61-
public SystemsConfig systemsConfig(BotConfig botConfig) {
61+
SystemsConfig systemsConfig(BotConfig botConfig) {
6262
return botConfig.getSystems();
6363
}
6464

@@ -70,7 +70,7 @@ public SystemsConfig systemsConfig(BotConfig botConfig) {
7070
* @throws LoginException if the token is invalid
7171
*/
7272
@Bean
73-
public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
73+
JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
7474
Collection<Object> listeners = ctx.getBeansWithAnnotation(PreRegisteredListener.class).values();
7575
return JDABuilder.createDefault(botConfig.getSystems().getJdaBotToken())
7676
.setStatus(OnlineStatus.DO_NOT_DISTURB)
@@ -89,7 +89,7 @@ public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginExceptio
8989
* @throws DIH4JDAException if an error occurs while initializing {@link DIH4JDA}
9090
*/
9191
@Bean
92-
public DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
92+
DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
9393
DIH4JDA.setDefaultRegistrationType(RegistrationType.GLOBAL);
9494
return DIH4JDABuilder.setJDA(jda)
9595
.setGlobalSmartQueue(false)
@@ -99,7 +99,7 @@ public DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
9999
}
100100

101101
@Bean
102-
public BotConfig botConfig() {
102+
BotConfig botConfig() {
103103
return new BotConfig(Path.of("config"));
104104
}
105105
}

‎src/main/java/net/javadiscord/javabot/api/TomcatConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public TomcatConfig(@Value("${tomcat.ajp.port}") int ajpPort, @Value("${tomcat.a
4040
* @return The {@link TomcatServletWebServerFactory}.
4141
*/
4242
@Bean
43-
public TomcatServletWebServerFactory servletContainer() {
43+
TomcatServletWebServerFactory servletContainer() {
4444
TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
4545
if (tomcatAjpEnabled) {
4646
Connector ajpConnector = new Connector("org.apache.coyote.ajp.AjpNioProtocol");

‎src/main/java/net/javadiscord/javabot/api/routes/metrics/MetricsController.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package net.javadiscord.javabot.api.routes.metrics;
22

33
import com.github.benmanes.caffeine.cache.Caffeine;
4-
import lombok.extern.slf4j.Slf4j;
54
import net.dv8tion.jda.api.JDA;
65
import net.dv8tion.jda.api.entities.Guild;
76
import net.javadiscord.javabot.api.exception.InvalidEntityIdException;
87
import net.javadiscord.javabot.api.routes.CaffeineCache;
98
import net.javadiscord.javabot.api.routes.metrics.model.MetricsData;
109
import net.javadiscord.javabot.data.config.BotConfig;
1110
import net.javadiscord.javabot.data.config.guild.MetricsConfig;
12-
import org.springframework.beans.factory.annotation.Autowired;
1311
import org.springframework.http.HttpStatus;
1412
import org.springframework.http.ResponseEntity;
1513
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@
2119
/**
2220
* Handles all GET-Requests on the guilds/{guild_id}/metrics/ route.
2321
*/
24-
@Slf4j
2522
@RestController
2623
public class MetricsController extends CaffeineCache<Long, MetricsData> {
2724
private final JDA jda;
@@ -33,7 +30,6 @@ public class MetricsController extends CaffeineCache<Long, MetricsData> {
3330
* @param jda The {@link Autowired} {@link JDA} instance to use.
3431
* @param botConfig The main configuration of the bot
3532
*/
36-
@Autowired
3733
public MetricsController(final JDA jda, BotConfig botConfig) {
3834
super(Caffeine.newBuilder()
3935
.expireAfterWrite(15, TimeUnit.MINUTES)

‎src/main/java/net/javadiscord/javabot/listener/HugListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package net.javadiscord.javabot.listener;
22

33
import lombok.RequiredArgsConstructor;
4-
import lombok.extern.slf4j.Slf4j;
4+
import net.dv8tion.jda.api.entities.Message;
5+
import net.dv8tion.jda.api.entities.Webhook;
56
import net.dv8tion.jda.api.entities.channel.ChannelType;
67
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
78
import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildChannel;
@@ -19,7 +20,6 @@
1920
/**
2021
* Replaces all occurrences of 'fuck' in incoming messages with 'hug'.
2122
*/
22-
@Slf4j
2323
@RequiredArgsConstructor
2424
public class HugListener extends ListenerAdapter {
2525
private static final Pattern FUCKER = Pattern.compile(

‎src/main/java/net/javadiscord/javabot/listener/StateListener.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1313
import net.javadiscord.javabot.annotations.PreRegisteredListener;
1414
import net.javadiscord.javabot.data.config.BotConfig;
15-
import net.javadiscord.javabot.data.h2db.DbActions;
16-
import net.javadiscord.javabot.systems.help.checks.ChannelSemanticCheck;
17-
import net.javadiscord.javabot.systems.help.HelpExperienceService;
1815
import net.javadiscord.javabot.systems.notification.NotificationService;
1916
import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
2017
import net.javadiscord.javabot.util.ExceptionLogger;
@@ -23,8 +20,6 @@
2320

2421
import java.sql.SQLException;
2522
import java.time.Instant;
26-
import java.util.List;
27-
import java.util.concurrent.ScheduledExecutorService;
2823
import java.util.stream.Collectors;
2924

3025
/**
@@ -36,11 +31,7 @@
3631
public class StateListener extends ListenerAdapter {
3732
private final NotificationService notificationService;
3833
private final CustomTagManager customTagManager;
39-
private final List<ChannelSemanticCheck> channelSemanticChecks;
4034
private final BotConfig botConfig;
41-
private final ScheduledExecutorService asyncPool;
42-
private final DbActions dbActions;
43-
private final HelpExperienceService helpExperienceService;
4435

4536
@Override
4637
public void onReady(@NotNull ReadyEvent event) {

‎src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnsListContext.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
55
import net.dv8tion.jda.api.interactions.commands.build.Commands;
66
import net.javadiscord.javabot.data.config.BotConfig;
7-
import net.javadiscord.javabot.data.h2db.DbHelper;
87
import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
98
import net.javadiscord.javabot.util.ExceptionLogger;
109
import net.javadiscord.javabot.util.Responses;
@@ -20,20 +19,17 @@
2019
*/
2120
public class WarnsListContext extends ContextCommand.User {
2221
private final BotConfig botConfig;
23-
private final DbHelper dbHelper;
2422
private final ExecutorService asyncPool;
2523
private final WarnRepository warnRepository;
2624

2725
/**
2826
* The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.CommandData}.
2927
* @param botConfig The main configuration of the bot
30-
* @param dbHelper An object managing databse operations
3128
* @param asyncPool The main thread pool for asynchronous operations
3229
* @param warnRepository DAO for interacting with the set of {@link net.javadiscord.javabot.systems.moderation.warn.model.Warn} objects.
3330
*/
34-
public WarnsListContext(BotConfig botConfig, DbHelper dbHelper, ExecutorService asyncPool, WarnRepository warnRepository) {
31+
public WarnsListContext(BotConfig botConfig, ExecutorService asyncPool, WarnRepository warnRepository) {
3532
this.botConfig = botConfig;
36-
this.dbHelper = dbHelper;
3733
this.asyncPool = asyncPool;
3834
this.warnRepository = warnRepository;
3935
setCommandData(Commands.user("Show Warns")

‎src/main/java/net/javadiscord/javabot/systems/starboard/StarboardManager.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
1818
import net.dv8tion.jda.api.utils.FileUpload;
1919
import net.javadiscord.javabot.data.config.guild.StarboardConfig;
20-
import net.javadiscord.javabot.data.h2db.DbHelper;
2120
import net.javadiscord.javabot.systems.starboard.dao.StarboardRepository;
2221
import net.javadiscord.javabot.systems.starboard.model.StarboardEntry;
2322
import net.javadiscord.javabot.util.ExceptionLogger;
@@ -30,8 +29,6 @@
3029
import java.util.concurrent.ExecutionException;
3130
import java.util.concurrent.ExecutorService;
3231

33-
import javax.sql.DataSource;
34-
3532
/**
3633
* Handles & manages all starboard interactions.
3734
*/
@@ -40,8 +37,6 @@
4037
public class StarboardManager extends ListenerAdapter {
4138
private final BotConfig botConfig;
4239
private final ExecutorService asyncPool;
43-
private final DataSource dataSource;
44-
private final DbHelper dbHelper;
4540
private final StarboardRepository starboardRepository;
4641

4742
@Override

‎src/main/java/net/javadiscord/javabot/util/InteractionUtils.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import net.javadiscord.javabot.annotations.AutoDetectableComponentHandler;
2828
import net.javadiscord.javabot.data.config.BotConfig;
2929
import net.javadiscord.javabot.data.config.GuildConfig;
30-
import net.javadiscord.javabot.data.h2db.DbHelper;
3130
import net.javadiscord.javabot.systems.moderation.ModerationService;
3231
import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
3332
import net.javadiscord.javabot.systems.moderation.warn.model.WarnSeverity;
@@ -71,7 +70,6 @@ public class InteractionUtils implements ButtonHandler, ModalHandler, StringSele
7170

7271
private final NotificationService notificationService;
7372
private final BotConfig botConfig;
74-
private final DbHelper dbHelper;
7573
private final WarnRepository warnRepository;
7674
private final ExecutorService asyncPool;
7775

0 commit comments

Comments
 (0)