Finalized some fields, removed redundant code, various other fixes

This commit is contained in:
Tim Visée
2015-11-23 22:14:03 +01:00
parent 83e5d726af
commit 82bf0f45ca
64 changed files with 320 additions and 323 deletions
@@ -13,7 +13,7 @@ import java.util.concurrent.Executors;
public class DatabaseCalls implements DataSource {
private final ExecutorService exec;
private DataSource database;
private final DataSource database;
/**
* Constructor for DatabaseCalls.
@@ -25,7 +25,7 @@ public class FlatFile implements DataSource {
* :LASTPOSZ:LASTPOSWORLD PLAYERNAME:HASHSUM:IP:LOGININMILLIESECONDS
* PLAYERNAME:HASHSUM:IP PLAYERNAME:HASHSUM
*/
private File source;
private final File source;
public FlatFile() {
source = Settings.AUTH_FILE;
@@ -17,29 +17,29 @@ import java.util.List;
*/
public class MySQL implements DataSource {
private String host;
private String port;
private String username;
private String password;
private String database;
private String tableName;
private String columnName;
private String columnPassword;
private String columnIp;
private String columnLastLogin;
private String columnSalt;
private String columnGroup;
private String lastlocX;
private String lastlocY;
private String lastlocZ;
private String lastlocWorld;
private String columnEmail;
private String columnID;
private String columnLogged;
private List<String> columnOthers;
private final String host;
private final String port;
private final String username;
private final String password;
private final String database;
private final String tableName;
private final String columnName;
private final String columnPassword;
private final String columnIp;
private final String columnLastLogin;
private final String columnSalt;
private final String columnGroup;
private final String lastlocX;
private final String lastlocY;
private final String lastlocZ;
private final String lastlocWorld;
private final String columnEmail;
private final String columnID;
private final String columnLogged;
private final List<String> columnOthers;
private HikariDataSource ds;
private String columnRealName;
private int maxConnections;
private final String columnRealName;
private final int maxConnections;
/**
* Constructor for MySQL.
@@ -105,7 +105,7 @@ public class MySQL implements DataSource {
* @throws ClassNotFoundException * @throws IllegalArgumentException
*/
private synchronized void setConnectionArguments()
throws ClassNotFoundException, IllegalArgumentException {
throws IllegalArgumentException {
HikariConfig config = new HikariConfig();
config.setPoolName("AuthMeMYSQLPool");
config.setDriverClassName("com.mysql.jdbc.Driver");
@@ -12,23 +12,23 @@ import java.util.List;
*/
public class SQLite implements DataSource {
private String database;
private String tableName;
private String columnName;
private String columnPassword;
private String columnIp;
private String columnLastLogin;
private String columnSalt;
private String columnGroup;
private String lastlocX;
private String lastlocY;
private String lastlocZ;
private String lastlocWorld;
private String columnEmail;
private String columnID;
private final String database;
private final String tableName;
private final String columnName;
private final String columnPassword;
private final String columnIp;
private final String columnLastLogin;
private final String columnSalt;
private final String columnGroup;
private final String lastlocX;
private final String lastlocY;
private final String lastlocZ;
private final String lastlocWorld;
private final String columnEmail;
private final String columnID;
private Connection con;
private String columnLogged;
private String columnRealName;
private final String columnLogged;
private final String columnRealName;
/**
* Constructor for SQLite.