From c44e432aa3a09f17b4519f18cbdf0610a614a4a6 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 10 Jun 2017 11:37:04 -0700 Subject: [PATCH] Renamed some of the database methods. --- .../database/flatfile/FlatFileDatabaseHandler.java | 6 +++--- .../database/managers/AbstractDatabaseHandler.java | 8 ++++---- .../bskyblock/database/managers/IslandsManager.java | 6 +++--- .../tastybento/bskyblock/database/managers/RunTest.java | 4 ++-- .../bskyblock/database/mysql/MySQLDatabaseHandler.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabaseHandler.java b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabaseHandler.java index 72dca091c..b5c511604 100644 --- a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabaseHandler.java +++ b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabaseHandler.java @@ -62,7 +62,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { * @throws ClassNotFoundException */ @Override - public T selectObject(String key) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, ClassNotFoundException { + public T loadObject(String key) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, ClassNotFoundException { YamlConfiguration config = databaseConnecter.loadYamlFile(type.getSimpleName(), key); return createObject(config); } @@ -78,7 +78,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { * @throws ClassNotFoundException */ @Override - public List selectObjects() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, ClassNotFoundException { + public List loadObjects() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, ClassNotFoundException { List list = new ArrayList(); FilenameFilter ymlFilter = new FilenameFilter() { @Override @@ -201,7 +201,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { */ @SuppressWarnings("unchecked") @Override - public void insertObject(T instance) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException { + public void saveObject(T instance) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException { // This is the Yaml Configuration that will be used and saved at the end YamlConfiguration config = new YamlConfiguration(); // The file name of the Yaml file. diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/AbstractDatabaseHandler.java b/src/main/java/us/tastybento/bskyblock/database/managers/AbstractDatabaseHandler.java index 083b3361a..508b7ba9a 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/AbstractDatabaseHandler.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/AbstractDatabaseHandler.java @@ -110,7 +110,7 @@ public abstract class AbstractDatabaseHandler { * @throws SQLException * @throws ClassNotFoundException */ - protected abstract List selectObjects() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException; + protected abstract List loadObjects() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException; /** * Creates a filled with values from the corresponding @@ -126,10 +126,10 @@ public abstract class AbstractDatabaseHandler { * @throws ClassNotFoundException * @throws SecurityException */ - protected abstract T selectObject(String uniqueId) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException; + protected abstract T loadObject(String uniqueId) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException; /** - * Inserts T into the corresponding database-table + * Save T into the corresponding database * * @param instance that should be inserted into the database * @throws IllegalAccessException @@ -141,6 +141,6 @@ public abstract class AbstractDatabaseHandler { * @throws SQLException * @throws NoSuchMethodException */ - protected abstract void insertObject(T instance) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, InstantiationException, NoSuchMethodException; + protected abstract void saveObject(T instance) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, InstantiationException, NoSuchMethodException; } diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/database/managers/IslandsManager.java index 112c71211..d88a835a4 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/IslandsManager.java @@ -56,7 +56,7 @@ public class IslandsManager { islandsByUUID.clear(); spawn = null; try { - for (Object island : handler.selectObjects()) { + for (Object island : handler.loadObjects()) { if (island instanceof Island) { islands.put(((Island)island).getCenter(), (Island)island); islandsByUUID.put(((Island)island).getOwner(), (Island)island); @@ -76,7 +76,7 @@ public class IslandsManager { public void run() { for(Island island : islands.values()){ try { - handler.insertObject(island); + handler.saveObject(island); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -87,7 +87,7 @@ public class IslandsManager { } else { for(Island island : islands.values()){ try { - handler.insertObject(island); + handler.saveObject(island); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/RunTest.java b/src/main/java/us/tastybento/bskyblock/database/managers/RunTest.java index 97832266d..da9d49acc 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/RunTest.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/RunTest.java @@ -41,11 +41,11 @@ public class RunTest { BSBDatabase database = BSBDatabase.getDatabase(); AbstractDatabaseHandler handler = (AbstractDatabaseHandler) database.getHandler(plugin, Island.class); - handler.insertObject(test); + handler.saveObject(test); plugin.getLogger().info("DEBUG: ALL WRITTEN! Now reading..."); - test = handler.selectObject(test.getUniqueId()); + test = handler.loadObject(test.getUniqueId()); plugin.getLogger().info("DEBUG: name = " + test.getName()); plugin.getLogger().info("DEBUG: owner = " + test.getOwner()); diff --git a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java index 062bfb5fc..bd8ce3659 100644 --- a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java +++ b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java @@ -310,7 +310,7 @@ public class MySQLDatabaseHandler extends AbstractDatabaseHandler { * @see us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler#insertObject(java.lang.Object) */ @Override - public void insertObject(T instance) throws SQLException, + public void saveObject(T instance) throws SQLException, SecurityException, IllegalArgumentException, InstantiationException, IllegalAccessException, IntrospectionException, InvocationTargetException, NoSuchMethodException { @@ -484,7 +484,7 @@ public class MySQLDatabaseHandler extends AbstractDatabaseHandler { * @throws ClassNotFoundException */ @Override - public List selectObjects() throws SQLException, + public List loadObjects() throws SQLException, SecurityException, IllegalArgumentException, InstantiationException, IllegalAccessException, IntrospectionException, InvocationTargetException, ClassNotFoundException { @@ -511,7 +511,7 @@ public class MySQLDatabaseHandler extends AbstractDatabaseHandler { * @see us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler#selectObject(java.lang.String) */ @Override - protected T selectObject(String uniqueId) throws InstantiationException, + protected T loadObject(String uniqueId) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, IntrospectionException, SQLException, SecurityException, ClassNotFoundException { Connection connection = null;