From 7888bdf6411557a37e28a51ebb231668ac35badc Mon Sep 17 00:00:00 2001
From: Anthony <anthorob@xtremmail.com>
Date: Mon, 2 Apr 2018 10:17:06 -0400
Subject: [PATCH] Refactored code

---
 src/main/java/netneutrality/MusicBot.java             |  1 +
 src/main/java/netneutrality/db/DBController.java      |  8 ++++++--
 .../netneutrality/db/controllers/DBBlacklist.java     | 11 ++---------
 src/main/java/netneutrality/http/WebModule.java       |  1 -
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java
index 1509604..4303e3b 100644
--- a/src/main/java/netneutrality/MusicBot.java
+++ b/src/main/java/netneutrality/MusicBot.java
@@ -55,6 +55,7 @@ public class MusicBot {
 				System.out.println("Shutting down...");
 				MusicManager.disconnectPlayers();
 				jda.shutdown();
+				DBController.shutdown();
 				ThreadManager.shutdownExecutor();
 				System.out.println("Shutdown complete");
 				System.exit(0);
diff --git a/src/main/java/netneutrality/db/DBController.java b/src/main/java/netneutrality/db/DBController.java
index 3af7278..b7ed8af 100644
--- a/src/main/java/netneutrality/db/DBController.java
+++ b/src/main/java/netneutrality/db/DBController.java
@@ -57,8 +57,12 @@ public class DBController {
 		return database;
 	}
 
-	public static void shutdown() throws SQLException {
-		database.close();
+	public static void shutdown() {
+		try {
+			database.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
 	}
 	
 	/**
diff --git a/src/main/java/netneutrality/db/controllers/DBBlacklist.java b/src/main/java/netneutrality/db/controllers/DBBlacklist.java
index c495f8e..994abe4 100644
--- a/src/main/java/netneutrality/db/controllers/DBBlacklist.java
+++ b/src/main/java/netneutrality/db/controllers/DBBlacklist.java
@@ -120,7 +120,7 @@ public class DBBlacklist extends AbstractController {
 
 			} catch (SQLException e) {
 				e.printStackTrace();
-			} catch (NullPointerException | IndexOutOfBoundsException e) { }
+			} catch (NullPointerException | IndexOutOfBoundsException ignored) { }
 
 			success.accept(output);
 		});
@@ -129,14 +129,7 @@ public class DBBlacklist extends AbstractController {
 
 	public boolean isAlreadyBlacklisted(String word, String serverId) throws SQLException {
 		ResultSet rs = database.prepareAndExecute("SELECT COUNT(*) FROM blacklist WHERE word = ? AND serverId = ?", word, serverId);
-		if (rs.next()) {
-			if (rs.getInt(1) == 0) {
-				return false;
-			}
-
-		}
-
-		return true;
+		return !rs.next() || rs.getInt(1) != 0;
 	}
 
 	@Override
diff --git a/src/main/java/netneutrality/http/WebModule.java b/src/main/java/netneutrality/http/WebModule.java
index 677ff3c..22d6bb5 100644
--- a/src/main/java/netneutrality/http/WebModule.java
+++ b/src/main/java/netneutrality/http/WebModule.java
@@ -25,7 +25,6 @@ public class WebModule {
 	 * <br>Needs to be executed before any other method call
 	 * 
 	 * @return an instance of the WebModule class with the Response of the Web Request
-	 * @throws IOException
 	 */
 	public WebModule request() {