Use a single identifier generator in all commands

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
index b4a6b79..2135e2e 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/RemovePluginCommandImpl.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.PluginRemoved;
 import net.pterodactylus.fcp.ProtocolError;
@@ -20,14 +21,26 @@ import com.google.common.util.concurrent.MoreExecutors;
  */
 public class RemovePluginCommandImpl implements RemovePluginCommand {
 
-       private static final RandomIdentifierGenerator IDENTIFIER = new RandomIdentifierGenerator();
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
-       private final RemovePlugin removePlugin = new RemovePlugin(IDENTIFIER.generate());
+       private final RemovePlugin removePlugin;
 
-       public RemovePluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public RemovePluginCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               removePlugin = new RemovePlugin(identifierGenerator.get());
+       }
+
+       @Override
+       public RemovePluginCommand waitFor(int milliseconds) {
+               removePlugin.setMaxWaitTime(milliseconds);
+               return this;
+       }
+
+       @Override
+       public RemovePluginCommand purge() {
+               removePlugin.setPurge(true);
+               return this;
        }
 
        @Override