remove CompletableFuture from DataStorage

HSGamer · HSGamer · commit 0b35532985b0 · 2025-01-04T22:01:15.000+07:00
diff --git a/agent/storage/src/main/java/me/hsgamer/topper/agent/storage/StorageAgent.java b/agent/storage/src/main/java/me/hsgamer/topper/agent/storage/StorageAgent.java
@@ -63,22 +63,24 @@ private void save(boolean urgent) {
             }
         }
 
-        storage.save(finalMap, urgent)
-                .thenCompose(v -> {
-                    if (removeKeys.isEmpty()) {
-                        return CompletableFuture.completedFuture(null);
-                    } else {
-                        return storage.remove(removeKeys, urgent);
-                    }
-                })
-                .whenComplete((v, throwable) -> {
-                    if (throwable != null) {
-                        logger.log(Level.SEVERE, "Failed to save entries for " + holder.getName(), throwable);
-                    } else {
-                        savingMap.set(null);
-                    }
-                    saving.set(false);
-                });
+        Runnable saveTask = () -> {
+            try {
+                storage.save(finalMap);
+                if (!removeKeys.isEmpty()) {
+                    storage.remove(removeKeys);
+                }
+                savingMap.set(null);
+            } catch (Throwable t) {
+                logger.log(Level.SEVERE, "Failed to save entries for " + holder.getName(), t);
+            }
+            saving.set(false);
+        };
+
+        if (urgent) {
+            saveTask.run();
+        } else {
+            CompletableFuture.runAsync(saveTask);
+        }
     }
 
     @Override
