apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-23 12:48:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

No need to pass a lazy DaemonParameters to DefaultClient

Browse Source
This commit is contained in:
Peter Palaga
2020-11-06 19:51:47 +01:00
parent 838691641b
commit cd3e285135
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/main/java/org/jboss/fuse/mvnd/client/DaemonParameters.java
View File

@@ -246,7 +246,7 @@ public class DaemonParameters {
public DaemonParameters cd(Path newUserDir) { public DaemonParameters cd(Path newUserDir) {
return new DaemonParameters(new PropertiesBuilder() return new DaemonParameters(new PropertiesBuilder()
.putAll(this.properties) .putAll(this.properties)
.put(Environment.USER_DIR.getProperty(), newUserDir.toString())); .put(Environment.USER_DIR, newUserDir));
} }
public int keepAliveMs() { public int keepAliveMs() {
@@ -361,11 +361,6 @@ public class DaemonParameters {
public static class PropertiesBuilder { public static class PropertiesBuilder {
private Map<String, String> properties = new LinkedHashMap<>(); 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) { public PropertiesBuilder put(Environment envKey, Object value) {
if (value == null) { if (value == null) {
properties.remove(envKey.getProperty()); properties.remove(envKey.getProperty());

10
client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
View File

@@ -22,7 +22,6 @@ import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Supplier;
import org.fusesource.jansi.Ansi; import org.fusesource.jansi.Ansi;
import org.jboss.fuse.mvnd.common.BuildProperties; import org.jboss.fuse.mvnd.common.BuildProperties;
import org.jboss.fuse.mvnd.common.DaemonInfo; 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 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 { public static void main(String[] argv) throws Exception {
final List<String> args = new ArrayList<>(argv.length); final List<String> args = new ArrayList<>(argv.length);
@@ -68,12 +67,12 @@ public class DefaultClient implements Client {
} }
try (TerminalOutput output = new TerminalOutput(logFile)) { 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) { public DefaultClient(DaemonParameters parameters) {
this.lazyParameters = lazyParameters; this.parameters = parameters;
} }
@Override @Override
@@ -143,7 +142,6 @@ public class DefaultClient implements Client {
*/ */
} }
final DaemonParameters parameters = lazyParameters.get();
try (DaemonRegistry registry = new DaemonRegistry(parameters.registry())) { try (DaemonRegistry registry = new DaemonRegistry(parameters.registry())) {
boolean status = args.remove("--status"); boolean status = args.remove("--status");
if (status) { if (status) {

2
integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
View File

@@ -121,7 +121,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
} }
return new NativeTestClient(parameters, mvndNativeExecutablePath, timeoutMs); return new NativeTestClient(parameters, mvndNativeExecutablePath, timeoutMs);
} else { } else {
return new DefaultClient(() -> parameters); return new DefaultClient(parameters);
} }
} }