Use a single identifier generator in all commands

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / quelaton / ReloadPluginCommandImpl.java

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ReloadPluginCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ReloadPluginCommandImpl.java
index 2c2e6c4..a05963c 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ReloadPluginCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ReloadPluginCommandImpl.java
@@ -6,6 +6,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.PluginInfo;
 import net.pterodactylus.fcp.ProtocolError;
@@ -22,14 +23,14 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class ReloadPluginCommandImpl implements ReloadPluginCommand {
 
-       private static final RandomIdentifierGenerator IDENTIFIER = new RandomIdentifierGenerator();
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
-       private final ReloadPlugin reloadPlugin = new ReloadPlugin(IDENTIFIER.generate());
+       private final ReloadPlugin reloadPlugin;
 
-       public ReloadPluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public ReloadPluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               reloadPlugin = new ReloadPlugin(identifierGenerator.get());
        }
 
        @Override
@@ -45,6 +46,12 @@ public class ReloadPluginCommandImpl implements ReloadPluginCommand {
        }
 
        @Override
+       public ReloadPluginCommand addToConfig() {
+               reloadPlugin.setStore(true);
+               return this;
+       }
+
+       @Override
        public Executable<Optional<PluginInfo>> plugin(String pluginClassName) {
                reloadPlugin.setPluginName(pluginClassName);
                return this::execute;
@@ -55,8 +62,8 @@ public class ReloadPluginCommandImpl implements ReloadPluginCommand {
        }
 
        private Optional<PluginInfo> executeDialog() throws IOException, ExecutionException, InterruptedException {
-               try (ReloadPluginDialog loadPluginDialog = new ReloadPluginDialog()) {
-                       return loadPluginDialog.send(reloadPlugin).get();
+               try (ReloadPluginDialog reloadPluginDialog = new ReloadPluginDialog()) {
+                       return reloadPluginDialog.send(reloadPlugin).get();
                }
        }