diff --git a/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/TopperPlugin.java b/spigot/plugin/src/main/java/me/hsgamer/topper/spigot/plugin/TopperPlugin.java
@@ -49,7 +49,7 @@ protected List<Object> getComponents() {
     @Override
     public void load() {
         MessageUtils.setPrefix(get(MessageConfig.class)::getPrefix);
-        SpigotDataStorageBuilder.register(this, get(DataStorageBuilder.class));
+        SpigotDataStorageBuilder.register(get(DataStorageBuilder.class));
     }
 
     @Override
diff --git a/spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/SpigotDataStorageBuilder.java b/spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/SpigotDataStorageBuilder.java
@@ -1,18 +1,12 @@
 package me.hsgamer.topper.spigot.storage.simple;
 
-import io.github.projectunified.minelib.scheduler.global.GlobalScheduler;
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.topper.spigot.storage.simple.supplier.ConfigStorageSupplier;
 import me.hsgamer.topper.storage.simple.builder.DataStorageBuilder;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.concurrent.Executor;
 
 public class SpigotDataStorageBuilder {
-    public static void register(JavaPlugin plugin, DataStorageBuilder builder) {
-        Executor mainThreadExecutor = runnable -> GlobalScheduler.get(plugin).run(runnable);
-
-        builder.register(setting -> new ConfigStorageSupplier(mainThreadExecutor, name -> name + ".yml", BukkitConfig::new, setting.getBaseFolder()), "config", "yaml", "yml");
-        builder.register(setting -> new ConfigStorageSupplier(mainThreadExecutor, name -> name + ".json", BukkitConfig::new, setting.getBaseFolder()), "json");
+    public static void register(DataStorageBuilder builder) {
+        builder.register(setting -> new ConfigStorageSupplier(name -> name + ".yml", BukkitConfig::new, setting.getBaseFolder()), "config", "yaml", "yml");
+        builder.register(setting -> new ConfigStorageSupplier(name -> name + ".json", BukkitConfig::new, setting.getBaseFolder()), "json");
     }
 }
diff --git a/spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/supplier/ConfigStorageSupplier.java b/spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/supplier/ConfigStorageSupplier.java
@@ -11,24 +11,19 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
 public class ConfigStorageSupplier implements DataStorageSupplier {
-    private final Executor mainThreadExecutor;
     private final UnaryOperator<String> configNameProvider;
     private final Function<File, Config> configProvider;
     private final File holderBaseFolder;
 
     public ConfigStorageSupplier(
-            Executor mainThreadExecutor,
             UnaryOperator<String> configNameProvider,
             Function<File, Config> configProvider,
             File holderBaseFolder
     ) {
-        this.mainThreadExecutor = mainThreadExecutor;
         this.configNameProvider = configNameProvider;
         this.configProvider = configProvider;
         this.holderBaseFolder = holderBaseFolder;
@@ -56,35 +51,20 @@ public Map<K, V> load() {
             }
 
             @Override
-            public CompletableFuture<Void> save(Map<K, V> map, boolean urgent) {
-                return CompletableFuture.supplyAsync(
-                        () -> {
-                            map.forEach((key, value) -> config.set(converter.toRawValue(value), converter.toRawKey(key)));
-                            config.save();
-                            return null;
-                        },
-                        urgent ? Runnable::run : mainThreadExecutor
-                );
+            public void save(Map<K, V> map) {
+                map.forEach((key, value) -> config.set(converter.toRawValue(value), converter.toRawKey(key)));
+                config.save();
             }
 
             @Override
-            public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
-                return CompletableFuture.supplyAsync(
-                        () -> Optional.ofNullable(config.get(converter.toRawKey(key))).map(String::valueOf).map(converter::toValue),
-                        urgent ? Runnable::run : mainThreadExecutor
-                );
+            public Optional<V> load(K key) {
+                return Optional.ofNullable(config.get(converter.toRawKey(key))).map(String::valueOf).map(converter::toValue);
             }
 
             @Override
-            public CompletableFuture<Void> remove(Collection<K> keys, boolean urgent) {
-                return CompletableFuture.supplyAsync(
-                        () -> {
-                            keys.forEach(key -> config.remove(converter.toRawKey(key)));
-                            config.save();
-                            return null;
-                        },
-                        urgent ? Runnable::run : mainThreadExecutor
-                );
+            public void remove(Collection<K> keys) {
+                keys.forEach(key -> config.remove(converter.toRawKey(key)));
+                config.save();
             }
 
             @Override
diff --git a/storage/core/src/main/java/me/hsgamer/topper/storage/core/DataStorage.java b/storage/core/src/main/java/me/hsgamer/topper/storage/core/DataStorage.java
@@ -3,16 +3,15 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 
 public interface DataStorage<K, V> {
     Map<K, V> load();
 
-    CompletableFuture<Void> save(Map<K, V> map, boolean urgent);
+    void save(Map<K, V> map);
 
-    CompletableFuture<Optional<V>> load(K key, boolean urgent);
+    Optional<V> load(K key);
 
-    CompletableFuture<Void> remove(Collection<K> keys, boolean urgent);
+    void remove(Collection<K> keys);
 
     default void onRegister() {
         // EMPTY
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/FlatStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/FlatStorageSupplier.java
@@ -12,8 +12,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
 
 public class FlatStorageSupplier implements DataStorageSupplier {
     private final Logger logger = LoggerProvider.getLogger(getClass());
@@ -69,41 +67,20 @@ public Map<K, V> load() {
             }
 
             @Override
-            public CompletableFuture<Void> save(Map<K, V> map, boolean urgent) {
-                Runnable runnable = () -> {
-                    map.forEach((k, v) -> properties.put(converter.toRawKey(k), converter.toRawValue(v)));
-                    saveRunnable.run();
-                };
-                if (urgent) {
-                    runnable.run();
-                    return CompletableFuture.completedFuture(null);
-                } else {
-                    return CompletableFuture.runAsync(runnable);
-                }
+            public void save(Map<K, V> map) {
+                map.forEach((k, v) -> properties.put(converter.toRawKey(k), converter.toRawValue(v)));
+                saveRunnable.run();
             }
 
             @Override
-            public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
-                Supplier<Optional<V>> runnable = () -> Optional.ofNullable(properties.getProperty(converter.toRawKey(key))).map(converter::toValue);
-                if (urgent) {
-                    return CompletableFuture.completedFuture(runnable.get());
-                } else {
-                    return CompletableFuture.supplyAsync(runnable);
-                }
+            public Optional<V> load(K key) {
+                return Optional.ofNullable(properties.getProperty(converter.toRawKey(key))).map(converter::toValue);
             }
 
             @Override
-            public CompletableFuture<Void> remove(Collection<K> keys, boolean urgent) {
-                Runnable runnable = () -> {
-                    keys.forEach(key -> properties.remove(converter.toRawKey(key)));
-                    saveRunnable.run();
-                };
-                if (urgent) {
-                    runnable.run();
-                    return CompletableFuture.completedFuture(null);
-                } else {
-                    return CompletableFuture.runAsync(runnable);
-                }
+            public void remove(Collection<K> keys) {
+                keys.forEach(key -> properties.remove(converter.toRawKey(key)));
+                saveRunnable.run();
             }
 
             @Override
diff --git a/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java b/storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected List<Object> getComponents() {`
`49`	`49`	`@Override`
`50`	`50`	`public void load() {`
`51`	`51`	`MessageUtils.setPrefix(get(MessageConfig.class)::getPrefix);`
`52`		`- SpigotDataStorageBuilder.register(this, get(DataStorageBuilder.class));`
	`52`	`+ SpigotDataStorageBuilder.register(get(DataStorageBuilder.class));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`