Set default for poolName and executorService

GeyserMC · Feb 11, 2024 · 4262164 · 4262164
1 parent aad5cb6
commit 4262164
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/org/geysermc/databaseutils/DatabaseUtils.java b/core/src/main/java/org/geysermc/databaseutils/DatabaseUtils.java
@@ -28,6 +28,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.geysermc.databaseutils.codec.TypeCodec;
 import org.geysermc.databaseutils.codec.TypeCodecRegistry;
 import org.geysermc.databaseutils.sql.SqlDialect;
@@ -78,7 +79,7 @@ public static class Builder {
         private String uri;
         private String username;
         private String password;
-        private String poolName;
+        private String poolName = "database-utils";
         private int connectionPoolSize = 0;
         private SqlDialect dialect;
 
@@ -202,6 +203,11 @@ public DatabaseUtils build() {
                         "Cannot use credentialsFile in combination with not using default credentials");
             }
 
+            var service = executorService;
+            if (service == null) {
+                service = Executors.newCachedThreadPool();
+            }
+
             var actual = config;
             if (credentialsFile != null) {
                 actual = new CredentialsFileHandler().handle(dialect, credentialsFile);
@@ -211,7 +217,7 @@ public DatabaseUtils build() {
                 actual = new DatabaseConfig(uri, username, password, connectionPoolSize);
             }
 
-            return new DatabaseUtils(new DatabaseContext(actual, poolName, dialect, executorService, registry));
+            return new DatabaseUtils(new DatabaseContext(actual, poolName, dialect, service, registry));
         }
     }
 }
diff --git a/core/src/test/java/org/geysermc/databaseutils/SqlTest.java b/core/src/test/java/org/geysermc/databaseutils/SqlTest.java
@@ -37,8 +37,6 @@ final class SqlTest {
     void hello() throws ExecutionException, InterruptedException {
         var utils = DatabaseUtils.builder()
                 .useDefaultCredentials(true)
-                .poolName("test")
-                .connectionPoolSize(2)
                 .dialect(SqlDialect.H2)
                 .executorService(Executors.newCachedThreadPool())
                 .build();