add remove method in DataStorage

Author: HSGamer

spigot/storage-simple/src/main/java/me/hsgamer/topper/spigot/storage/simple/supplier/ConfigStorageSupplier.java

@@ -7,6 +7,7 @@
 import me.hsgamer.topper.storage.simple.supplier.DataStorageSupplier;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -74,6 +75,18 @@ public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
                 );
             }
 
+            @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
+                );
+            }
+
             @Override
             public void onRegister() {
                 config.setup();

storage/core/src/main/java/me/hsgamer/topper/storage/core/DataStorage.java

@@ -1,5 +1,6 @@
 package me.hsgamer.topper.storage.core;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -11,6 +12,8 @@ public interface DataStorage<K, V> {
 
     CompletableFuture<Optional<V>> load(K key, boolean urgent);
 
+    CompletableFuture<Void> remove(Collection<K> keys, boolean urgent);
+
     default void onRegister() {
         // EMPTY
     }

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/FlatStorageSupplier.java

@@ -11,10 +11,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
@@ -95,6 +92,20 @@ public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
                 }
             }
 
+            @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);
+                }
+            }
+
             @Override
             public void onRegister() {
                 loadRunnable.run();

storage/simple/src/main/java/me/hsgamer/topper/storage/simple/supplier/SqlStorageSupplier.java

@@ -12,10 +12,7 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.AbstractMap;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -135,6 +132,48 @@ public CompletableFuture<Optional<V>> load(K key, boolean urgent) {
                 }
             }
 
+            @Override
+            public CompletableFuture<Void> remove(Collection<K> keys, boolean urgent) {
+                Runnable runnable = () -> {
+                    Connection connection = null;
+                    try {
+                        connection = getConnection();
+                        String[] keyColumns = converter.getKeyColumns();
+
+                        StringBuilder statement = new StringBuilder("DELETE FROM `")
+                                .append(name)
+                                .append("` WHERE ");
+                        for (int i = 0; i < keyColumns.length; i++) {
+                            statement.append("`")
+                                    .append(keyColumns[i])
+                                    .append("` = ?");
+                            if (i != keyColumns.length - 1) {
+                                statement.append(" AND ");
+                            }
+                        }
+
+                        BatchBuilder batchBuilder = BatchBuilder.create(connection, statement.toString());
+                        keys.forEach(key -> {
+                            Object[] keyValues = converter.toKeyQueryValues(key);
+                            batchBuilder.addValues(keyValues);
+                        });
+                        batchBuilder.execute();
+                    } catch (SQLException e) {
+                        logger.log(LogLevel.ERROR, "Failed to remove top holder", e);
+                    } finally {
+                        if (connection != null) {
+                            flushConnection(connection);
+                        }
+                    }
+                };
+                if (urgent) {
+                    return CompletableFuture.runAsync(runnable);
+                } else {
+                    runnable.run();
+                    return CompletableFuture.completedFuture(null);
+                }
+            }
+
             @Override
             public void onRegister() {
                 Connection connection = null;