cache mongoclient & fix long serialization

Author: BillyDotWS

src/main/java/net/plexverse/enginebridge/modules/datastore/DataStorageModuleImpl.java

@@ -54,6 +54,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
@@ -280,6 +281,10 @@ public <T extends StorableStructuredData> void storeStructuredData(@NonNull fina
             final String keyFieldName = keyField.getName();
             dataDocument.remove(keyFieldName);
 
+            // Ensure long fields are stored as int64 (not int32)
+            // MongoDB's Document.parse() may convert small numbers to int32
+            ensureLongFieldsAsInt64(dataDocument, data.getClass());
+            
             // Create document with _id and all data fields (excluding key field)
             final Document document = new Document("_id", key);
             document.putAll(dataDocument);
@@ -296,6 +301,41 @@ public <T extends StorableStructuredData> void storeStructuredData(@NonNull fina
         }
     }
 
+    /**
+     * Ensures that long fields in the entity are stored as int64 (Long) in the MongoDB document,
+     * not int32 (Integer). MongoDB's Document.parse() may convert small numbers to int32.
+     * 
+     * @param document the MongoDB document to fix
+     * @param entityClass the entity class to check for long fields
+     */
+    private void ensureLongFieldsAsInt64(@NonNull final Document document, @NonNull final Class<?> entityClass) {
+        for (final Field field : entityClass.getDeclaredFields()) {
+            // Skip transient and static fields
+            if (Modifier.isTransient(field.getModifiers()) || 
+                Modifier.isStatic(field.getModifiers())) {
+                continue;
+            }
+            
+            // Check if field is long or Long
+            if (field.getType() == long.class || field.getType() == Long.class) {
+                final String fieldName = field.getName();
+                final Object value = document.get(fieldName);
+                
+                // If the value is an Integer (int32), convert it to Long (int64)
+                if (value instanceof Integer) {
+                    document.put(fieldName, ((Integer) value).longValue());
+                    log.debug("[DataStorage] Converted field {} from int32 to int64: {}", fieldName, value);
+                }
+            }
+        }
+        
+        // Also check parent class if it exists
+        final Class<?> superclass = entityClass.getSuperclass();
+        if (superclass != null && superclass != Object.class) {
+            ensureLongFieldsAsInt64(document, superclass);
+        }
+    }
+    
     @Override
     @Synchronized
     public void resetObjectMapper(@NonNull final Consumer<JsonMapper.Builder> mapperCustomizer) {

src/main/java/net/plexverse/enginebridge/modules/manageddb/ManagedDBModuleImpl.java

@@ -5,6 +5,7 @@
 import com.mineplex.studio.sdk.modules.manageddb.models.MongoDatabaseConnectionInfo;
 import com.mineplex.studio.sdk.modules.manageddb.models.MySQLDatabaseConnectionInfo;
 import com.mineplex.studio.sdk.modules.manageddb.models.PostgreSQLDatabaseConnectionInfo;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.google.common.base.Preconditions;
@@ -85,6 +86,7 @@ private static int getMd5Hash(String input) {
     private final Map<String, MySQLDatabaseConnectionInfo> mySQLDatabaseConnectionInfos = new ConcurrentHashMap<>(4);
     private final Map<String, PostgreSQLDatabaseConnectionInfo> postgreSQLDatabaseConnectionInfos = new ConcurrentHashMap<>(4);
     private final Map<String, HikariDataSource> existingHikariPools = new ConcurrentHashMap<>(4);
+    private final Map<String, MongoClient> existingMongoClients = new ConcurrentHashMap<>(4);
     private final Map<String, MongoDatabase> existingMongoPools = new ConcurrentHashMap<>(4);
     private final JavaPlugin plugin;
 
@@ -100,6 +102,8 @@ public void teardown() {
         postgreSQLDatabaseConnectionInfos.clear();
         existingHikariPools.values().forEach(HikariDataSource::close);
         existingHikariPools.clear();
+        existingMongoClients.values().forEach(MongoClient::close);
+        existingMongoClients.clear();
         existingMongoPools.clear();
         log.info("ManagedDBModule torn down");
     }
@@ -167,7 +171,11 @@ public MongoDatabase openManagedMongoClient(@NonNull final String databaseName)
         return existingMongoPools.computeIfAbsent(databaseName, (k) -> {
             MongoDatabaseConnectionInfo mongoDatabaseConnectionInfo = getMongoDatabaseConnectionInfo(databaseName).join();
             String connectionURI = mongoDatabaseConnectionInfo.getConnectionUri();
-            return MongoClients.create(connectionURI).getDatabase(mongoDatabaseConnectionInfo.getSchemaName());
+            // Cache MongoClient per database to reuse connections
+            MongoClient mongoClient = existingMongoClients.computeIfAbsent(databaseName, (key) -> {
+                return MongoClients.create(connectionURI);
+            });
+            return mongoClient.getDatabase(mongoDatabaseConnectionInfo.getSchemaName());
         });
     }