From 4c79bd5e719b84b1b116e09c2f5193960d9f6eff Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 17 Feb 2018 21:46:07 -0500 Subject: [PATCH] Cleanup of code --- .../netneutrality/db/AbstractController.java | 2 +- .../java/netneutrality/db/DBController.java | 2 +- .../java/netneutrality/db/MysqlConnector.java | 10 +++++----- .../java/netneutrality/db/MysqlDatabase.java | 4 +--- .../db/controllers/DBBlacklist.java | 4 +--- .../netneutrality/db/controllers/DBMessage.java | 2 +- .../db/controllers/DBSettings.java | 4 +--- .../netneutrality/handler/ConsoleHandler.java | 16 +++++++--------- .../handler/NewCommandListener.java | 17 ++++++----------- src/main/java/netneutrality/http/WebModule.java | 6 ++---- .../java/netneutrality/http/server/WebApi.java | 8 -------- .../netneutrality/utils/ChannelFunction.java | 1 - 12 files changed, 26 insertions(+), 50 deletions(-) diff --git a/src/main/java/netneutrality/db/AbstractController.java b/src/main/java/netneutrality/db/AbstractController.java index 7c74dcd..f404346 100644 --- a/src/main/java/netneutrality/db/AbstractController.java +++ b/src/main/java/netneutrality/db/AbstractController.java @@ -25,7 +25,7 @@ public abstract class AbstractController { return this; } - public AbstractController end() { + protected AbstractController end() { System.out.println("Ended task! ["+ getControllerName() + "}"); DBController.isDoingSomething = false; isDoingSomething = false; diff --git a/src/main/java/netneutrality/db/DBController.java b/src/main/java/netneutrality/db/DBController.java index 498cc96..36aa88a 100644 --- a/src/main/java/netneutrality/db/DBController.java +++ b/src/main/java/netneutrality/db/DBController.java @@ -92,7 +92,7 @@ public class DBController { /** * Loads all the controllers which extends {@link AbstractController} */ - public static void loadControllers() { + private static void loadControllers() { System.out.println("Loading databases controllers.."); Reflections reflections = new Reflections("netneutrality.db.controllers"); diff --git a/src/main/java/netneutrality/db/MysqlConnector.java b/src/main/java/netneutrality/db/MysqlConnector.java index e6424f6..37fadac 100644 --- a/src/main/java/netneutrality/db/MysqlConnector.java +++ b/src/main/java/netneutrality/db/MysqlConnector.java @@ -7,13 +7,13 @@ import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource; public class MysqlConnector { - protected String dbName; - protected String dbUser; - protected String dbHost; - protected String dbPass; + private String dbName; + private String dbUser; + private String dbHost; + private String dbPass; private Connection c; - public MysqlConnector(String dbName, String dbUser, String dbHost, String dbPass) { + MysqlConnector(String dbName, String dbUser, String dbHost, String dbPass) { this.dbName = dbName; this.dbUser = dbUser; this.dbHost = dbHost; diff --git a/src/main/java/netneutrality/db/MysqlDatabase.java b/src/main/java/netneutrality/db/MysqlDatabase.java index 959b18e..b9762d4 100644 --- a/src/main/java/netneutrality/db/MysqlDatabase.java +++ b/src/main/java/netneutrality/db/MysqlDatabase.java @@ -158,8 +158,6 @@ public class MysqlDatabase { /** * Recreate the MySQL connection. - * - * @throws SQLException */ public void reconnect() { @@ -216,7 +214,7 @@ public class MysqlDatabase { try { if (array[1][0] == null) nbRow = 0; - } catch (ArrayIndexOutOfBoundsException e) { + } catch (ArrayIndexOutOfBoundsException ignored) { } diff --git a/src/main/java/netneutrality/db/controllers/DBBlacklist.java b/src/main/java/netneutrality/db/controllers/DBBlacklist.java index d31f61f..bb335d5 100644 --- a/src/main/java/netneutrality/db/controllers/DBBlacklist.java +++ b/src/main/java/netneutrality/db/controllers/DBBlacklist.java @@ -134,9 +134,7 @@ public class DBBlacklist extends AbstractController { } catch (SQLException e) { end(); e.printStackTrace(); - } catch (NullPointerException e) { - end(); - } catch (IndexOutOfBoundsException i) { + } catch (NullPointerException | IndexOutOfBoundsException e) { end(); } diff --git a/src/main/java/netneutrality/db/controllers/DBMessage.java b/src/main/java/netneutrality/db/controllers/DBMessage.java index 113594f..0bd6a40 100644 --- a/src/main/java/netneutrality/db/controllers/DBMessage.java +++ b/src/main/java/netneutrality/db/controllers/DBMessage.java @@ -68,7 +68,7 @@ public class DBMessage extends AbstractController { } public ArrayList getMessagesFromUser(String username, String serverName, int max) { - ArrayList messages = new ArrayList(); + ArrayList messages = new ArrayList<>(); try { ResultSet rs = database.prepareAndExecute("SELECT * FROM log_message WHERE userName = ? AND serverName = ? ORDER BY dateSent DESC", username, serverName); diff --git a/src/main/java/netneutrality/db/controllers/DBSettings.java b/src/main/java/netneutrality/db/controllers/DBSettings.java index 8022aa2..1d4e56c 100644 --- a/src/main/java/netneutrality/db/controllers/DBSettings.java +++ b/src/main/java/netneutrality/db/controllers/DBSettings.java @@ -2,8 +2,6 @@ package netneutrality.db.controllers; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; import netneutrality.db.AbstractController; @@ -14,7 +12,7 @@ public class DBSettings extends AbstractController { } public String getLoggingChannel(String serverId) { - if (serverId.isEmpty() || serverId == null) { + if (serverId.isEmpty()) { end(); return null; } diff --git a/src/main/java/netneutrality/handler/ConsoleHandler.java b/src/main/java/netneutrality/handler/ConsoleHandler.java index b43b33d..24c3290 100644 --- a/src/main/java/netneutrality/handler/ConsoleHandler.java +++ b/src/main/java/netneutrality/handler/ConsoleHandler.java @@ -6,22 +6,20 @@ import java.io.InputStreamReader; public class ConsoleHandler { - - private BufferedReader br; - private String input = ""; - + public ConsoleHandler() { System.out.println("Console input ready!"); } public String init() throws IOException { - this.br = new BufferedReader(new InputStreamReader(System.in)); - + BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); + + String input; do { System.out.print(">"); - this.input = this.br.readLine(); - } while (!this.input.equalsIgnoreCase("quit")); + input = br.readLine(); + } while (!input.equalsIgnoreCase("quit")); - return this.input; + return input; } } diff --git a/src/main/java/netneutrality/handler/NewCommandListener.java b/src/main/java/netneutrality/handler/NewCommandListener.java index 844b845..c9df3dd 100644 --- a/src/main/java/netneutrality/handler/NewCommandListener.java +++ b/src/main/java/netneutrality/handler/NewCommandListener.java @@ -5,13 +5,11 @@ import java.lang.reflect.Modifier; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; -import java.util.Map; import java.util.Set; import net.dv8tion.jda.core.entities.ChannelType; import netneutrality.command.Visibility; import netneutrality.command.basic.HelpCommand; -import netneutrality.utils.MessageFunction; import org.reflections.Reflections; import net.dv8tion.jda.core.entities.Message; @@ -29,8 +27,6 @@ public class NewCommandListener extends ListenerAdapter { private HashMap commands = new HashMap<>(); private HashMap commandsAlias = new HashMap<>(); - private Map alias = new HashMap<>(); - public NewCommandListener() { initCommands(); @@ -76,24 +72,23 @@ public class NewCommandListener extends ListenerAdapter { if (cmd.equals("help")) { ((HelpCommand) commands.get("help")).sendHelp(commands, commandsAlias, event.getAuthor(), event.getChannel()); } else { - c.execute(event, msg.replaceFirst("(" + cmd + ")(\\ )?", "")); + c.execute(event, msg.replaceFirst("(" + cmd + ")( )?", "")); } } } } else { - String finalMsg = msg; ArrayList blacklist = new ArrayList<>(); try { blacklist = ((DBBlacklist) DBController.get("blacklist")).getBlacklistFromServer(event.getGuild().getId()); - } catch (RuntimeException e) { } + } catch (RuntimeException ignored) { } if (!blacklist.isEmpty()) { boolean found = false; - for (int i = 0; i < blacklist.size(); i++) { - if (finalMsg.toLowerCase().contains(blacklist.get(i).getWord())) + for (MBlacklist aBlacklist : blacklist) { + if (msg.toLowerCase().contains(aBlacklist.getWord())) found = true; } @@ -105,7 +100,7 @@ public class NewCommandListener extends ListenerAdapter { } } - public void initCommands() { + private void initCommands() { System.out.println("Loading commands.."); Reflections reflections = new Reflections("netneutrality.command"); @@ -134,7 +129,7 @@ public class NewCommandListener extends ListenerAdapter { System.out.println("Loaded " + commands.size() + " commands!"); } - public void initAlias() { + private void initAlias() { for (AbstractCommand command : commands.values()) { for (String alias : command.getAlias()) { diff --git a/src/main/java/netneutrality/http/WebModule.java b/src/main/java/netneutrality/http/WebModule.java index 154e932..0e70f78 100644 --- a/src/main/java/netneutrality/http/WebModule.java +++ b/src/main/java/netneutrality/http/WebModule.java @@ -1,12 +1,10 @@ package netneutrality.http; import java.io.IOException; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.google.common.base.Joiner; import okhttp3.*; import org.json.JSONArray; import org.json.JSONException; @@ -63,7 +61,7 @@ public class WebModule { for (Map.Entry header : headers.entrySet()) { builder.addHeader(header.getKey(), header.getValue()); } - Request request = builder.build(); + Request request = builder.post(body).build(); response = client.newCall(request).execute(); return this; @@ -88,7 +86,7 @@ public class WebModule { StringBuilder json = new StringBuilder(); for (String str : list) { - json.append("\"" + str + "\""); + json.append("\"").append(str).append("\""); json.append(","); } json.insert(0, "["); diff --git a/src/main/java/netneutrality/http/server/WebApi.java b/src/main/java/netneutrality/http/server/WebApi.java index 777fd32..2a095cb 100644 --- a/src/main/java/netneutrality/http/server/WebApi.java +++ b/src/main/java/netneutrality/http/server/WebApi.java @@ -6,18 +6,10 @@ package netneutrality.http.server; * This file is closed-source. It should not be distributed or copied in any way or form */ -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import netneutrality.MusicBot; -import netneutrality.http.WebModule; import java.io.IOException; -import java.io.OutputStream; import java.net.InetSocketAddress; -import java.util.TreeMap; public class WebApi { diff --git a/src/main/java/netneutrality/utils/ChannelFunction.java b/src/main/java/netneutrality/utils/ChannelFunction.java index 316ac60..639cbe7 100644 --- a/src/main/java/netneutrality/utils/ChannelFunction.java +++ b/src/main/java/netneutrality/utils/ChannelFunction.java @@ -5,7 +5,6 @@ import java.util.List; import net.dv8tion.jda.core.entities.Message; import net.dv8tion.jda.core.entities.TextChannel; -import netneutrality.handler.LogHandler; public class ChannelFunction {