From cd3e285135af55e166649a515e9833b5c4fd8b51 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Fri, 6 Nov 2020 19:51:47 +0100
Subject: [PATCH] No need to pass a lazy DaemonParameters to DefaultClient

---
 .../org/jboss/fuse/mvnd/client/DaemonParameters.java   |  7 +------
 .../java/org/jboss/fuse/mvnd/client/DefaultClient.java | 10 ++++------
 .../org/jboss/fuse/mvnd/junit/MvndTestExtension.java   |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonParameters.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonParameters.java
index 0f068683..8cf0dcc6 100644
--- a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonParameters.java
@@ -246,7 +246,7 @@ public class DaemonParameters {
     public DaemonParameters cd(Path newUserDir) {
         return new DaemonParameters(new PropertiesBuilder()
                 .putAll(this.properties)
-                .put(Environment.USER_DIR.getProperty(), newUserDir.toString()));
+                .put(Environment.USER_DIR, newUserDir));
     }
 
     public int keepAliveMs() {
@@ -361,11 +361,6 @@ public class DaemonParameters {
     public static class PropertiesBuilder {
         private Map<String, String> properties = new LinkedHashMap<>();
 
-        public PropertiesBuilder put(String key, String value) {
-            properties.put(key, value);
-            return this;
-        }
-
         public PropertiesBuilder put(Environment envKey, Object value) {
             if (value == null) {
                 properties.remove(envKey.getProperty());
diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
index 0313ffc5..3dd276f7 100644
--- a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
+++ b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -22,7 +22,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 import org.fusesource.jansi.Ansi;
 import org.jboss.fuse.mvnd.common.BuildProperties;
 import org.jboss.fuse.mvnd.common.DaemonInfo;
@@ -47,7 +46,7 @@ public class DefaultClient implements Client {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultClient.class);
 
-    private final Supplier<DaemonParameters> lazyParameters;
+    private final DaemonParameters parameters;
 
     public static void main(String[] argv) throws Exception {
         final List<String> args = new ArrayList<>(argv.length);
@@ -68,12 +67,12 @@ public class DefaultClient implements Client {
         }
 
         try (TerminalOutput output = new TerminalOutput(logFile)) {
-            new DefaultClient(() -> new DaemonParameters()).execute(output, args);
+            new DefaultClient(new DaemonParameters()).execute(output, args);
         }
     }
 
-    public DefaultClient(Supplier<DaemonParameters> lazyParameters) {
-        this.lazyParameters = lazyParameters;
+    public DefaultClient(DaemonParameters parameters) {
+        this.parameters = parameters;
     }
 
     @Override
@@ -143,7 +142,6 @@ public class DefaultClient implements Client {
              */
         }
 
-        final DaemonParameters parameters = lazyParameters.get();
         try (DaemonRegistry registry = new DaemonRegistry(parameters.registry())) {
             boolean status = args.remove("--status");
             if (status) {
diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
index c9592e5c..f4bea564 100644
--- a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
+++ b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
@@ -121,7 +121,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
             }
             return new NativeTestClient(parameters, mvndNativeExecutablePath, timeoutMs);
         } else {
-            return new DefaultClient(() -> parameters);
+            return new DefaultClient(parameters);
         }
     }