From e8ba1805a5c4f0a0d2df4e8859861925be0e6289 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 28 Oct 2018 16:51:38 +0100 Subject: [PATCH] Renamed FLATFILE databasetype to YAML --- .../bentobox/api/configuration/Config.java | 6 +++--- .../bentobox/database/DatabaseSetup.java | 10 +++++----- .../{flatfile => yaml}/ConfigHandler.java | 4 ++-- .../YamlDatabase.java} | 8 ++++---- .../YamlDatabaseConnector.java} | 10 +++++----- .../YamlDatabaseHandler.java} | 18 +++++++++--------- 6 files changed, 28 insertions(+), 28 deletions(-) rename src/main/java/world/bentobox/bentobox/database/{flatfile => yaml}/ConfigHandler.java (90%) rename src/main/java/world/bentobox/bentobox/database/{flatfile/FlatFileDatabase.java => yaml/YamlDatabase.java} (64%) rename src/main/java/world/bentobox/bentobox/database/{flatfile/FlatFileDatabaseConnector.java => yaml/YamlDatabaseConnector.java} (93%) rename src/main/java/world/bentobox/bentobox/database/{flatfile/FlatFileDatabaseHandler.java => yaml/YamlDatabaseHandler.java} (96%) diff --git a/src/main/java/world/bentobox/bentobox/api/configuration/Config.java b/src/main/java/world/bentobox/bentobox/api/configuration/Config.java index a3fa4b52d..6624ae69f 100644 --- a/src/main/java/world/bentobox/bentobox/api/configuration/Config.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/Config.java @@ -9,7 +9,7 @@ import java.util.logging.Logger; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.database.AbstractDatabaseHandler; -import world.bentobox.bentobox.database.flatfile.FlatFileDatabase; +import world.bentobox.bentobox.database.yaml.YamlDatabase; /** * Handy config class to store and load Java POJOs as YAML configs @@ -24,12 +24,12 @@ public class Config { public Config(BentoBox plugin, Class type) { this.logger = plugin.getLogger(); - handler = new FlatFileDatabase().getConfig(type); + handler = new YamlDatabase().getConfig(type); } public Config(Addon addon, Class type) { this.logger = addon.getLogger(); - handler = new FlatFileDatabase().getConfig(type); + handler = new YamlDatabase().getConfig(type); } /** diff --git a/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java b/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java index f54195029..6544e03d5 100644 --- a/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java +++ b/src/main/java/world/bentobox/bentobox/database/DatabaseSetup.java @@ -1,7 +1,7 @@ package world.bentobox.bentobox.database; import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.database.flatfile.FlatFileDatabase; +import world.bentobox.bentobox.database.yaml.YamlDatabase; import world.bentobox.bentobox.database.json.JSONDatabase; import world.bentobox.bentobox.database.mongodb.MongoDBDatabase; import world.bentobox.bentobox.database.mysql.MySQLDatabase; @@ -10,8 +10,8 @@ public interface DatabaseSetup { /** * Gets the type of database being used. - * Currently supported options are FLATFILE, JSON, MYSQL and MONGODB. - * Default is FLATFILE. + * Currently supported options are YAML, JSON, MYSQL and MONGODB. + * Default is YAML. * @return Database type */ static DatabaseSetup getDatabase() { @@ -20,11 +20,11 @@ public interface DatabaseSetup { return type.database; } } - return DatabaseType.FLATFILE.database; + return DatabaseType.YAML.database; } enum DatabaseType { - FLATFILE(new FlatFileDatabase()), + YAML(new YamlDatabase()), JSON(new JSONDatabase()), MYSQL(new MySQLDatabase()), MONGODB(new MongoDBDatabase()); diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/ConfigHandler.java similarity index 90% rename from src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java rename to src/main/java/world/bentobox/bentobox/database/yaml/ConfigHandler.java index f3ca2ab2c..610f12906 100644 --- a/src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/ConfigHandler.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.database.flatfile; +package world.bentobox.bentobox.database.yaml; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; @@ -14,7 +14,7 @@ import world.bentobox.bentobox.database.DatabaseConnector; * @param Handles config files for Class */ -public class ConfigHandler extends FlatFileDatabaseHandler { +public class ConfigHandler extends YamlDatabaseHandler { public ConfigHandler(BentoBox plugin, Class type, DatabaseConnector databaseConnector) { super(plugin, type, databaseConnector); diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java similarity index 64% rename from src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java rename to src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java index 352972c12..1fa61f799 100644 --- a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabase.java @@ -1,10 +1,10 @@ -package world.bentobox.bentobox.database.flatfile; +package world.bentobox.bentobox.database.yaml; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.DatabaseSetup; -public class FlatFileDatabase implements DatabaseSetup { +public class YamlDatabase implements DatabaseSetup { /** * Get the config @@ -13,12 +13,12 @@ public class FlatFileDatabase implements DatabaseSetup { * @return - the config handler */ public AbstractDatabaseHandler getConfig(Class type) { - return new ConfigHandler<>(BentoBox.getInstance(), type, new FlatFileDatabaseConnector(BentoBox.getInstance())); + return new ConfigHandler<>(BentoBox.getInstance(), type, new YamlDatabaseConnector(BentoBox.getInstance())); } @Override public AbstractDatabaseHandler getHandler(Class type) { - return new FlatFileDatabaseHandler<>(BentoBox.getInstance(), type, new FlatFileDatabaseConnector(BentoBox.getInstance())); + return new YamlDatabaseHandler<>(BentoBox.getInstance(), type, new YamlDatabaseConnector(BentoBox.getInstance())); } } diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java similarity index 93% rename from src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnector.java rename to src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java index 06e781310..173e67cca 100644 --- a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnector.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseConnector.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.database.flatfile; +package world.bentobox.bentobox.database.yaml; import java.io.File; import java.io.FileInputStream; @@ -21,7 +21,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.DatabaseConnector; -public class FlatFileDatabaseConnector implements DatabaseConnector { +public class YamlDatabaseConnector implements DatabaseConnector { private static final int MAX_LOOPS = 100; private static final String DATABASE_FOLDER_NAME = "database"; @@ -29,7 +29,7 @@ public class FlatFileDatabaseConnector implements DatabaseConnector { private final File dataFolder; - public FlatFileDatabaseConnector(BentoBox plugin) { + public YamlDatabaseConnector(BentoBox plugin) { this.plugin = plugin; dataFolder = new File(plugin.getDataFolder(), DATABASE_FOLDER_NAME); } @@ -56,7 +56,7 @@ public class FlatFileDatabaseConnector implements DatabaseConnector { config = new YamlConfiguration(); config.load(yamlFile); } catch (Exception e) { - plugin.logError("Could not load yaml file from database " + tableName + " " + fileName + " " + e.getMessage()); + plugin.logError("Could not load yml file from database " + tableName + " " + fileName + " " + e.getMessage()); } } else { // Create the missing file @@ -96,7 +96,7 @@ public class FlatFileDatabaseConnector implements DatabaseConnector { yamlConfig.save(file.toPath().toString()); Files.deleteIfExists(tmpFile.toPath()); } catch (Exception e) { - plugin.logError("Could not save yaml file: " + tableName + " " + fileName + " " + e.getMessage()); + plugin.logError("Could not save yml file: " + tableName + " " + fileName + " " + e.getMessage()); return; } if (commentMap != null && !commentMap.isEmpty()) { diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java similarity index 96% rename from src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java rename to src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java index ed6765dff..948b479bc 100644 --- a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.database.flatfile; +package world.bentobox.bentobox.database.yaml; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -47,7 +47,7 @@ import world.bentobox.bentobox.util.Util; * @param Handles flat files for Class */ -public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { +public class YamlDatabaseHandler extends AbstractDatabaseHandler { /** * Flag to indicate if this is a config or a pure object database (difference is in comments and annotations) @@ -60,7 +60,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { * @param type - class to store in the database * @param databaseConnector - the database credentials, in this case, just the YAML functions */ - FlatFileDatabaseHandler(BentoBox plugin, Class type, DatabaseConnector databaseConnector) { + YamlDatabaseHandler(BentoBox plugin, Class type, DatabaseConnector databaseConnector) { super(plugin, type, databaseConnector); } @@ -78,7 +78,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { key = storeAt.filename(); } // Load the YAML file at the location. - YamlConfiguration config = ((FlatFileDatabaseConnector)databaseConnector).loadYamlFile(path, key); + YamlConfiguration config = ((YamlDatabaseConnector)databaseConnector).loadYamlFile(path, key); // Use the createObject method to turn a YAML config into an Java object return createObject(config); } @@ -119,7 +119,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { if (storeAt != null) { fileName = storeAt.filename(); } - YamlConfiguration config = ((FlatFileDatabaseConnector)databaseConnector).loadYamlFile(DATABASE_FOLDER_NAME + File.separator + dataObject.getSimpleName(), fileName); + YamlConfiguration config = ((YamlDatabaseConnector)databaseConnector).loadYamlFile(DATABASE_FOLDER_NAME + File.separator + dataObject.getSimpleName(), fileName); list.add(createObject(config)); } return list; @@ -243,7 +243,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { } else { // Not a collection. Get the value and rely on YAML to supply it Object value = config.get(storageLocation); - // If the value is a yaml MemorySection then something is wrong, so ignore it. Maybe an admin did some bad editing + // If the value is a yml MemorySection then something is wrong, so ignore it. Maybe an admin did some bad editing if (value != null && !value.getClass().equals(MemorySection.class)) { method.invoke(instance, deserialize(value,propertyDescriptor.getPropertyType())); } @@ -355,7 +355,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { try { config.set(storageLocation, ((AdapterInterface)adapterNotation.value().getDeclaredConstructor().newInstance()).serialize(value)); } catch (InstantiationException | IllegalArgumentException | NoSuchMethodException | SecurityException e) { - plugin.logError("Could not instatiate adapter " + adapterNotation.value().getName() + " " + e.getMessage()); + plugin.logError("Could not instantiate adapter " + adapterNotation.value().getName() + " " + e.getMessage()); } // We are done here continue; @@ -409,7 +409,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { throw new IllegalArgumentException("No uniqueId in class"); } - ((FlatFileDatabaseConnector)databaseConnector).saveYamlFile(config, path, filename, yamlComments); + ((YamlDatabaseConnector)databaseConnector).saveYamlFile(config, path, filename, yamlComments); } private void setComment(ConfigComment comment, YamlConfiguration config, Map yamlComments, String parent) { @@ -540,7 +540,7 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { try { Files.delete(file.toPath()); } catch (IOException e) { - plugin.logError("Could not delete yaml database object! " + file.getName() + " - " + e.getMessage()); + plugin.logError("Could not delete yml database object! " + file.getName() + " - " + e.getMessage()); } } }