Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-28 03:57:36 +01:00
Code Issues Projects Releases Wiki Activity

Print a more informative error when the port is missing from the address arg (#1022)

Browse Source
This commit is contained in:
Luck 2018-05-29 12:40:39 +01:00
parent b7de0e6901
commit adf0589184
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java
View File

@ -347,7 +347,8 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
*/ */
public static final class HikariSupplier implements AutoCloseable { public static final class HikariSupplier implements AutoCloseable {
private final String address; private final String host;
private final String port;
private final String database; private final String database;
private final String username; private final String username;
private final String password; private final String password;
@ -355,10 +356,17 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
private HikariDataSource hikari; private HikariDataSource hikari;
public HikariSupplier(String address, String database, String username, String password) { public HikariSupplier(String address, String database, String username, String password) {
this.address = address;
this.database = database; this.database = database;
this.username = username; this.username = username;
this.password = password; this.password = password;
String[] split = address.split(":");
if (split.length != 2) {
throw new IllegalArgumentException("Address argument should be in the format hostname:port");
}
this.host = split[0];
this.port = split[1];
} }
public void setup(String poolName) { public void setup(String poolName) {
@ -366,8 +374,8 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
this.hikari.setPoolName(poolName); this.hikari.setPoolName(poolName);
this.hikari.setMaximumPoolSize(2); this.hikari.setMaximumPoolSize(2);
this.hikari.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource"); this.hikari.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
this.hikari.addDataSourceProperty("serverName", this.address.split(":")[0]); this.hikari.addDataSourceProperty("serverName", this.host);
this.hikari.addDataSourceProperty("port", this.address.split(":")[1]); this.hikari.addDataSourceProperty("port", this.port);
this.hikari.addDataSourceProperty("databaseName", this.database); this.hikari.addDataSourceProperty("databaseName", this.database);
this.hikari.addDataSourceProperty("user", this.username); this.hikari.addDataSourceProperty("user", this.username);
this.hikari.addDataSourceProperty("password", this.password); this.hikari.addDataSourceProperty("password", this.password);