Completed and tested FlatFile database system

funkemunky · Jan 27, 2019 · e725ed0 · e725ed0
1 parent e2fc85a
commit e725ed0
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 59 deletions.
diff --git a/API/.idea/workspace.xml b/API/.idea/workspace.xml
diff --git a/API/out/artifacts/Atlas_jar/Atlas.jar b/API/out/artifacts/Atlas_jar/Atlas.jar
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/Database.class b/API/out/production/Atlas/cc/funkemunky/api/database/Database.class
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class b/API/out/production/Atlas/cc/funkemunky/api/database/flatfile/FlatfileDatabase.class
diff --git a/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class b/API/out/production/Atlas/cc/funkemunky/api/database/mongo/MongoDatabase.class
diff --git a/API/src/cc/funkemunky/api/database/Database.java b/API/src/cc/funkemunky/api/database/Database.java
@@ -12,11 +12,14 @@
 public abstract class Database {
     private String name;
     private Plugin plugin;
+    private DatabaseType type;
     private Map<String, Object> databaseValues;
 
-    public Database(String name, Plugin plugin) {
+    public Database(String name, Plugin plugin, DatabaseType type) {
         this.name = name;
         this.plugin = plugin;
+        this.type = type;
+
         databaseValues = new ConcurrentHashMap<>();
     }
 

diff --git a/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java b/API/src/cc/funkemunky/api/database/flatfile/FlatfileDatabase.java
@@ -1,6 +1,7 @@
 package cc.funkemunky.api.database.flatfile;
 
 import cc.funkemunky.api.database.Database;
+import cc.funkemunky.api.database.DatabaseType;
 import cc.funkemunky.api.utils.FunkeFile;
 import cc.funkemunky.api.utils.MiscUtils;
 import lombok.Getter;
@@ -12,7 +13,7 @@
 public class FlatfileDatabase extends Database {
     private FunkeFile file;
     public FlatfileDatabase(String name, Plugin plugin) {
-        super(name, plugin);
+        super(name, plugin, DatabaseType.FLATFILE);
 
         file = new FunkeFile(plugin, "databases", name + ".txt");
     }

diff --git a/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java b/API/src/cc/funkemunky/api/database/mongo/MongoDatabase.java
@@ -2,6 +2,7 @@
 
 import cc.funkemunky.api.Atlas;
 import cc.funkemunky.api.database.Database;
+import cc.funkemunky.api.database.DatabaseType;
 import cc.funkemunky.api.mongo.Mongo;
 import com.mongodb.Block;
 import com.mongodb.client.MongoCollection;
@@ -15,7 +16,7 @@
 public class MongoDatabase extends Database {
     private MongoCollection<Document> collection;
     public MongoDatabase(String name, Plugin plugin) {
-        super(name, plugin);
+        super(name, plugin, DatabaseType.MONGO);
 
         collection = Atlas.getInstance().getMongo().getMongoDatabase().getCollection(name);
     }
@@ -31,7 +32,7 @@ public void loadDatabase() {
     public void saveDatabase() {
         Map<String, Map<String, Object>> toSort = new HashMap<>();
         getDatabaseValues().keySet().forEach(key -> {
-            String[] toFormat = key.split(".");
+            String[] toFormat = key.split(";");
 
             Map<String, Object> objects = toSort.getOrDefault(toFormat[0], new HashMap<>());