diff --git a/src/main/java/me/bobert/netneutrality/command/CommandManager.java b/src/main/java/me/bobert/netneutrality/command/CommandManager.java index 99d7e23..c2b7e51 100644 --- a/src/main/java/me/bobert/netneutrality/command/CommandManager.java +++ b/src/main/java/me/bobert/netneutrality/command/CommandManager.java @@ -66,7 +66,7 @@ public class CommandManager { } } - logger.info("Loaded " + commands.size() + " commands!"); + logger.info("Loaded {} commands!", commands.size()); } private static void registerSlashCommands() { diff --git a/src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java b/src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java index d494b32..6e30312 100644 --- a/src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java +++ b/src/main/java/me/bobert/netneutrality/core/GuildConfigManager.java @@ -58,7 +58,7 @@ public class GuildConfigManager { session.beginTransaction(); if (value == null || setting.getDefaultValue().equals(value)) { if (oGuildSetting != null) { - session.delete(oGuildSetting); + session.remove(oGuildSetting); } } else { if (oGuildSetting == null) { @@ -67,11 +67,11 @@ public class GuildConfigManager { oGuildSetting.setName(setting.getName()); oGuildSetting.setValue(value); - session.save(oGuildSetting); + session.persist(oGuildSetting); } else { oGuildSetting.setValue(value); - session.update(oGuildSetting); + session.merge(oGuildSetting); } } @@ -82,7 +82,7 @@ public class GuildConfigManager { } public void reloadSettingsCache() { - logger.debug("Reloading settings cache for guild: " + guild.getId()); + logger.debug("Reloading settings cache for guild: {}", guild.getId()); settingsCache.clear(); JpaUtils.getWithSession(guildEntity, session -> { diff --git a/src/main/java/me/bobert/netneutrality/core/GuildManager.java b/src/main/java/me/bobert/netneutrality/core/GuildManager.java index 26aa6bf..8ed2587 100644 --- a/src/main/java/me/bobert/netneutrality/core/GuildManager.java +++ b/src/main/java/me/bobert/netneutrality/core/GuildManager.java @@ -12,7 +12,6 @@ import me.bobert.netneutrality.db.entities.OBlacklist; import me.bobert.netneutrality.db.entities.OGuild; import me.bobert.netneutrality.thread.ThreadManager; import me.bobert.netneutrality.utils.JpaUtils; -import me.bobert.netneutrality.utils.MessageFunction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; @@ -113,7 +112,7 @@ public class GuildManager { } public void reloadBlacklistCache() { - logger.debug("Reloading blacklist cache for guild: " + guild.getId()); + logger.debug("Reloading blacklist cache for guild: {}", guild.getId()); blacklistCache.clear(); JpaUtils.getWithSession(guildEntity, session -> { @@ -127,16 +126,6 @@ public class GuildManager { }); } - public void checkAndLogMessage(Message message, Member member, MessageChannel channel) { - if (isLoggingEnabled()) { - ThreadManager.getExecutor().submit(() -> DBController.get(DBMessage.class).log(this, channel, member, message)); - } - } - - public void checkBlacklist(Message message, MessageChannel channel) { - MessageFunction.testMessageAgainstBlacklist(message, channel, blacklistCache); - } - private OGuild loadGuildFromDb(String guildId) { Session session = sessionFactory.openSession(); OGuild entity = session.get(OGuild.class, guildId); @@ -148,7 +137,7 @@ public class GuildManager { entity.setGuildId(guildId); - session.save(entity); + session.persist(entity); session.getTransaction().commit(); guild.getTextChannels() @@ -169,7 +158,7 @@ public class GuildManager { Session session = sessionFactory.openSession(); session.beginTransaction(); - session.delete(guildEntity); + session.remove(guildEntity); session.getTransaction().commit(); session.close(); diff --git a/src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java b/src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java index 8f213fc..19dea2a 100644 --- a/src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java +++ b/src/main/java/me/bobert/netneutrality/db/controllers/DBBlacklist.java @@ -35,7 +35,7 @@ public class DBBlacklist extends AbstractController { bl.setWord(word); bl.setEnabled(true); - session.save(bl); + session.persist(bl); session.getTransaction().commit(); session.close(); @@ -57,7 +57,7 @@ public class DBBlacklist extends AbstractController { Session session = getSessionFactory().openSession(); session.beginTransaction(); - session.delete(bl); + session.remove(bl); session.getTransaction().commit(); session.close(); @@ -79,7 +79,7 @@ public class DBBlacklist extends AbstractController { bl.setEnabled(true); - session.update(bl); + session.merge(bl); session.getTransaction().commit(); session.close(); @@ -103,7 +103,7 @@ public class DBBlacklist extends AbstractController { bl.setEnabled(false); - session.update(bl); + session.merge(bl); session.getTransaction().commit(); session.close(); diff --git a/src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java b/src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java index 50d8c21..81b1b38 100644 --- a/src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java +++ b/src/main/java/me/bobert/netneutrality/db/controllers/DBMessage.java @@ -34,7 +34,7 @@ public class DBMessage extends AbstractController { logMessage.setUserId(author.getId()); logMessage.setDateSent(message.getTimeCreated().toInstant()); - session.save(logMessage); + session.persist(logMessage); session.getTransaction().commit(); session.close(); } @@ -49,7 +49,7 @@ public class DBMessage extends AbstractController { session.beginTransaction(); message.setEditedMessage(newMessage); - session.update(message); + session.merge(message); session.getTransaction().commit(); } diff --git a/src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java b/src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java index c143659..7defada 100644 --- a/src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java +++ b/src/main/java/me/bobert/netneutrality/hooks/message/MessageReceivedHandler.java @@ -28,8 +28,6 @@ public class MessageReceivedHandler extends ListenerAdapter { MessageCommandContext context = MessageCommandContext.createContext(event); - GuildManager.getManager(context.getGuild()).checkAndLogMessage(message, context.getGuildUser(), context.getChannel()); - String rawMessage = message.getContentDisplay().trim(); String prefix = Settings.getInstance().get("NETNEUTRALITY_BOT_PREFIX", "$"); diff --git a/src/main/java/me/bobert/netneutrality/http/WebModule.java b/src/main/java/me/bobert/netneutrality/http/WebModule.java index 2eb19d4..03a2750 100644 --- a/src/main/java/me/bobert/netneutrality/http/WebModule.java +++ b/src/main/java/me/bobert/netneutrality/http/WebModule.java @@ -53,7 +53,7 @@ public class WebModule { return this; } - public WebModule request(Map headers) throws IOException { + public WebModule request(Map headers) { Sentry.addBreadcrumb(Breadcrumb.http(url, "get")); Request.Builder builder = new Request.Builder().url(this.url) .addHeader("User-Agent", userAgent); diff --git a/src/main/java/me/bobert/netneutrality/http/server/WebApi.java b/src/main/java/me/bobert/netneutrality/http/server/WebApi.java index 7828fce..216c7c1 100644 --- a/src/main/java/me/bobert/netneutrality/http/server/WebApi.java +++ b/src/main/java/me/bobert/netneutrality/http/server/WebApi.java @@ -38,7 +38,7 @@ public class WebApi { ExecutorService executor = Executors.newFixedThreadPool(10, new BaseThreadFactory("web-api")); server.setExecutor(executor); server.start(); - logger.info("Web server started at [" + server.getAddress() + "]"); + logger.info("Web server started at [{}]", server.getAddress()); } diff --git a/src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java b/src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java index 9bf26e7..eaeaa79 100644 --- a/src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java +++ b/src/main/java/me/bobert/netneutrality/music/source/UdioAudioSourceManager.java @@ -75,12 +75,12 @@ public class UdioAudioSourceManager implements AudioSourceManager { } @Override - public void encodeTrack(AudioTrack track, DataOutput output) throws IOException { + public void encodeTrack(AudioTrack track, DataOutput output) { } @Override - public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException { + public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) { return new UdioAudioTrack(trackInfo, this); } diff --git a/src/main/java/me/bobert/netneutrality/utils/JpaUtils.java b/src/main/java/me/bobert/netneutrality/utils/JpaUtils.java index 3339ae6..2996950 100644 --- a/src/main/java/me/bobert/netneutrality/utils/JpaUtils.java +++ b/src/main/java/me/bobert/netneutrality/utils/JpaUtils.java @@ -23,10 +23,10 @@ public class JpaUtils { /** * Tries to read the persistent state into the object. - * + *

* If the object is not found in the database and is of type {@link OGuild}, tries to recreate entity and throws * an exception to block execution. - * + *

* The session is not closed * * @param session The session in which to load the persistent object @@ -62,7 +62,7 @@ public class JpaUtils { runnable.run(); - session.update(persistantEntity); + session.merge(persistantEntity); session.getTransaction().commit(); session.close(); } @@ -74,7 +74,6 @@ public class JpaUtils { /** * @param persistantEntity The entity to load * @param id The identifier for the entity - * @param close If the session should be closed after consumer is executed * @param consumer The comsumer, which exposes the session */ public static void getWithSession(Object persistantEntity, Serializable id, Consumer consumer) {