From 81b992505718215c996fc28ee3e7c84e709705df Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 16 Feb 2019 12:05:06 +0200 Subject: [PATCH] UsersTable now a static information class: - Made constructor private - Removed getter in SQLDB --- .../main/java/com/djrapitops/plan/db/SQLDB.java | 8 -------- .../plan/db/sql/tables/UsersTable.java | 16 +++++++++------- .../database/databases/sql/operation/SQLOps.java | 3 --- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java index 24bb8a7ef..63d125dbd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java @@ -29,7 +29,6 @@ import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; import com.djrapitops.plan.db.patches.*; import com.djrapitops.plan.db.sql.tables.TPSTable; 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.system.database.databases.operation.FetchOperations; 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 ErrorHandler errorHandler; - private final UsersTable usersTable; private final UserInfoTable userInfoTable; private final TPSTable tpsTable; @@ -103,7 +101,6 @@ public abstract class SQLDB extends AbstractDatabase { tpsTable = new TPSTable(this); - usersTable = new UsersTable(this); userInfoTable = new UserInfoTable(this); fetchOps = new SQLFetchOps(this); @@ -327,11 +324,6 @@ public abstract class SQLDB extends AbstractDatabase { transaction.executeTransaction(this); } - @Deprecated - public UsersTable getUsersTable() { - return usersTable; - } - @Deprecated public TPSTable getTpsTable() { return tpsTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java index cba508a7b..bf1df723e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java @@ -17,19 +17,21 @@ package com.djrapitops.plan.db.sql.tables; 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.Insert; import com.djrapitops.plan.db.sql.parsing.Sql; /** - * Table that is in charge of storing common player data for all servers. - *

- * Table Name: plan_users + * Table information about '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 */ -public class UsersTable extends Table { +public class UsersTable { 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 UsersTable(SQLDB db) { - super(TABLE_NAME, db); + private UsersTable() { + /* Static information class */ } public static String createTableSQL(DBType dbType) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java index e1e7fbab1..e816e0246 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java @@ -19,21 +19,18 @@ package com.djrapitops.plan.system.database.databases.sql.operation; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.sql.tables.TPSTable; import com.djrapitops.plan.db.sql.tables.UserInfoTable; -import com.djrapitops.plan.db.sql.tables.UsersTable; @Deprecated public class SQLOps { protected final SQLDB db; - protected final UsersTable usersTable; protected final UserInfoTable userInfoTable; protected final TPSTable tpsTable; public SQLOps(SQLDB db) { this.db = db; - usersTable = db.getUsersTable(); userInfoTable = db.getUserInfoTable(); tpsTable = db.getTpsTable(); }