Refactor ProfileData classes to separate package

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/dataimport/multiinv/MultiInvImportHelper.java

@@ -8,7 +8,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
 import org.mvplugins.multiverse.inventories.dataimport.DataImportException;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileTypes;
 import org.mvplugins.multiverse.inventories.profile.key.ContainerType;

src/main/java/org/mvplugins/multiverse/inventories/dataimport/perworldinventory/PwiImportHelper.java

@@ -25,7 +25,7 @@
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
 import org.mvplugins.multiverse.inventories.dataimport.DataImportException;
 import org.mvplugins.multiverse.inventories.profile.GlobalProfile;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.profile.key.GlobalProfileKey;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileTypes;

src/main/java/org/mvplugins/multiverse/inventories/dataimport/worldinventories/WorldInventoriesImportHelper.java

@@ -11,7 +11,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
 import org.mvplugins.multiverse.inventories.dataimport.DataImportException;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileTypes;
 import org.mvplugins.multiverse.inventories.profile.key.ContainerType;

src/main/java/org/mvplugins/multiverse/inventories/handleshare/AffectedProfiles.java

@@ -1,12 +1,10 @@
 package org.mvplugins.multiverse.inventories.handleshare;
 
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileKey;
 import org.mvplugins.multiverse.inventories.share.Shares;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 public final class AffectedProfiles {
 

src/main/java/org/mvplugins/multiverse/inventories/handleshare/PersistingProfile.java

@@ -1,11 +1,9 @@
 package org.mvplugins.multiverse.inventories.handleshare;
 
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileKey;
 import org.mvplugins.multiverse.inventories.share.Shares;
 
-import java.util.concurrent.CompletableFuture;
-
 /**
  * Simple class for groups that are going to be saved/loaded. This is used specifically for when a user's world
  * change is being handled.

src/main/java/org/mvplugins/multiverse/inventories/handleshare/ShareHandleListener.java

@@ -15,7 +15,7 @@
 import org.mvplugins.multiverse.inventories.profile.container.ProfileContainerStoreProvider;
 import org.mvplugins.multiverse.inventories.profile.group.WorldGroup;
 import org.mvplugins.multiverse.inventories.profile.GlobalProfile;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.container.ProfileContainer;
 import org.mvplugins.multiverse.inventories.profile.group.WorldGroupManager;
 import org.mvplugins.multiverse.inventories.share.Sharables;

src/main/java/org/mvplugins/multiverse/inventories/handleshare/ShareHandler.java

@@ -4,7 +4,7 @@
 import org.mvplugins.multiverse.inventories.MultiverseInventories;
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
 import org.mvplugins.multiverse.inventories.event.ShareHandlingEvent;
-import org.mvplugins.multiverse.inventories.profile.ProfileDataSnapshot;
+import org.mvplugins.multiverse.inventories.profile.data.ProfileDataSnapshot;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.profile.key.ContainerType;
 import org.mvplugins.multiverse.inventories.profile.container.ProfileContainerStore;
@@ -13,9 +13,6 @@
 import org.mvplugins.multiverse.inventories.share.Sharables;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.mvplugins.multiverse.inventories.util.FutureNow;
-
-import java.util.concurrent.CompletableFuture;
 
 /**
  * Abstract class for handling sharing of data between worlds and game modes.

src/main/java/org/mvplugins/multiverse/inventories/handleshare/ShareHandlingUpdater.java

@@ -3,7 +3,6 @@
 import com.dumptruckman.minecraft.util.Logging;
 import org.mvplugins.multiverse.external.vavr.control.Try;
 import org.mvplugins.multiverse.inventories.MultiverseInventories;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.share.Sharable;
 import org.bukkit.entity.Player;
@@ -12,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
 
 public final class ShareHandlingUpdater {
 

src/main/java/org/mvplugins/multiverse/inventories/handleshare/SingleShareWriter.java

@@ -5,7 +5,7 @@
 import org.bukkit.entity.Player;
 import org.mvplugins.multiverse.inventories.MultiverseInventories;
 import org.mvplugins.multiverse.inventories.config.InventoriesConfig;
-import org.mvplugins.multiverse.inventories.profile.PlayerProfile;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.ProfileDataSource;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileType;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileTypes;

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

@@ -9,6 +9,7 @@
 import org.mvplugins.multiverse.external.jakarta.inject.Inject;
 import org.mvplugins.multiverse.external.vavr.control.Option;
 import org.mvplugins.multiverse.external.vavr.control.Try;
+import org.mvplugins.multiverse.inventories.profile.data.PlayerProfile;
 import org.mvplugins.multiverse.inventories.profile.key.GlobalProfileKey;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileFileKey;
 import org.mvplugins.multiverse.inventories.profile.key.ProfileKey;
@@ -17,7 +18,6 @@
 import org.mvplugins.multiverse.inventories.profile.key.ContainerType;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.mvplugins.multiverse.inventories.util.DataStrings;
 
 import java.io.File;
 import java.io.IOException;
@@ -87,7 +87,7 @@ public CompletableFuture<PlayerProfile> getPlayerProfile(ProfileKey profileKey)
                 File playerFile = profileFilesLocator.getPlayerProfileFile(profileKey);
                 if (!playerFile.exists()) {
                     Logging.fine("Not found on disk: %s", playerFile);
-                    return CompletableFuture.completedFuture(PlayerProfile.createPlayerProfile(key));
+                    return CompletableFuture.completedFuture(PlayerProfile.newProfile(key));
                 }
                 Logging.finer("%s not cached. loading from disk...", profileKey);
                 return asyncFileIO.queueFileCallable(playerFile, () -> getPlayerProfileFromDisk(key, playerFile));
@@ -101,38 +101,13 @@ public CompletableFuture<PlayerProfile> getPlayerProfile(ProfileKey profileKey)
 
     private PlayerProfile getPlayerProfileFromDisk(ProfileKey key, File playerFile) {
         FileConfiguration playerData = getOrLoadPlayerProfileFile(key, playerFile);
-
-        // Migrate from none profile-type data
-        if (migrateToProfileType(playerData)) {
-            try {
-                playerData.save(playerFile);
-            } catch (IOException e) {
-                Logging.severe("Could not save data for player: " + key.getPlayerName()
-                        + " for " + key.getContainerType().toString() + ": " + key.getDataName() + " after conversion.");
-                e.printStackTrace();
-            }
-        }
-
         ConfigurationSection section = playerData.getConfigurationSection(key.getProfileType().getName());
-        if (section == null) {
-            section = playerData.createSection(key.getProfileType().getName());
+        if (section == null || section.getKeys(false).isEmpty()) {
+            return PlayerProfile.newProfile(key);
         }
         return PlayerProfileJsonSerializer.deserialize(key, convertSection(section));
     }
 
-    private boolean migrateToProfileType(FileConfiguration config) {
-        ConfigurationSection section = config.getConfigurationSection(DataStrings.PLAYER_DATA);
-        if (section == null) {
-            return false;
-        }
-        config.set(ProfileTypes.SURVIVAL.getName(), section);
-        config.set(ProfileTypes.CREATIVE.getName(), section);
-        config.set(ProfileTypes.ADVENTURE.getName(), section);
-        config.set(DataStrings.PLAYER_DATA, null);
-        Logging.finer("Migrated old player data to new multi-profile format");
-        return true;
-    }
-
     private Map<String, Object> convertSection(ConfigurationSection section) {
         Set<String> keys = section.getKeys(false);
         Map<String, Object> resultMap = new HashMap<>(keys.size());
@@ -188,6 +163,9 @@ public CompletableFuture<Void> deletePlayerProfile(ProfileKey profileKey) {
                 deletePlayerProfileFromDisk(profileKey, playerFile, new ProfileType[]{profileKey.getProfileType()}));
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public CompletableFuture<Void> deletePlayerProfiles(ProfileFileKey profileKey, ProfileType[] profileTypes) {
         if (Strings.isNullOrEmpty(profileKey.getPlayerName())) {
@@ -358,14 +336,6 @@ private void processGlobalProfileWrite(GlobalProfile globalProfile) {
         });
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public CompletableFuture<Void> deleteGlobalProfile(GlobalProfileKey key) {
-        return deleteGlobalProfile(key, true);
-    }
-
     /**
      * {@inheritDoc}
      */