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 d5e8e858b..e9582d953 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 @@ -75,7 +75,6 @@ public abstract class SQLDB extends AbstractDatabase { private final KillsTable killsTable; private final NicknamesTable nicknamesTable; private final SessionsTable sessionsTable; - private final GeoInfoTable geoInfoTable; private final TPSTable tpsTable; private final SecurityTable securityTable; private final WorldTimesTable worldTimesTable; @@ -116,7 +115,6 @@ public abstract class SQLDB extends AbstractDatabase { usersTable = new UsersTable(this); userInfoTable = new UserInfoTable(this); - geoInfoTable = new GeoInfoTable(this); nicknamesTable = new NicknamesTable(this); sessionsTable = new SessionsTable(this); killsTable = new KillsTable(this); @@ -363,11 +361,6 @@ public abstract class SQLDB extends AbstractDatabase { return killsTable; } - @Deprecated - public GeoInfoTable getGeoInfoTable() { - return geoInfoTable; - } - @Deprecated public NicknamesTable getNicknamesTable() { return nicknamesTable; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java index ad355ed44..73b7932f2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java @@ -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.*; import com.djrapitops.plan.db.sql.parsing.CreateTableParser; import com.djrapitops.plan.db.sql.parsing.Sql; @@ -36,7 +35,7 @@ import com.djrapitops.plan.db.sql.parsing.Sql; * * @author Rsl1122 */ -public class GeoInfoTable extends Table { +public class GeoInfoTable { public static final String TABLE_NAME = "plan_ips"; @@ -61,8 +60,8 @@ public class GeoInfoTable extends Table { " AND " + IP_HASH + "=?" + " AND " + GEOLOCATION + "=?"; - public GeoInfoTable(SQLDB db) { - super(TABLE_NAME, db); + private GeoInfoTable() { + /* 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 995b453bc..096711106 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 @@ -29,7 +29,6 @@ public class SQLOps { protected final KillsTable killsTable; protected final NicknamesTable nicknamesTable; protected final SessionsTable sessionsTable; - protected final GeoInfoTable geoInfoTable; protected final TPSTable tpsTable; protected final SecurityTable securityTable; protected final WorldTimesTable worldTimesTable; @@ -45,7 +44,6 @@ public class SQLOps { killsTable = db.getKillsTable(); nicknamesTable = db.getNicknamesTable(); sessionsTable = db.getSessionsTable(); - geoInfoTable = db.getGeoInfoTable(); tpsTable = db.getTpsTable(); securityTable = db.getSecurityTable(); worldTimesTable = db.getWorldTimesTable(); 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 6fed389e7..934f240b1 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 @@ -498,7 +498,6 @@ public abstract class CommonDBTest { UsersTable usersTable = db.getUsersTable(); SessionsTable sessionsTable = db.getSessionsTable(); NicknamesTable nicknamesTable = db.getNicknamesTable(); - GeoInfoTable geoInfoTable = db.getGeoInfoTable(); usersTable.registerUser(playerUUID, 223456789L, "Test_name"); userInfoTable.registerUserInfo(playerUUID, 223456789L); @@ -551,7 +550,6 @@ public abstract class CommonDBTest { UserInfoTable userInfoTable = db.getUserInfoTable(); UsersTable usersTable = db.getUsersTable(); NicknamesTable nicknamesTable = db.getNicknamesTable(); - GeoInfoTable geoInfoTable = db.getGeoInfoTable(); TPSTable tpsTable = db.getTpsTable(); SecurityTable securityTable = db.getSecurityTable(); PingTable pingTable = db.getPingTable();