Moved packages

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/listener/UserLeaveListener.java

@@ -7,6 +7,7 @@
 import net.javadiscord.javabot.data.config.BotConfig;
 
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Listens for the {@link GuildMemberRemoveEvent}.
@@ -16,7 +17,7 @@ public class UserLeaveListener extends ListenerAdapter {
 	private final BotConfig botConfig;
 
 	@Override
-	public void onGuildMemberRemove(GuildMemberRemoveEvent event) {
+	public void onGuildMemberRemove(@NotNull GuildMemberRemoveEvent event) {
 		if (event.getUser().isBot() || event.getUser().isSystem()) return;
 		if (!botConfig.get(event.getGuild()).getServerLockConfig().isLocked()) {
 			unreserveAllChannels(event.getUser(), event.getGuild());

…ystems/help/forum/ForumHelpListener.java …abot/systems/help/ForumHelpListener.javasrc/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpListener.java renamed to src/main/java/net/javadiscord/javabot/systems/help/ForumHelpListener.java src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpListener.java renamed to src/main/java/net/javadiscord/javabot/systems/help/ForumHelpListener.java

@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.help.forum;
+package net.javadiscord.javabot.systems.help;
 
 import lombok.RequiredArgsConstructor;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -21,7 +21,6 @@
 import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.data.config.guild.HelpForumConfig;
 import net.javadiscord.javabot.data.h2db.DbActions;
-import net.javadiscord.javabot.systems.help.HelpExperienceService;
 import net.javadiscord.javabot.systems.help.dao.HelpAccountRepository;
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
 import net.javadiscord.javabot.systems.user_preferences.UserPreferenceService;

…systems/help/forum/ForumHelpManager.java …vabot/systems/help/ForumHelpManager.javasrc/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpManager.java renamed to src/main/java/net/javadiscord/javabot/systems/help/ForumHelpManager.java src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpManager.java renamed to src/main/java/net/javadiscord/javabot/systems/help/ForumHelpManager.java

@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.help.forum;
+package net.javadiscord.javabot.systems.help;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +19,6 @@
 import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.data.config.guild.HelpForumConfig;
 import net.javadiscord.javabot.data.h2db.DbActions;
-import net.javadiscord.javabot.systems.help.HelpExperienceService;
 import net.javadiscord.javabot.systems.help.dao.HelpAccountRepository;
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
 import net.javadiscord.javabot.util.ExceptionLogger;

src/main/java/net/javadiscord/javabot/systems/help/HelpExperienceJob.java

@@ -32,8 +32,7 @@ public void execute() {
 			try {
 				helpAccountRepository.removeExperienceFromAllAccounts(
 						// just get the config for the first guild the bot is in, as it's not designed to work in multiple guilds anyway
-						botConfig.get(jda.getGuilds().get(0)).getHelpConfig().getDailyExperienceSubtraction(), 100,
-						100);
+						botConfig.get(jda.getGuilds().get(0)).getHelpConfig().getDailyExperienceSubtraction(), 100, 100);
 			} catch (DataAccessException e) {
 				ExceptionLogger.capture(e, DbHelper.class.getSimpleName());
 			}

src/main/java/net/javadiscord/javabot/systems/help/commands/UnreserveCommand.java

@@ -11,7 +11,7 @@
 import net.javadiscord.javabot.data.h2db.DbActions;
 import net.javadiscord.javabot.systems.help.dao.HelpAccountRepository;
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
-import net.javadiscord.javabot.systems.help.forum.ForumHelpManager;
+import net.javadiscord.javabot.systems.help.ForumHelpManager;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;

src/main/java/net/javadiscord/javabot/systems/help/dao/HelpAccountRepository.java

@@ -101,7 +101,7 @@ public int getTotalAccounts() throws DataAccessException {
 	 * @param change The amount to subtract.
 	 * @param min The minimum amount to subtract.
 	 * @param max The maximum amount to subtract.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public void removeExperienceFromAllAccounts(double change, int min, int max) throws DataAccessException {
 		long rows = jdbcTemplate.execute("UPDATE help_account SET experience = GREATEST(experience - LEAST(GREATEST(experience * (1 - ? / 100), ?), ?), 0)",new CallableStatementCallback<Long>() {