From f9136d390ae7c20194880278c4c91a35a39e1f40 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 2 Feb 2019 11:59:42 +0200 Subject: [PATCH] SecurityTable now static info class - Made constructor private - Removed getter from SQLDB --- .../src/main/java/com/djrapitops/plan/db/SQLDB.java | 7 ------- .../plan/db/sql/tables/SecurityTable.java | 13 ++++--------- .../database/databases/sql/operation/SQLOps.java | 2 -- .../java/com/djrapitops/plan/db/CommonDBTest.java | 1 - 4 files changed, 4 insertions(+), 19 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 66e12ac72..880289b05 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 @@ -80,7 +80,6 @@ public abstract class SQLDB extends AbstractDatabase { private final NicknamesTable nicknamesTable; private final SessionsTable sessionsTable; private final TPSTable tpsTable; - private final SecurityTable securityTable; private final WorldTimesTable worldTimesTable; private final ServerTable serverTable; private final SettingsTable settingsTable; @@ -110,7 +109,6 @@ public abstract class SQLDB extends AbstractDatabase { this.errorHandler = errorHandler; serverTable = new ServerTable(this); - securityTable = new SecurityTable(this); tpsTable = new TPSTable(this); @@ -369,11 +367,6 @@ public abstract class SQLDB extends AbstractDatabase { return tpsTable; } - @Deprecated - public SecurityTable getSecurityTable() { - return securityTable; - } - @Deprecated public WorldTimesTable getWorldTimesTable() { return worldTimesTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SecurityTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SecurityTable.java index c1eb0f09a..ff43fac70 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SecurityTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SecurityTable.java @@ -16,22 +16,17 @@ */ package com.djrapitops.plan.db.sql.tables; -import com.djrapitops.plan.data.WebUser; 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 WebUser data. - *

- * Table Name: plan_security + * Table information about 'plan_security' * * @author Rsl1122 - * @see WebUser */ -public class SecurityTable extends Table { +public class SecurityTable { public static final String TABLE_NAME = "plan_security"; @@ -41,8 +36,8 @@ public class SecurityTable extends Table { public static final String INSERT_STATEMENT = Insert.values(TABLE_NAME, USERNAME, SALT_PASSWORD_HASH, PERMISSION_LEVEL); - public SecurityTable(SQLDB db) { - super(TABLE_NAME, db); + private SecurityTable() { + /* 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 23da74abd..d6f859b6f 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 @@ -30,7 +30,6 @@ public class SQLOps { protected final NicknamesTable nicknamesTable; protected final SessionsTable sessionsTable; protected final TPSTable tpsTable; - protected final SecurityTable securityTable; protected final WorldTimesTable worldTimesTable; protected final ServerTable serverTable; protected final SettingsTable settingsTable; @@ -44,7 +43,6 @@ public class SQLOps { nicknamesTable = db.getNicknamesTable(); sessionsTable = db.getSessionsTable(); tpsTable = db.getTpsTable(); - securityTable = db.getSecurityTable(); worldTimesTable = db.getWorldTimesTable(); serverTable = db.getServerTable(); settingsTable = db.getSettingsTable(); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java index f20cd1753..45964fcfe 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java @@ -519,7 +519,6 @@ public abstract class CommonDBTest { private void saveAllData() throws NoSuchAlgorithmException { NicknamesTable nicknamesTable = db.getNicknamesTable(); TPSTable tpsTable = db.getTpsTable(); - SecurityTable securityTable = db.getSecurityTable(); saveUserOne(); saveUserTwo();