Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-01 16:07:27 +02:00
Code Issues Projects Releases Wiki Activity

Made NicknamesTable static information class

Browse Source 
- Made constructor private
- Removed getter in SQLDB
This commit is contained in:
Rsl1122 2019-02-05 12:14:47 +02:00
parent 64a3bc3fe0
commit 2d07f27449
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
View File

@ -77,7 +77,6 @@ public abstract class SQLDB extends AbstractDatabase {
private final UsersTable usersTable;
private final UserInfoTable userInfoTable;
private final KillsTable killsTable;
private final NicknamesTable nicknamesTable;
private final SessionsTable sessionsTable;
private final TPSTable tpsTable;
private final WorldTimesTable worldTimesTable;
@ -114,7 +113,6 @@ public abstract class SQLDB extends AbstractDatabase {
usersTable = new UsersTable(this);
userInfoTable = new UserInfoTable(this);
nicknamesTable = new NicknamesTable(this);
sessionsTable = new SessionsTable(this);
killsTable = new KillsTable(this);
worldTimesTable = new WorldTimesTable(this);
@ -357,11 +355,6 @@ public abstract class SQLDB extends AbstractDatabase {
return killsTable;
}
@Deprecated
public NicknamesTable getNicknamesTable() {
return nicknamesTable;
}
@Deprecated
public TPSTable getTpsTable() {
return tpsTable;

3
Plan/common/src/main/java/com/djrapitops/plan/db/patches/Version10Patch.java
View File

@ -76,8 +76,7 @@ public class Version10Patch extends Patch {
renameTable("plan_users", tempTableName);
String tempNickTableName = "temp_nicks";
NicknamesTable nicknamesTable = db.getNicknamesTable();
renameTable(nicknamesTable.toString(), tempNickTableName);
renameTable(NicknamesTable.TABLE_NAME, tempNickTableName);
String tempKillsTableName = "temp_kills";
renameTable(KillsTable.TABLE_NAME, tempKillsTableName);

11
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/NicknamesTable.java
View File

@ -17,7 +17,6 @@
package com.djrapitops.plan.db.sql.tables;
import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.patches.NicknameLastSeenPatch;
import com.djrapitops.plan.db.patches.NicknamesOptimizationPatch;
import com.djrapitops.plan.db.patches.Version10Patch;
@ -25,9 +24,7 @@ import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
import com.djrapitops.plan.db.sql.parsing.Sql;
/**
* Table that is in charge of storing nickname data.
* <p>
* Table Name: plan_nicknames
* Table information about 'plan_nicknames'.
* <p>
* Patches related to this table:
* {@link Version10Patch}
@ -36,7 +33,7 @@ import com.djrapitops.plan.db.sql.parsing.Sql;
*
* @author Rsl1122
*/
public class NicknamesTable extends Table {
public class NicknamesTable {
public static final String TABLE_NAME = "plan_nicknames";
@ -58,8 +55,8 @@ public class NicknamesTable extends Table {
" AND " + USER_UUID + "=?" +
" AND " + SERVER_UUID + "=?";
public NicknamesTable(SQLDB db) {
super(TABLE_NAME, db);
private NicknamesTable() {
/* Static information class */
}
public static String createTableSQL(DBType dbType) {

3
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
View File

@ -209,11 +209,10 @@ public class UsersTable extends Table {
*/
public List<String> getMatchingNames(String name) {
String searchString = "%" + name + "%";
NicknamesTable nicknamesTable = db.getNicknamesTable();
String sql = "SELECT DISTINCT " + USER_NAME + " FROM " + tableName +
" WHERE LOWER(" + USER_NAME + ") LIKE LOWER(?)" +
" UNION SELECT DISTINCT " + USER_NAME + " FROM " + tableName +
" INNER JOIN " + nicknamesTable + " on " + tableName + "." + USER_UUID + "=" + nicknamesTable + "." + NicknamesTable.USER_UUID +
" INNER JOIN " + NicknamesTable.TABLE_NAME + " on " + tableName + "." + USER_UUID + "=" + NicknamesTable.TABLE_NAME + "." + NicknamesTable.USER_UUID +
" WHERE LOWER(" + NicknamesTable.NICKNAME + ") LIKE LOWER(?)";
return query(new QueryStatement<List<String>>(sql, 5000) {

2
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java
View File

@ -27,7 +27,6 @@ public class SQLOps {
protected final UsersTable usersTable;
protected final UserInfoTable userInfoTable;
protected final KillsTable killsTable;
protected final NicknamesTable nicknamesTable;
protected final SessionsTable sessionsTable;
protected final TPSTable tpsTable;
protected final WorldTimesTable worldTimesTable;
@ -40,7 +39,6 @@ public class SQLOps {
usersTable = db.getUsersTable();
userInfoTable = db.getUserInfoTable();
killsTable = db.getKillsTable();
nicknamesTable = db.getNicknamesTable();
sessionsTable = db.getSessionsTable();
tpsTable = db.getTpsTable();
worldTimesTable = db.getWorldTimesTable();