GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-21 07:49:18 +00:00
Code Issues Releases Activity

Some more changes

Browse Source
This commit is contained in:
Tim203
2021-04-23 17:41:34 +02:00
parent f46791bd18
commit 2e88eaffa4
6 changed files with 111 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java
View File

@@ -54,17 +54,31 @@ public class MysqlDatabase extends CommonPlayerLink {
try {
Class.forName("org.mariadb.jdbc.Driver");
MysqlConfig databaseconfig = getConfig(MysqlConfig.class);
pool = new MariaDbPoolDataSource(
"jdbc:mariadb://" + databaseconfig.getHostname() + "/" +
databaseconfig.getDatabase() +
"?user=" + databaseconfig.getUsername() + "&password=" +
databaseconfig.getPassword() +
"&minPoolSize=2&maxPoolSize=10"
);
pool = new MariaDbPoolDataSource();
String hostname = databaseconfig.getHostname();
if (hostname.contains(":")) {
String[] split = hostname.split(":");
pool.setServerName(split[0]);
try {
pool.setPortNumber(Integer.parseInt(split[1]));
} catch (NumberFormatException exception) {
getLogger().info("{} is not a valid port! Will use the default port", split[1]);
}
} else {
pool.setServerName(hostname);
}
pool.setUser(databaseconfig.getUsername());
pool.setPassword(databaseconfig.getPassword());
pool.setDatabaseName(databaseconfig.getDatabase());
pool.setMinPoolSize(2);
pool.setMaxPoolSize(10);
try (Connection connection = pool.getConnection()) {
try (Statement statement = connection.createStatement()) {
statement.setQueryTimeout(25); // set timeout to 30 sec.
statement.executeUpdate(
"CREATE TABLE IF NOT EXISTS `LinkedPlayers` ( " +
"`bedrockId` BINARY(16) NOT NULL , " +
@@ -150,8 +164,10 @@ public class MysqlDatabase extends CommonPlayerLink {
@Override
@NonNull
public CompletableFuture<Void> linkPlayer(@NonNull UUID bedrockId, @NonNull UUID javaId,
@NonNull String javaUsername) {
public CompletableFuture<Void> linkPlayer(
@NonNull UUID bedrockId,
@NonNull UUID javaId,
@NonNull String javaUsername) {
return CompletableFuture.runAsync(
() -> linkPlayer0(bedrockId, javaId, javaUsername),
getExecutorService());
@@ -198,7 +214,8 @@ public class MysqlDatabase extends CommonPlayerLink {
@Override
@NonNull
public CompletableFuture<String> createLinkRequest(
@NonNull UUID javaId, @NonNull String javaUsername,
@NonNull UUID javaId,
@NonNull String javaUsername,
@NonNull String bedrockUsername) {
return CompletableFuture.supplyAsync(() -> {
String linkCode = createCode();
@@ -209,8 +226,11 @@ public class MysqlDatabase extends CommonPlayerLink {
}, getExecutorService());
}
private void createLinkRequest0(String javaUsername, UUID javaId, String linkCode,
String bedrockUsername) {
private void createLinkRequest0(
String javaUsername,
UUID javaId,
String linkCode,
String bedrockUsername) {
try (Connection connection = pool.getConnection()) {
try (PreparedStatement query = connection.prepareStatement(
"INSERT INTO `LinkedPlayersRequest` VALUES (?, ?, ?, ?, ?) " +