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

Make DaemonParameters immutable

Browse Source
This commit is contained in:
Peter Palaga
2020-11-06 19:40:02 +01:00
parent 2a0ed8f554
commit 838691641b
4 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/InteractiveTest.java
View File

@@ -16,9 +16,7 @@
package org.jboss.fuse.mvnd.it;
import java.io.IOException;
import javax.inject.Inject;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;

33
integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/TestParameters.java
View File

@@ -16,7 +16,6 @@
package org.jboss.fuse.mvnd.junit;
import java.nio.file.Path;
import java.util.Properties;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.Environment;
@@ -28,27 +27,21 @@ public class TestParameters extends DaemonParameters {
Path multiModuleProjectDirectory,
Path javaHome, Path localMavenRepository, Path settings, Path logbackConfigurationPath,
int idleTimeout, int keepAlive, int maxLostKeepAlive) {
super(new Properties());
super(new PropertiesBuilder().put(Environment.MVND_PROPERTIES_PATH, mvndPropertiesPath)
.put(Environment.MVND_HOME, mavenHome)
.put(Environment.USER_HOME, userHome)
.put(Environment.USER_DIR, userDir)
.put(Environment.MAVEN_MULTIMODULE_PROJECT_DIRECTORY, multiModuleProjectDirectory)
.put(Environment.JAVA_HOME, javaHome)
.put(Environment.MAVEN_REPO_LOCAL, localMavenRepository)
.put(Environment.MAVEN_SETTINGS, settings)
.put(Environment.LOGBACK_CONFIGURATION_FILE, logbackConfigurationPath)
.put(Environment.DAEMON_IDLE_TIMEOUT_MS, idleTimeout)
.put(Environment.DAEMON_KEEP_ALIVE_MS, keepAlive)
.put(Environment.DAEMON_MAX_LOST_KEEP_ALIVE, maxLostKeepAlive)
.put(Environment.MVND_MIN_THREADS, TEST_MIN_THREADS));
this.testDir = testDir;
put(Environment.MVND_PROPERTIES_PATH, mvndPropertiesPath);
put(Environment.MVND_HOME, mavenHome);
put(Environment.USER_HOME, userHome);
put(Environment.USER_DIR, userDir);
put(Environment.MAVEN_MULTIMODULE_PROJECT_DIRECTORY, multiModuleProjectDirectory);
put(Environment.JAVA_HOME, javaHome);
put(Environment.MAVEN_REPO_LOCAL, localMavenRepository);
put(Environment.MAVEN_SETTINGS, settings);
put(Environment.LOGBACK_CONFIGURATION_FILE, logbackConfigurationPath);
put(Environment.DAEMON_IDLE_TIMEOUT_MS, idleTimeout);
put(Environment.DAEMON_KEEP_ALIVE_MS, keepAlive);
put(Environment.DAEMON_MAX_LOST_KEEP_ALIVE, maxLostKeepAlive);
put(Environment.MVND_MIN_THREADS, TEST_MIN_THREADS);
}
private void put(Environment env, Object value) {
if (value != null) {
this.properties.put(env.getProperty(), value.toString());
}
}
public Path getTestDir() {