Cleanup powerfulperms migration & remove support for older PP versions
This commit is contained in:
@@ -56,7 +56,7 @@ public class DependencyManager {
|
||||
}
|
||||
}
|
||||
|
||||
private static final Map<StorageType, List<Dependency>> STORAGE_DEPENDENCIES = ImmutableMap.<StorageType, List<Dependency>>builder()
|
||||
public static final Map<StorageType, List<Dependency>> STORAGE_DEPENDENCIES = ImmutableMap.<StorageType, List<Dependency>>builder()
|
||||
.put(StorageType.JSON, ImmutableList.of())
|
||||
.put(StorageType.YAML, ImmutableList.of())
|
||||
.put(StorageType.MONGODB, ImmutableList.of(Dependency.MONGODB_DRIVER))
|
||||
@@ -78,6 +78,10 @@ public class DependencyManager {
|
||||
dependencies.add(Dependency.JEDIS);
|
||||
}
|
||||
|
||||
loadDependencies(plugin, dependencies);
|
||||
}
|
||||
|
||||
public static void loadDependencies(LuckPermsPlugin plugin, List<Dependency> dependencies) {
|
||||
plugin.getLog().info("Identified the following dependencies: " + dependencies.toString());
|
||||
|
||||
File data = new File(plugin.getDataDirectory(), "lib");
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package me.lucko.luckperms.common.utils;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
import com.zaxxer.hikari.HikariDataSource;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public class HikariSupplier implements AutoCloseable {
|
||||
|
||||
private final String address;
|
||||
private final String database;
|
||||
private final String username;
|
||||
private final String password;
|
||||
|
||||
private HikariDataSource hikari;
|
||||
|
||||
public void setup() {
|
||||
hikari = new HikariDataSource();
|
||||
hikari.setPoolName("powerfulperms-migrator-pool");
|
||||
hikari.setMaximumPoolSize(2);
|
||||
hikari.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
|
||||
hikari.addDataSourceProperty("serverName", address.split(":")[0]);
|
||||
hikari.addDataSourceProperty("port", address.split(":")[1]);
|
||||
hikari.addDataSourceProperty("databaseName", database);
|
||||
hikari.addDataSourceProperty("user", username);
|
||||
hikari.addDataSourceProperty("password", password);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
hikari.close();
|
||||
}
|
||||
|
||||
public Connection getConnection() throws SQLException {
|
||||
return hikari.getConnection();
|
||||
}
|
||||
}
|
||||
@@ -84,6 +84,10 @@ public class ProgressLogger {
|
||||
}
|
||||
|
||||
public void handleException(Exception ex) {
|
||||
handleAndPrintException(ex);
|
||||
}
|
||||
|
||||
public static void handleAndPrintException(Exception ex) {
|
||||
if (ex instanceof ObjectAlreadyHasException || ex instanceof ObjectLacksException) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user