Add shared user/cache lifecycle and SQL enumeration

.github/workflows/maven.yml

@@ -11,7 +11,7 @@ on:
   push:
     branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "codex/shared-sql-backend-init" ]
 
 permissions:
   contents: write   # required for dependency submission

AdvancedCore/src/main/java/com/bencodez/advancedcore/AdvancedCorePlugin.java

@@ -11,7 +11,9 @@
 import java.util.LinkedList;
 import java.util.Map.Entry;
 import java.util.Queue;
-import java.util.UUID;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -43,10 +45,12 @@
 import com.bencodez.advancedcore.api.time.TimeChecker;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
-import com.bencodez.advancedcore.api.user.UserDataFetchMode;
-import com.bencodez.advancedcore.api.user.UserManager;
-import com.bencodez.advancedcore.api.user.UserStartup;
-import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.UserDataFetchMode;
+import com.bencodez.advancedcore.api.user.UserManager;
+import com.bencodez.advancedcore.api.user.UserStartup;
+import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
+import com.bencodez.advancedcore.bukkit.user.runtime.BukkitUserRuntimeBootstrap;
 import com.bencodez.advancedcore.api.user.userstorage.mysql.MySQL;
 import com.bencodez.advancedcore.api.user.userstorage.sql.UserTable;
 import com.bencodez.advancedcore.command.CommandLoader;
