Use a single identifier generator in all commands

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
index 1a8ffd8..cac2535 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/GetConfigCommandImpl.java
@@ -5,6 +5,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.ConfigData;
 import net.pterodactylus.fcp.GetConfig;
@@ -22,16 +23,20 @@ public class GetConfigCommandImpl implements GetConfigCommand {
 
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final Supplier<String> identifierGenerator;
        private final AtomicBoolean withCurrent = new AtomicBoolean();
        private final AtomicBoolean withDefaults = new AtomicBoolean();
        private final AtomicBoolean withSortOrder = new AtomicBoolean();
        private final AtomicBoolean withExpertFlag = new AtomicBoolean();
        private final AtomicBoolean withForceWriteFlag = new AtomicBoolean();
        private final AtomicBoolean withShortDescription = new AtomicBoolean();
+       private final AtomicBoolean withLongDescription = new AtomicBoolean();
+       private final AtomicBoolean withDataTypes = new AtomicBoolean();
 
-       public GetConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public GetConfigCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               this.identifierGenerator = identifierGenerator;
        }
 
        @Override
@@ -71,18 +76,32 @@ public class GetConfigCommandImpl implements GetConfigCommand {
        }
 
        @Override
+       public GetConfigCommand withLongDescription() {
+               withLongDescription.set(true);
+               return this;
+       }
+
+       @Override
+       public GetConfigCommand withDataTypes() {
+               withDataTypes.set(true);
+               return this;
+       }
+
+       @Override
        public ListenableFuture<ConfigData> execute() {
                return threadPool.submit(this::executeDialog);
        }
 
        private ConfigData executeDialog() throws IOException, ExecutionException, InterruptedException {
-               GetConfig getConfig = new GetConfig(new RandomIdentifierGenerator().generate());
+               GetConfig getConfig = new GetConfig(identifierGenerator.get());
                getConfig.setWithCurrent(withCurrent.get());
                getConfig.setWithDefaults(withDefaults.get());
                getConfig.setWithSortOrder(withSortOrder.get());
                getConfig.setWithExpertFlag(withExpertFlag.get());
                getConfig.setWithForceWriteFlag(withForceWriteFlag.get());
                getConfig.setWithShortDescription(withShortDescription.get());
+               getConfig.setWithLongDescription(withLongDescription.get());
+               getConfig.setWithDataTypes(withDataTypes.get());
                try (GetConfigDialog getConfigDialog = new GetConfigDialog()) {
                        return getConfigDialog.send(getConfig).get();
                }