Improve player name mapper loading and add tests

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/profile/FlatFileProfileDataSource.java

@@ -315,8 +315,9 @@ private CompletableFuture<Void> modifyGlobalProfile(GlobalProfile globalProfile,
     @Override
     public CompletableFuture<Void> updateGlobalProfile(GlobalProfile globalProfile) {
         File globalFile = profileFilesLocator.getGlobalFile(globalProfile.getPlayerUUID().toString());
+        boolean didPlayerNameChange = playerNamesMapper.setPlayerName(globalProfile.getPlayerUUID(), globalProfile.getLastKnownName());
         return asyncFileIO.queueFileAction(globalFile, () -> processGlobalProfileWrite(globalProfile))
-                .thenCompose(ignore -> playerNamesMapper.setPlayerName(globalProfile.getPlayerUUID(), globalProfile.getLastKnownName())
+                .thenCompose(ignore -> didPlayerNameChange
                         ? asyncFileIO.queueFileAction(playerNamesMapper.getFile(), playerNamesMapper::savePlayerNames)
                         : CompletableFuture.completedFuture(null));
     }

src/main/java/org/mvplugins/multiverse/inventories/profile/PlayerNamesMapper.java

@@ -27,7 +27,6 @@ public final class PlayerNamesMapper {
 
     private static final String FILENAME = "playernames.json";
 
-    private final MultiverseInventories inventories;
     private final Provider<ProfileDataSource> profileDataSourceProvider;
     private final Provider<ProfileCacheManager> profileCacheManagerProvider;
 
@@ -43,7 +42,6 @@ public final class PlayerNamesMapper {
             @NotNull Provider<ProfileDataSource> profileDataSourceProvider,
             @NotNull Provider<ProfileCacheManager> profileCacheManagerProvider
     ) {
-        this.inventories = inventories;
         this.profileDataSourceProvider = profileDataSourceProvider;
         this.profileCacheManagerProvider = profileCacheManagerProvider;
 
@@ -92,30 +90,45 @@ private void buildPlayerNamesMap() {
                         .thenAccept(globalProfile -> setPlayerName(uuid, globalProfile.getLastKnownName())))
                 .toArray(CompletableFuture[]::new);
         CompletableFuture.allOf(futures).thenRun(this::savePlayerNames).join();
+        profileCacheManagerProvider.get().clearAllGlobalProfileCaches();
         Logging.info("Generated player names map.");
     }
 
     boolean setPlayerName(UUID uuid, String name) {
-        Logging.finer("Setting player name mapping for %s to %s", uuid, name);
+        if (playerNamesJson == null) {
+            throw new IllegalStateException("Player names mapper has not been loaded yet.");
+        }
         if (Strings.isNullOrEmpty(name)) {
             return false;
         }
         if (getKey(name).filter(g -> g.getPlayerUUID().equals(uuid)).isDefined()) {
             return false;
         }
+
+        Logging.finer("Setting player name mapping for %s to %s", uuid, name);
         GlobalProfileKey globalProfileKey = GlobalProfileKey.create(uuid, name);
-        playerNamesJson.put(uuid.toString(), name);
+
+        // Handle remove of old playername
+        Object oldName = playerNamesJson.put(uuid.toString(), name);
+        playerNamesMap.remove(String.valueOf(oldName));
+
         playerNamesMap.put(name, globalProfileKey);
         playerUUIDMap.put(uuid, globalProfileKey);
         return true;
     }
 
     void savePlayerNames() {
+        if (playerNamesJson == null) {
+            throw new IllegalStateException("Player names mapper has not been loaded yet.");
+        }
+
+        Logging.finer("Saving player names map...");
         try (FileWriter fileWriter = new FileWriter(playerNamesFile)) {
             fileWriter.write(JSONValue.toJSONString(playerNamesJson));
         } catch (Exception e) {
             e.printStackTrace();
         }
+        Logging.finer("Saving player names map... Done!");
     }
 
     File getFile() {

src/test/java/org/mvplugins/multiverse/inventories/profile/PlayerNameChangeTest.kt

@@ -11,22 +11,20 @@ import org.mvplugins.multiverse.inventories.profile.group.WorldGroupManager
 import org.mvplugins.multiverse.inventories.profile.key.GlobalProfileKey
 import org.mvplugins.multiverse.inventories.util.FutureNow
 import java.nio.file.Path
-import kotlin.test.BeforeTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertNotEquals
-import kotlin.test.assertTrue
+import kotlin.test.*
 
 class PlayerNameChangeTest : TestWithMockBukkit() {
 
     private lateinit var profileDataSource: ProfileDataSource
+    private lateinit var playerNamesMapper: PlayerNamesMapper
     private lateinit var player: PlayerMock
 
     @BeforeTest
     fun setUp() {
         profileDataSource = serviceLocator.getService(ProfileDataSource::class.java).takeIf { it != null } ?: run {
             throw IllegalStateException("ProfileDataSource is not available as a service") }
+        playerNamesMapper = serviceLocator.getService(PlayerNamesMapper::class.java).takeIf { it != null } ?: run {
+            throw IllegalStateException("PlayerNamesMapper is not available as a service") }
 
         val worldManager = serviceLocator.getActiveService(WorldManager::class.java).takeIf { it != null } ?: run {
             throw IllegalStateException("WorldManager is not available as a service") }
@@ -40,6 +38,7 @@ class PlayerNameChangeTest : TestWithMockBukkit() {
         assertTrue(worldGroupManager.load().isSuccess)
 
         player = server.addPlayer("Benji_0224")
+        assertEquals(GlobalProfileKey.create(player.uniqueId, "Benji_0224"), playerNamesMapper.getKey("Benji_0224").orNull)
     }
 
     @Test
@@ -81,5 +80,9 @@ class PlayerNameChangeTest : TestWithMockBukkit() {
 
         // check player profile
         assertEquals("benthecat10", FutureNow.get(profileDataSource.getGlobalProfile(GlobalProfileKey.create(player)))?.lastKnownName)
+
+        // check name mapper updated
+        assertEquals(GlobalProfileKey.create(player.uniqueId, "benthecat10"), playerNamesMapper.getKey("benthecat10").orNull)
+        assertNull(playerNamesMapper.getKey("Benji_0224").orNull)
     }
 }