From d1ad3829bcc2053de7b65d6d652095322b7c4a82 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:37:05 -0800
Subject: [PATCH] Refactor database manager

---
 .../lunarcore/database/DatabaseManager.java    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/emu/lunarcore/database/DatabaseManager.java b/src/main/java/emu/lunarcore/database/DatabaseManager.java
index 834a63a..f381a1c 100644
--- a/src/main/java/emu/lunarcore/database/DatabaseManager.java
+++ b/src/main/java/emu/lunarcore/database/DatabaseManager.java
@@ -30,7 +30,9 @@ import emu.lunarcore.Config.InternalMongoInfo;
 import emu.lunarcore.LunarCore;
 import emu.lunarcore.LunarCore.ServerType;
 import emu.lunarcore.database.codecs.*;
+import lombok.Getter;
 
+@Getter
 public final class DatabaseManager {
     private MongoServer server;
     private Datastore datastore;
@@ -99,18 +101,10 @@ public final class DatabaseManager {
         ensureIndexes();
     }
 
-    public MongoServer getServer() {
-        return server;
-    }
-
     public MongoDatabase getDatabase() {
         return getDatastore().getDatabase();
     }
 
-    public Datastore getDatastore() {
-        return datastore;
-    }
-
     private void ensureIndexes() {
         try {
             datastore.ensureIndexes();
@@ -129,7 +123,7 @@ public final class DatabaseManager {
         }
     }
 
-    //
+    // Internal mongo server
 
     public String startInternalMongoServer(InternalMongoInfo internalMongo) {
         // Get backend
@@ -168,12 +162,12 @@ public final class DatabaseManager {
         return getDatastore().find(cls).filter(Filters.eq(filter, value)).first();
     }
 
-    public <T> T getObjectByField(Class<T> cls, String filter, int value) {
+    public <T> T getObjectByField(Class<T> cls, String filter, long value) {
         return getDatastore().find(cls).filter(Filters.eq(filter, value)).first();
     }
 
-    public <T> Stream<T> getObjects(Class<T> cls, String filter, long uid) {
-        return getDatastore().find(cls).filter(Filters.eq(filter, uid)).stream();
+    public <T> Stream<T> getObjects(Class<T> cls, String filter, long value) {
+        return getDatastore().find(cls).filter(Filters.eq(filter, value)).stream();
     }
 
     public <T> Stream<T> getObjects(Class<T> cls) {