Refactored code to make it better to maintain and read.

src/main/java/us/tastybento/bskyblock/api/addons/AddonClassLoader.java

@@ -7,6 +7,7 @@ import java.net.URLClassLoader;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.InvalidDescriptionException;
 
 import us.tastybento.bskyblock.BSkyBlock;
@@ -81,34 +82,34 @@ public class AddonClassLoader extends URLClassLoader {
 
     /**
      * This is a custom findClass that enables classes in other addons to be found
-     * (This code was copied from Bukkit's PluginLoader class
      * @param name
      * @param checkGlobal
      * @return Class
-     * @throws ClassNotFoundException
      */
     public Class<?> findClass(String name, boolean checkGlobal) throws ClassNotFoundException {
         if (name.startsWith("us.tastybento.")) {
             throw new ClassNotFoundException(name);
         }
-        Class<?> result = classes.get(name);
+        return classes.computeIfAbsent(name, k -> createFor(k, checkGlobal));
+    }
 
-        if (result == null) {
+    private Class<?> createFor(String name, boolean checkGlobal) {
+        Class<?> result = null;
         if (checkGlobal) {
             result = loader.getClassByName(name);
         }
 
         if (result == null) {
+            try {
                 result = super.findClass(name);
+            } catch (ClassNotFoundException e) {
+                Bukkit.getLogger().severe("Could not find class! " + e.getMessage());
+            }
 
             if (result != null) {
                 loader.setClass(name, result);
             }
         }
-
-            classes.put(name, result);
-        }
-
         return result;
     }
 

src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java

@@ -400,11 +400,11 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
     @Override
     public Command setUsage(String usage) {
         // Go up the chain
-        CompositeCommand parent = getParent();
+        CompositeCommand parentCommand = getParent();
         this.usage = getLabel() + " " + usage;
-        while (parent != null) {
+        while (parentCommand != null) {
-            this.usage = parent.getLabel() + " " + this.usage;
+            this.usage = parentCommand.getLabel() + " " + this.usage;
-            parent = parent.getParent();
+            parentCommand = parentCommand.getParent();
         }
         this.usage = this.usage.trim();
         return this;

src/main/java/us/tastybento/bskyblock/api/commands/User.java

@@ -253,11 +253,9 @@ public class User {
      * @return Locale
      */
     public Locale getLocale() {
-        if (sender instanceof Player) {
+        if (sender instanceof Player && !plugin.getPlayers().getLocale(playerUUID).isEmpty()) {
-            if (!plugin.getPlayers().getLocale(playerUUID).isEmpty()) {
             return Locale.forLanguageTag(plugin.getPlayers().getLocale(playerUUID));
         }
-        }
         return Locale.forLanguageTag(plugin.getSettings().getDefaultLanguage());
 
     }

src/main/java/us/tastybento/bskyblock/api/configuration/ISettings.java

@@ -21,7 +21,7 @@ public interface ISettings<T> {
 
     // ----------------Saver-------------------
     @SuppressWarnings("unchecked")
-    default void saveSettings() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, IntrospectionException, SQLException {
+    default void saveSettings() throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IntrospectionException, SQLException {
         // Get the handler
         AbstractDatabaseHandler<T> settingsHandler = (AbstractDatabaseHandler<T>) new FlatFileDatabase().getHandler(getInstance().getClass());
         // Load every field in the config class
@@ -30,7 +30,7 @@ public interface ISettings<T> {
         settingsHandler.saveSettings(getInstance());
     }
 
-    default void saveBackup() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, IntrospectionException, SQLException {
+    default void saveBackup() throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IntrospectionException, SQLException {
         // Save backup
         @SuppressWarnings("unchecked")
         AbstractDatabaseHandler<T> backupHandler =  (AbstractDatabaseHandler<T>) new FlatFileDatabase().getHandler(getInstance().getClass());
@@ -39,7 +39,7 @@ public interface ISettings<T> {
 
     // --------------- Loader ------------------
     @SuppressWarnings("unchecked")
-    default T loadSettings() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, ClassNotFoundException, IntrospectionException, SQLException  {
+    default T loadSettings() throws InstantiationException, IllegalAccessException, InvocationTargetException, ClassNotFoundException, IntrospectionException, SQLException  {
         // See if this settings object already exists in the database
         AbstractDatabaseHandler<T> dbhandler =  (AbstractDatabaseHandler<T>) BSBDatabase.getDatabase().getHandler(getClass());
         T dbConfig = null;

src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java

@@ -32,7 +32,6 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 
-import us.tastybento.bskyblock.api.configuration.ConfigEntry;
 import us.tastybento.bskyblock.database.DatabaseConnecter;
 import us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler;
 import us.tastybento.bskyblock.database.objects.adapters.Adapter;
@@ -124,9 +123,10 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
      * @throws SQLException
      */
     private void createSchema() throws IntrospectionException, SQLException {
-        PreparedStatement pstmt = null;
+        StringBuilder sql = new StringBuilder();
-        try {
+        sql.append("CREATE TABLE IF NOT EXISTS `");
-            String sql = "CREATE TABLE IF NOT EXISTS `" + dataObject.getCanonicalName() + "` (";
+        sql.append(dataObject.getCanonicalName());
+        sql.append("` (");
         // Run through the fields of the class using introspection
         for (Field field : dataObject.getDeclaredFields()) {
             // Get the description of the field
@@ -146,23 +146,30 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
             // If it exists, then create the SQL
             if (mapping != null) {
                 // Note that the column name must be enclosed in `'s because it may include reserved words.
-                    sql += "`" + columnName + "` " + mapping + ",";
+                sql.append("`");
+                sql.append(columnName);
+                sql.append("` ");
+                sql.append(mapping);
+                sql.append(",");
                 // Create set and map tables if the type is a collection
                 if (propertyDescriptor.getPropertyType().equals(Set.class) ||
                         propertyDescriptor.getPropertyType().equals(Map.class) ||
                         propertyDescriptor.getPropertyType().equals(HashMap.class) ||
                         propertyDescriptor.getPropertyType().equals(ArrayList.class)) {
                     // The ID in this table relates to the parent table and is unique
-                        String setSql = "CREATE TABLE IF NOT EXISTS `" + dataObject.getCanonicalName() + "." + field.getName() + "` ("
+                    StringBuilder setSql = new StringBuilder();
-                                + "uniqueId VARCHAR(36) NOT NULL, ";
+                    setSql.append("CREATE TABLE IF NOT EXISTS `");
+                    setSql.append(dataObject.getCanonicalName());
+                    setSql.append(".");
+                    setSql.append(field.getName());
+                    setSql.append("` (");
+                    setSql.append("uniqueId VARCHAR(36) NOT NULL, ");
                     // Get columns separated by commas
-                        setSql += getCollectionColumnString(writeMethod,false,true);
+                    setSql.append(getCollectionColumnString(writeMethod,false,true));
                     // Close the SQL string
-                        setSql += ")";
+                    setSql.append(")");
-
-                        //plugin.getLogger().info(setSql);
                     // Execute the statement
-                        try (PreparedStatement collections = connection.prepareStatement(setSql)) {
+                    try (PreparedStatement collections = connection.prepareStatement(setSql.toString())) {
                         if (DEBUG) {
                             plugin.getLogger().info("DEBUG: collections prepared statement = " + collections.toString());
                         }
@@ -172,26 +179,22 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
             } else {
                 // The Java type is not in the hashmap, so we'll just guess that it can be stored in a string
                 // This should NOT be used in general because every type should be in the hashmap
-                    sql += field.getName() + " VARCHAR(254),";
+                sql.append(field.getName());
+                sql.append(" VARCHAR(254),");
                 plugin.getLogger().severe("Unknown type! Hoping it'll fit in a string!");
                 plugin.getLogger().severe(propertyDescriptor.getPropertyType().getTypeName());
             }
         }
         //plugin.getLogger().info("DEBUG: SQL before trim string = " + sql);
         // For the main table for the class, the unique ID is the primary key
-            sql += " PRIMARY KEY (uniqueId))";
+        sql.append(" PRIMARY KEY (uniqueId))");
         //plugin.getLogger().info("DEBUG: SQL string = " + sql);
         // Prepare and execute the database statements
-            pstmt = connection.prepareStatement(sql);
+        try (PreparedStatement pstmt = connection.prepareStatement(sql.toString())) {
             if (DEBUG) {
                 plugin.getLogger().info("DEBUG: pstmt = " + pstmt.toString());
             }
             pstmt.executeUpdate();
-        } catch (Exception e) {
-            plugin.getLogger().severe("Could not create database schema! " + e.getMessage());
-        } finally {
-            // Close the database properly
-            MySQLDatabaseResourceCloser.close(pstmt);
         }
     }
 
@@ -271,11 +274,13 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
     private List<String> getCollentionColumnList(Method method, boolean createSchema) {
         List<String> columns = new ArrayList<>();
         for (Entry<String,String> en : getCollectionColumnMap(method).entrySet()) {
-            String col = en.getKey();
+            StringBuilder col = new StringBuilder();
+            col.append(en.getKey());
             if (createSchema) {
-                col += " " + en.getValue();
+                col.append(" ");
+                col.append(en.getValue());
             }
-            columns.add(col);
+            columns.add(col.toString());
             if (DEBUG) {
                 plugin.getLogger().info("DEBUG: collection columns = " + col);
             }
@@ -307,6 +312,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 for (Type type : parameters) {
                     // This is a request for column names.
                     String setMapping = mySQLmapping.get(type.getTypeName());
+                    // This column name format is typeName_# where # is a number incremented from 0
                     columns.put("`" + type.getTypeName() + "_" + index + "`", setMapping != null ? setMapping : "VARCHAR(254)");
                     if (DEBUG) {
                         plugin.getLogger().info("DEBUG: collection column = " + "`" + type.getTypeName() + "_" + index + "`" + setMapping);
@@ -388,16 +394,13 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
     InstantiationException, IllegalAccessException,
     IntrospectionException, InvocationTargetException, NoSuchMethodException {
 
-        Connection connection = null;
-        PreparedStatement preparedStatement = null;
         if (DEBUG) {
             plugin.getLogger().info("DEBUG: saveObject ");
         }
-        try {
         // Try to connect to the database
-            connection = databaseConnecter.createConnection();
+        try (Connection connection = databaseConnecter.createConnection()) {          
             // insertQuery is created in super from the createInsertQuery() method
-            preparedStatement = connection.prepareStatement(insertQuery);
+            try (PreparedStatement preparedStatement = connection.prepareStatement(insertQuery)) {
                 // Get the uniqueId. As each class extends DataObject, it must have this method in it.
                 PropertyDescriptor propertyDescriptor = new PropertyDescriptor("uniqueId", dataObject);
                 Method getUniqueId = propertyDescriptor.getReadMethod();
@@ -428,15 +431,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                     if (DEBUG) {
                         plugin.getLogger().info("DEBUG: value = " + value);
                     }
-                // Adapter
+                    // Adapter Notation
-                // Check if there is an annotation on the field
-                ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class);
-                // If there is a config annotation then do something
-                if (configEntry != null) {
-                    if (DEBUG) {
-                        plugin.getLogger().info("DEBUG: there is a configEntry");
-                    }
-                }
                     Adapter adapterNotation = field.getAnnotation(Adapter.class);
                     if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
                         if (DEBUG) {
@@ -455,8 +450,13 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                             propertyDescriptor.getPropertyType().equals(ArrayList.class)) {
                         // Collection
                         // The table is cleared for this uniqueId every time the data is stored
-                    String clearTableSql = "DELETE FROM  `" + dataObject.getCanonicalName() + "." + field.getName() + "` WHERE uniqueId = ?";
+                        StringBuilder clearTableSql = new StringBuilder();
-                    try (PreparedStatement collStatement = connection.prepareStatement(clearTableSql)) {
+                        clearTableSql.append("DELETE FROM  `");
+                        clearTableSql.append(dataObject.getCanonicalName());
+                        clearTableSql.append(".");
+                        clearTableSql.append(field.getName());
+                        clearTableSql.append("` WHERE uniqueId = ?");
+                        try (PreparedStatement collStatement = connection.prepareStatement(clearTableSql.toString())) {
                             collStatement.setString(1, uniqueId);
                             collStatement.execute();
                             if (DEBUG) {
@@ -464,13 +464,21 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                             }
                         }
                         // Insert into the table
-                    String setSql = "INSERT INTO `" + dataObject.getCanonicalName() + "." + field.getName() + "` (uniqueId, ";
+                        StringBuilder setSql = new StringBuilder();
+                        setSql.append("INSERT INTO `");
+                        setSql.append(dataObject.getCanonicalName());
+                        setSql.append(".");
+                        setSql.append(field.getName());
+                        setSql.append("` (uniqueId, ");
                         // Get the columns we are going to insert, just the names of them
-                    setSql += getCollectionColumnString(propertyDescriptor.getWriteMethod(), false, false) + ") ";
+                        setSql.append(getCollectionColumnString(propertyDescriptor.getWriteMethod(), false, false));
+                        setSql.append(") ");
                         // Get all the ?'s for the columns
-                    setSql += "VALUES ('?'," + getCollectionColumnString(propertyDescriptor.getWriteMethod(), true, false) + ")";
+                        setSql.append("VALUES ('?',");
+                        setSql.append(getCollectionColumnString(propertyDescriptor.getWriteMethod(), true, false));
+                        setSql.append(")");
                         // Prepare the statement
-                    try (PreparedStatement collStatement = connection.prepareStatement(setSql)) {
+                        try (PreparedStatement collStatement = connection.prepareStatement(setSql.toString())) {
                             // Set the uniqueId
                             collStatement.setString(1, uniqueId);
                             if (DEBUG) {
@@ -548,11 +556,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                     plugin.getLogger().info("DEBUG: prepared statement = " + preparedStatement.toString());
                 }
                 preparedStatement.executeBatch();
-
+            }
-        } finally {
-            // Close properly
-            MySQLDatabaseResourceCloser.close(connection);
-            MySQLDatabaseResourceCloser.close(preparedStatement);
         }
     }
 
@@ -617,26 +621,13 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
     InstantiationException, IllegalAccessException,
     IntrospectionException, InvocationTargetException, ClassNotFoundException {
 
-        Connection connection = null;
+        try (Connection conn = databaseConnecter.createConnection();
-        Statement statement = null;
+                Statement statement = conn.createStatement();
-        ResultSet resultSet = null;
+                ResultSet resultSet = statement.executeQuery(selectQuery)) {
-
-        try {
-            connection = databaseConnecter.createConnection();
-            statement = connection.createStatement();
-            if (DEBUG) {
-                plugin.getLogger().info("DEBUG: selectQuery = " + selectQuery);
-            }
-            resultSet = statement.executeQuery(selectQuery);
-
             return createObjects(resultSet);
+        }
+    }
 
-        } finally {
-            MySQLDatabaseResourceCloser.close(resultSet);
-            MySQLDatabaseResourceCloser.close(statement);
-            MySQLDatabaseResourceCloser.close(connection);
-        }
-    }
 
     /* (non-Javadoc)
      * @see us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler#selectObject(java.lang.String)
@@ -645,32 +636,33 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
     public T loadObject(String uniqueId) throws InstantiationException,
     IllegalAccessException, IllegalArgumentException,
     InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException {
-        Connection connection = null;
+
-        Statement statement = null;
-        ResultSet resultSet = null;
         if (DEBUG) {
             plugin.getLogger().info("DEBUG: loading object for " + uniqueId);
         }
-        try {
+        try (Connection conn = databaseConnecter.createConnection()) {
-            connection = databaseConnecter.createConnection();
+            // Build the select query
-            String query = "SELECT " + getColumns(false) + " FROM `" + dataObject.getCanonicalName() + "` WHERE uniqueId = ? LIMIT 1";
+            StringBuilder query = new StringBuilder();
-            try (PreparedStatement preparedStatement = connection.prepareStatement(query)) {
+            query.append("SELECT ");
+            query.append(getColumns(false));
+            query.append(" FROM `");
+            query.append(dataObject.getCanonicalName());
+            query.append("` WHERE uniqueId = ? LIMIT 1");
+
+            try (PreparedStatement preparedStatement = conn.prepareStatement(query.toString())) {
                 preparedStatement.setString(1, uniqueId);
                 if (DEBUG) {
                     plugin.getLogger().info("DEBUG: load Object query = " + preparedStatement.toString());
                 }
-                resultSet = preparedStatement.executeQuery();
+                try (ResultSet resultSet = preparedStatement.executeQuery()) {
-
+                    // If there is a result, we only want/need the first one
                     List<T> result = createObjects(resultSet);
                     if (!result.isEmpty()) {
                         return result.get(0);
                     }
                 }
+            }
             return null;
-        } finally {
-            MySQLDatabaseResourceCloser.close(resultSet);
-            MySQLDatabaseResourceCloser.close(statement);
-            MySQLDatabaseResourceCloser.close(connection);
         }
     }
 
@@ -732,14 +724,20 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                     }
                     // TODO Get the values from the subsidiary tables.
                     // value is just of type boolean right now
-                    String setSql = "SELECT ";
+                    StringBuilder setSql = new StringBuilder();
+                    setSql.append("SELECT ");
                     // Get the columns, just the names of them, no ?'s or types
-                    setSql += getCollectionColumnString(method, false, false) + " ";
+                    setSql.append(getCollectionColumnString(method, false, false));
-                    setSql += "FROM `" + dataObject.getCanonicalName() + "." + field.getName() + "` ";
+                    setSql.append(" ");
+                    setSql.append("FROM `");
+                    setSql.append(dataObject.getCanonicalName());
+                    setSql.append(".");
+                    setSql.append(field.getName());
+                    setSql.append("` ");
                     // We will need to fill in the ? later with the unique id of the class from the database
-                    setSql += "WHERE uniqueId = ?";
+                    setSql.append("WHERE uniqueId = ?");
                     // Prepare the statement
-                    try (PreparedStatement collStatement = connection.prepareStatement(setSql)) {
+                    try (PreparedStatement collStatement = connection.prepareStatement(setSql.toString())) {
                         // Set the unique ID
                         collStatement.setObject(1, uniqueId);
                         if (DEBUG) {
@@ -778,8 +776,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                                 value = new ArrayList<>();
                                 //plugin.getLogger().info("DEBUG: collection type argument = " + collectionTypes);
                                 while (collectionResultSet.next()) {
-                                    //plugin.getLogger().info("DEBUG: adding to the list");
+                                    // Add to the list
-                                    //plugin.getLogger().info("DEBUG: collectionResultSet size = " + collectionResultSet.getFetchSize());
                                     ((List<Object>) value).add(deserialize(collectionResultSet.getObject(1),Class.forName(setType.getTypeName())));
                                 }
                             } else if (Map.class.isAssignableFrom(propertyDescriptor.getPropertyType()) ||
@@ -829,15 +826,6 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 }
                 // Adapter
                 // Check if there is an annotation on the field
-                ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class);
-                // If there is a config annotation then do something
-                if (configEntry != null) {
-                    if (DEBUG)
-                    {
-                        plugin.getLogger().info("DEBUG: there is a configEntry");
-                        // TODO: add config entry handling
-                    }
-                }
                 Adapter adapterNotation = field.getAnnotation(Adapter.class);
                 if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
                     if (DEBUG) {
@@ -917,12 +905,11 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
             throws IllegalAccessException, IllegalArgumentException,
             InvocationTargetException, IntrospectionException, SQLException, NoSuchMethodException, SecurityException {
         // Delete this object from all tables
-        Connection connection = null;
-        PreparedStatement preparedStatement = null;
 
-        try {
+        //PreparedStatement preparedStatement = null;
+
         // Try to connect to the database
-            connection = databaseConnecter.createConnection();
+        try (Connection conn = databaseConnecter.createConnection()){
             // Get the uniqueId. As each class extends DataObject, it must have this method in it.
             Method getUniqueId = dataObject.getMethod("getUniqueId");
             String uniqueId = (String) getUniqueId.invoke(instance);
@@ -933,7 +920,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
             // Delete from the main table
             // First substitution is the table name
             // deleteQuery is created in super from the createInsertQuery() method
-            preparedStatement = connection.prepareStatement(deleteQuery.replace("[table_name]", "`" + dataObject.getCanonicalName() + "`"));
+            try (PreparedStatement preparedStatement = conn.prepareStatement(deleteQuery.replace("[table_name]", "`" + dataObject.getCanonicalName() + "`"))) {
                 // Second is the unique ID
                 preparedStatement.setString(1, uniqueId);
                 preparedStatement.addBatch();
@@ -941,6 +928,8 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                     plugin.getLogger().info("DEBUG: DELETE Query " + preparedStatement.toString());
                 }
                 preparedStatement.executeBatch();
+            }
+
             // Delete from any sub tables created from the object
             // Run through the fields in the class using introspection
             for (Field field : dataObject.getDeclaredFields()) {
@@ -952,7 +941,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                         propertyDescriptor.getPropertyType().equals(HashMap.class) ||
                         propertyDescriptor.getPropertyType().equals(ArrayList.class)) {
                     // First substitution is the table name
-                    try (PreparedStatement preparedStatement2 = connection.prepareStatement(deleteQuery.replace("[table_name]", "`" + dataObject.getCanonicalName() + "." + field.getName() + "`"))) {
+                    try (PreparedStatement preparedStatement2 = conn.prepareStatement(deleteQuery.replace("[table_name]", "`" + dataObject.getCanonicalName() + "." + field.getName() + "`"))) {
                         // Second is the unique ID
                         preparedStatement2.setString(1, uniqueId);
                         preparedStatement2.addBatch();
@@ -964,12 +953,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                     }
                 }
             }
-        } finally {
-            // Close properly
-            MySQLDatabaseResourceCloser.close(preparedStatement);
-            MySQLDatabaseResourceCloser.close(connection);
         } 
-
     }
 
     /* (non-Javadoc)
@@ -980,31 +964,22 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
         if (DEBUG) {
             plugin.getLogger().info("DEBUG: checking if " + key + " exists in the database");
         }
-        Connection connection = null;
+        // Create the query to see if this key exists
-        PreparedStatement preparedStatement = null;
+        StringBuilder query = new StringBuilder();
-        ResultSet resultSet = null;
+        query.append("SELECT  IF ( EXISTS( SELECT * FROM `");
-        String query = "SELECT  IF ( EXISTS( SELECT * FROM `" + dataObject.getCanonicalName() + "` WHERE `uniqueId` = ?), 1, 0)";
+        query.append(dataObject.getCanonicalName());
-        //String query = "SELECT * FROM `" + type.getCanonicalName() + "` WHERE uniqueId = ?";
+        query.append("` WHERE `uniqueId` = ?), 1, 0)");
-        try {
+
-            connection = databaseConnecter.createConnection();
+        try (Connection conn = databaseConnecter.createConnection();
-            preparedStatement = connection.prepareStatement(query);
+                PreparedStatement preparedStatement = conn.prepareStatement(query.toString())) {
             preparedStatement.setString(1, key);
-            resultSet = preparedStatement.executeQuery();
+            try (ResultSet resultSet = preparedStatement.executeQuery()) {
-            if (DEBUG) {
-                plugin.getLogger().info("DEBUG: object exists sql " + preparedStatement.toString());
-            }
                 if (resultSet.next()) {
-                if (DEBUG) {
-                    plugin.getLogger().info("DEBUG: result is " + resultSet.getBoolean(1));
-                }
                     return resultSet.getBoolean(1);
                 }
+            }
         } catch (SQLException e) {
             plugin.getLogger().severe("Could not check if key exists in database! " + key + " " + e.getMessage());
-        } finally {
-            MySQLDatabaseResourceCloser.close(resultSet);
-            MySQLDatabaseResourceCloser.close(preparedStatement);
-            MySQLDatabaseResourceCloser.close(connection);
         }
         return false;
     }
@@ -1012,14 +987,14 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
     @Override
     public void saveSettings(T instance)
             throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException {
-        plugin.getLogger().severe("This method should not be used because configs are not stored in MySQL");
+        // This method should not be used because configs are not stored in MySQL
 
     }
 
     @Override
     public T loadSettings(String uniqueId, T dbConfig) throws InstantiationException, IllegalAccessException,
     IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IntrospectionException {
-        plugin.getLogger().severe("This method should not be used because configs are not stored in MySQL");
+        // This method should not be used because configs are not stored in MySQL
         return null;
     }