diff --git a/Plan/common/src/main/java/com/djrapitops/plan/data/container/UserInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/data/container/UserInfo.java index f076f290f..562e209f2 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/data/container/UserInfo.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/data/container/UserInfo.java @@ -20,7 +20,10 @@ import java.util.Objects; import java.util.UUID; /** - * Used for storing information of players after it has been fetched. + * Represents user information stored in plan_user_info. + *

+ * Unlike {@link BaseUser} one instance is stored per server for a single player. + * Proxy servers are an exception, and UserInfo is not stored for them. * * @author Rsl1122 */ diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java index 0192ce43b..2b3295772 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java @@ -73,9 +73,6 @@ public interface SaveOperations { @Deprecated void playerWasKicked(UUID uuid); - @Deprecated - void playerName(UUID uuid, String playerName); - @Deprecated void playerDisplayName(UUID uuid, Nickname nickname); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java index 76e64e391..1e73bcc94 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java @@ -142,11 +142,6 @@ public class SQLSaveOps extends SQLOps implements SaveOperations { usersTable.kicked(uuid); } - @Override - public void playerName(UUID uuid, String playerName) { - usersTable.updateName(uuid, playerName); - } - @Override public void playerDisplayName(UUID uuid, Nickname nickname) { nicknamesTable.saveUserName(uuid, nickname); 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 18cf493c1..cd51c6c15 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 @@ -265,11 +265,11 @@ public abstract class CommonDBTest { @Test public void webUserIsRegistered() throws DBInitException { - WebUser expected = new WebUser("Test", "RandomGarbageBlah", 0); + WebUser expected = new WebUser(TestConstants.PLAYER_ONE_NAME, "RandomGarbageBlah", 0); db.getSecurityTable().addNewUser(expected); commitTest(); - Optional found = db.query(OptionalFetchQueries.fetchWebUser("Test")); + Optional found = db.query(OptionalFetchQueries.fetchWebUser(TestConstants.PLAYER_ONE_NAME)); assertTrue(found.isPresent()); assertEquals(expected, found.get()); } @@ -283,8 +283,8 @@ public abstract class CommonDBTest { @Test public void webUserIsRemoved() throws DBInitException { webUserIsRegistered(); - db.getSecurityTable().removeUser("Test"); - assertFalse(db.query(OptionalFetchQueries.fetchWebUser("Test")).isPresent()); + db.getSecurityTable().removeUser(TestConstants.PLAYER_ONE_NAME); + assertFalse(db.query(OptionalFetchQueries.fetchWebUser(TestConstants.PLAYER_ONE_NAME)).isPresent()); } @Test @@ -400,7 +400,7 @@ public abstract class CommonDBTest { saveUserOne(); List userInfo = db.query(PlayerFetchQueries.playerServerSpecificUserInformation(playerUUID)); - List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 223456789L, false, false)); + List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 1000L, false, false)); assertEquals(expected, userInfo); } @@ -412,7 +412,7 @@ public abstract class CommonDBTest { db.getUserInfoTable().updateBanStatus(playerUUID, true); List userInfo = db.query(PlayerFetchQueries.playerServerSpecificUserInformation(playerUUID)); - List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 223456789L, false, true)); + List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 1000L, false, true)); assertEquals(expected, userInfo); } @@ -424,7 +424,7 @@ public abstract class CommonDBTest { db.getUserInfoTable().updateOpStatus(playerUUID, true); List userInfo = db.query(PlayerFetchQueries.playerServerSpecificUserInformation(playerUUID)); - List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 223456789L, true, false)); + List expected = Collections.singletonList(new UserInfo(playerUUID, serverUUID, 1000L, true, false)); assertEquals(expected, userInfo); } @@ -435,12 +435,12 @@ public abstract class CommonDBTest { UsersTable usersTable = db.getUsersTable(); - assertEquals(playerUUID, usersTable.getUuidOf("Test")); - usersTable.updateName(playerUUID, "NewName"); + assertEquals(playerUUID, usersTable.getUuidOf(TestConstants.PLAYER_ONE_NAME)); + db.executeTransaction(new PlayerRegisterTransaction(playerUUID, () -> 0, "NewName")); commitTest(); - assertNull(usersTable.getUuidOf("Test")); + assertNull(usersTable.getUuidOf(TestConstants.PLAYER_ONE_NAME)); assertEquals("NewName", usersTable.getPlayerName(playerUUID)); assertEquals(playerUUID, usersTable.getUuidOf("NewName")); @@ -516,8 +516,6 @@ public abstract class CommonDBTest { } private void saveAllData() throws NoSuchAlgorithmException { - UserInfoTable userInfoTable = db.getUserInfoTable(); - UsersTable usersTable = db.getUsersTable(); NicknamesTable nicknamesTable = db.getNicknamesTable(); TPSTable tpsTable = db.getTpsTable(); SecurityTable securityTable = db.getSecurityTable(); @@ -569,7 +567,7 @@ public abstract class CommonDBTest { r.nextInt(), r.nextInt(), r.nextDouble() )); - securityTable.addNewUser(new WebUser("Test", "RandomGarbageBlah", 0)); + securityTable.addNewUser(new WebUser(TestConstants.PLAYER_ONE_NAME, "RandomGarbageBlah", 0)); } void saveGeoInfo(UUID uuid, GeoInfo geoInfo) { @@ -759,7 +757,7 @@ public abstract class CommonDBTest { @Test public void playerIsRegisteredToUsersTable() { assertFalse(db.query(PlayerFetchQueries.isPlayerRegistered(playerUUID))); - db.executeTransaction(new PlayerRegisterTransaction(playerUUID, () -> 1000L, "name")); + db.executeTransaction(new PlayerRegisterTransaction(playerUUID, () -> 1000L, TestConstants.PLAYER_ONE_NAME)); assertTrue(db.query(PlayerFetchQueries.isPlayerRegistered(playerUUID))); assertFalse(db.query(PlayerFetchQueries.isPlayerRegisteredOnServer(playerUUID, serverUUID))); } @@ -768,7 +766,7 @@ public abstract class CommonDBTest { public void playerIsRegisteredToBothTables() { assertFalse(db.query(PlayerFetchQueries.isPlayerRegistered(playerUUID))); assertFalse(db.query(PlayerFetchQueries.isPlayerRegisteredOnServer(playerUUID, serverUUID))); - db.executeTransaction(new PlayerServerRegisterTransaction(playerUUID, () -> 1000L, "name", serverUUID)); + db.executeTransaction(new PlayerServerRegisterTransaction(playerUUID, () -> 1000L, TestConstants.PLAYER_ONE_NAME, serverUUID)); assertTrue(db.query(PlayerFetchQueries.isPlayerRegistered(playerUUID))); assertTrue(db.query(PlayerFetchQueries.isPlayerRegisteredOnServer(playerUUID, serverUUID))); } @@ -811,8 +809,8 @@ public abstract class CommonDBTest { assertFalse("Took too long: " + ((end - start) / 1000000.0) + "ms", end - start > TimeUnit.SECONDS.toNanos(1L)); OptionalAssert.equals(playerUUID, container.getValue(PlayerKeys.UUID)); - OptionalAssert.equals(123456789L, container.getValue(PlayerKeys.REGISTERED)); - OptionalAssert.equals("Test", container.getValue(PlayerKeys.NAME)); + OptionalAssert.equals(1000L, container.getValue(PlayerKeys.REGISTERED)); + OptionalAssert.equals(TestConstants.PLAYER_ONE_NAME, container.getValue(PlayerKeys.NAME)); OptionalAssert.equals(1, container.getValue(PlayerKeys.KICK_COUNT)); List expectedGeoInfo = diff --git a/Plan/common/src/test/java/utilities/TestConstants.java b/Plan/common/src/test/java/utilities/TestConstants.java index 2d7be77e4..a19daaccd 100644 --- a/Plan/common/src/test/java/utilities/TestConstants.java +++ b/Plan/common/src/test/java/utilities/TestConstants.java @@ -29,6 +29,8 @@ public class TestConstants { public static final UUID PLAYER_ONE_UUID = UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db"); public static final UUID PLAYER_TWO_UUID = UUID.fromString("ec94a954-1fa1-445b-b09b-9b698519af80"); + public static final String PLAYER_ONE_NAME = "Test_Player_one"; + public static final int BUKKIT_MAX_PLAYERS = 20; public static final int BUNGEE_MAX_PLAYERS = 100;