@@ -508,10 +512,35 @@ public void run() {
 	 * @param from the source storage type
 	 * @param to   the target storage type
 	 */
-	public void convertDataStorage(UserStorage from, UserStorage to) {
-		debug("Starting convert process");
-		if (to == null) {
-			throw new RuntimeException("Invalid Storage Method");
+	public void convertDataStorage(UserStorage from, UserStorage to) {
+		if (Bukkit.getServer() != null && Bukkit.isPrimaryThread()) {
+			throw new IllegalStateException("User storage conversion must run asynchronously; use convertDataStorageAsync");
+		}
+		getUserManager().getDataManager().runStorageMaintenance(() -> convertDataStorageNow(from, to));
+	}
+
+	/**
+	 * Start an explicit SQL-to-SQL conversion without blocking the server thread.
+	 * The result completes after the shared cache generation was flushed and the
+	 * converter has finished; callers must not report success before then.
+	 */
+	public CompletionStage<Void> convertDataStorageAsync(UserStorage from, UserStorage to) {
+		CompletableFuture<Void> result = new CompletableFuture<>();
+		try {
+			getBukkitScheduler().runTaskAsynchronously(this, () -> {
+				try {
+					convertDataStorage(from, to);
+					result.complete(null);
+				} catch (Throwable failure) { result.completeExceptionally(failure); }
+			});
+		} catch (RuntimeException | Error failure) { result.completeExceptionally(failure); }
+		return result;
+	}
+
+	private void convertDataStorageNow(UserStorage from, UserStorage to) {
+		debug("Starting convert process");
+		if (to == null) {
+			throw new RuntimeException("Invalid Storage Method");
 		}
 		loadUserAPI(from);
 		loadUserAPI(to);
@@ -630,12 +659,15 @@ public UserStorage getStorageType() {
 	 * 
 	 * @return the user manager
 	 */
-	public UserManager getUserManager() {
+	public UserManager getUserManager() {
 		if (userManager == null) {
 			userManager = new UserManager(this);
 		}
-		return userManager;
-	}
+		return userManager;
+	}
+
+	/** Existing manager only; shutdown must not allocate a new user subsystem. */
+	public UserManager getLoadedUserManager() { return userManager; }
 
 	private YamlConfiguration getVersionFile() {
 		try {
@@ -690,12 +722,19 @@ public void loadAdvancedCoreEvents() {
 		Bukkit.getPluginManager().registerEvents(new BInventoryListener(this), this);
 	}
 
-	private void loadConfig(boolean userStorage) {
-		getOptions().load(this);
-		if (loadUserData && userStorage) {
-			loadUserAPI(getOptions().getStorageType());
-		}
-	}
+	private void loadConfig(boolean userStorage) {
+		getOptions().load(this);
+		if (loadUserData && userStorage) {
+			loadUserAPI(getOptions().getStorageType());
+			bindSharedUserRuntime();
+		}
+	}
+
+	/** Bind only after the native Bukkit storage owner has initialized successfully. */
+	private void bindSharedUserRuntime() {
+		UserDataManager manager = getUserManager().getDataManager();
+		BukkitUserRuntimeBootstrap.bindAfterStorageInitialization(this, manager);
+	}
 
 	private void loadHandle() {
 
@@ -1023,11 +1062,12 @@ public void updateReplacements() {
 	 * 
 	 * @param storageType the storage type to load
 	 */
-	public void loadUserAPI(UserStorage storageType) {
-		if (storageType == null) {
-			throw new IllegalArgumentException("User storage must be SQLITE or MYSQL");
-		}
-		if (storageType.equals(UserStorage.SQLITE)) {
+	public void loadUserAPI(UserStorage storageType) {
+		if (storageType == null) {
+			throw new IllegalArgumentException("User storage must be SQLITE or MYSQL");
+		}
+		requireUserStorageMaintenanceWindow();
+		if (storageType.equals(UserStorage.SQLITE)) {
 			ArrayList<Column> columns = new ArrayList<>();
 			Column key = new Column("uuid", DataType.STRING);
 			columns.add(key);
@@ -1046,7 +1086,22 @@ public void loadUserAPI(UserStorage storageType) {
 			}
 
 		}
-	}
+	}
+
+	/**
+	 * The shared runtime owns cache flushing and the lifecycle admission for the
+	 * native SQL provider. Replacing that provider in-place would let an in-flight
+	 * flush target a connection that reload has already replaced or closed. There
+	 * is no safe synchronous Bukkit hot-reload boundary for this today, so require
+	 * a full plugin restart before mutating either native storage owner.
+	 */
+	private void requireUserStorageMaintenanceWindow() {
+		UserManager loadedUsers = getLoadedUserManager();
+		if (loadedUsers != null && loadedUsers.getDataManager().hasSharedRuntimeLifecycle()
+				&& !loadedUsers.getDataManager().isStorageMaintenanceActive()) {
+			throw new IllegalStateException("User storage reload requires a full plugin restart while shared user storage is active or retiring");
+		}
+	}
 
 	private void loadUUIDs() {
 
@@ -1206,8 +1261,9 @@ public void reloadAdvancedCore() {
 	 * 
 	 * @param userStorage whether to reload user storage
 	 */
-	public void reloadAdvancedCore(boolean userStorage) {
-		getServerDataFile().reloadData();
+	public void reloadAdvancedCore(boolean userStorage) {
+		if (userStorage) requireUserStorageMaintenanceWindow();
+		getServerDataFile().reloadData();
 		rewardHandler.loadRewards();
 		loadConfig(userStorage);
 

AdvancedCore/src/main/java/com/bencodez/advancedcore/api/player/UuidLookup.java

@@ -179,11 +179,10 @@ public String getPlayerName(AdvancedCoreUser user, String uuid, boolean useCache
 			cacheMapping(uuid, liveName);
 
 			// Update stored PlayerName if it changed / missing
-			if (user != null && user.getUserData().hasData()) {
-				if (storedName.isEmpty() || storedName.equalsIgnoreCase("Error getting name")
-						|| !liveName.equals(storedName)) {
-					user.getData().setString("PlayerName", liveName);
-				}
+			if (user != null && (storedName.isEmpty() || storedName.equalsIgnoreCase("Error getting name")
+					|| !liveName.equals(storedName))) {
+				user.setPlayerName(liveName);
+				user.updateName(false);
 			}
 			return liveName;
 		}