Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CharacterSaver integration test with Testcontainers

Browse Source
This commit is contained in:
P0nk
2024-09-15 09:25:35 +02:00
parent ce5dee39ae
commit 0c9643fd7e
12 changed files with 263 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/server/Server.java
View File

@@ -108,6 +108,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.SortedMap;
@@ -969,13 +970,9 @@ public class Server {
private PgDatabaseConfig readPgDbConfig() {
final ServerConfig serverConfig = YamlConfig.config.server;
String pgDbHost = System.getenv("PG_DB_HOST");
if (pgDbHost == null) {
pgDbHost = serverConfig.PG_DB_HOST;
}
String url = Objects.requireNonNullElse(System.getenv("PG_DB_URL"), serverConfig.PG_DB_URL);
return PgDatabaseConfig.builder()
.databaseName(serverConfig.PG_DB_NAME)
.host(pgDbHost)
.url(url)
.schema(serverConfig.PG_DB_SCHEMA)
.adminUsername(serverConfig.PG_DB_ADMIN_USERNAME)
.adminPassword(serverConfig.PG_DB_ADMIN_PASSWORD)
@@ -999,8 +996,7 @@ public class Server {
private HikariConfig createHikariConfig(PgDatabaseConfig config) {
final HikariConfig hikariConfig = new HikariConfig();
hikariConfig.setJdbcUrl(config.getJdbcUrl());
hikariConfig.setSchema(config.schema());
hikariConfig.setJdbcUrl(config.url());
hikariConfig.setUsername(config.username());
hikariConfig.setPassword(config.password());
hikariConfig.setInitializationFailTimeout(config.poolInitTimeout().toMillis());