Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-14 15:57:50 +02:00
Code Issues Projects Releases Wiki Activity

UsersTable now a static information class:

Browse Source 
- Made constructor private
- Removed getter in SQLDB
This commit is contained in:
Rsl1122 2019-02-16 12:05:06 +02:00
parent 70e83a12b4
commit 81b9925057
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction;
import com.djrapitops.plan.db.patches.*; import com.djrapitops.plan.db.patches.*;
import com.djrapitops.plan.db.sql.tables.TPSTable; import com.djrapitops.plan.db.sql.tables.TPSTable;
import com.djrapitops.plan.db.sql.tables.UserInfoTable; import com.djrapitops.plan.db.sql.tables.UserInfoTable;
import com.djrapitops.plan.db.sql.tables.UsersTable;
import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.db.tasks.PatchTask;
import com.djrapitops.plan.system.database.databases.operation.FetchOperations; import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
import com.djrapitops.plan.system.database.databases.operation.SaveOperations; import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
@ -74,7 +73,6 @@ public abstract class SQLDB extends AbstractDatabase {
protected final Timings timings; protected final Timings timings;
protected final ErrorHandler errorHandler; protected final ErrorHandler errorHandler;
private final UsersTable usersTable;
private final UserInfoTable userInfoTable; private final UserInfoTable userInfoTable;
private final TPSTable tpsTable; private final TPSTable tpsTable;
@ -103,7 +101,6 @@ public abstract class SQLDB extends AbstractDatabase {
tpsTable = new TPSTable(this); tpsTable = new TPSTable(this);
usersTable = new UsersTable(this);
userInfoTable = new UserInfoTable(this); userInfoTable = new UserInfoTable(this);
fetchOps = new SQLFetchOps(this); fetchOps = new SQLFetchOps(this);
@ -327,11 +324,6 @@ public abstract class SQLDB extends AbstractDatabase {
transaction.executeTransaction(this); transaction.executeTransaction(this);
} }
@Deprecated
public UsersTable getUsersTable() {
return usersTable;
}
@Deprecated @Deprecated
public TPSTable getTpsTable() { public TPSTable getTpsTable() {
return tpsTable; return tpsTable;

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

@ -17,19 +17,21 @@
package com.djrapitops.plan.db.sql.tables; package com.djrapitops.plan.db.sql.tables;
import com.djrapitops.plan.db.DBType; import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.sql.parsing.CreateTableParser; import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
import com.djrapitops.plan.db.sql.parsing.Insert; import com.djrapitops.plan.db.sql.parsing.Insert;
import com.djrapitops.plan.db.sql.parsing.Sql; import com.djrapitops.plan.db.sql.parsing.Sql;
/** /**
* Table that is in charge of storing common player data for all servers. * Table information about 'plan_users'.
* <p> *
* Table Name: plan_users * This table is used to store Player information that applies to all servers.
*
* Patches that apply to this table:
* {@link com.djrapitops.plan.db.patches.Version10Patch}
* *
* @author Rsl1122 * @author Rsl1122
*/ */
public class UsersTable extends Table { public class UsersTable {
public static final String TABLE_NAME = "plan_users"; public static final String TABLE_NAME = "plan_users";
@ -41,8 +43,8 @@ public class UsersTable extends Table {
public static final String INSERT_STATEMENT = Insert.values(TABLE_NAME, USER_UUID, USER_NAME, REGISTERED, TIMES_KICKED); public static final String INSERT_STATEMENT = Insert.values(TABLE_NAME, USER_UUID, USER_NAME, REGISTERED, TIMES_KICKED);
public UsersTable(SQLDB db) { private UsersTable() {
super(TABLE_NAME, db); /* Static information class */
} }
public static String createTableSQL(DBType dbType) { public static String createTableSQL(DBType dbType) {

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

@ -19,21 +19,18 @@ package com.djrapitops.plan.system.database.databases.sql.operation;
import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.sql.tables.TPSTable; import com.djrapitops.plan.db.sql.tables.TPSTable;
import com.djrapitops.plan.db.sql.tables.UserInfoTable; import com.djrapitops.plan.db.sql.tables.UserInfoTable;
import com.djrapitops.plan.db.sql.tables.UsersTable;
@Deprecated @Deprecated
public class SQLOps { public class SQLOps {
protected final SQLDB db; protected final SQLDB db;
protected final UsersTable usersTable;
protected final UserInfoTable userInfoTable; protected final UserInfoTable userInfoTable;
protected final TPSTable tpsTable; protected final TPSTable tpsTable;
public SQLOps(SQLDB db) { public SQLOps(SQLDB db) {
this.db = db; this.db = db;
usersTable = db.getUsersTable();
userInfoTable = db.getUserInfoTable(); userInfoTable = db.getUserInfoTable();
tpsTable = db.getTpsTable(); tpsTable = db.getTpsTable();
} }