From 0c80771febcc7aa0782babbeb9976bb40aa1184e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 25 Feb 2009 01:39:21 +0000 Subject: [PATCH] prefer better static typing git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15710 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/EnvVars.java | 11 ++++++++++- core/src/main/java/hudson/slaves/CommandLauncher.java | 7 +++---- core/src/main/java/hudson/util/ProcessTreeKiller.java | 4 +--- .../java/org/jvnet/hudson/test/HudsonTestCase.java | 3 ++- .../java/hudson/tasks/EnvVarsInConfigTasksTest.java | 4 +--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java index bedf5e2c97..b85d1f875b 100644 --- a/core/src/main/java/hudson/EnvVars.java +++ b/core/src/main/java/hudson/EnvVars.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Map; import java.util.TreeMap; +import java.util.Arrays; /** * Environment variables. @@ -53,10 +54,18 @@ public class EnvVars extends TreeMap { } public EnvVars(Map m) { - super(CaseInsensitiveComparator.INSTANCE); + this(); putAll(m); } + public EnvVars(String... keyValuePairs) { + this(); + if(keyValuePairs.length%2!=0) + throw new IllegalArgumentException(Arrays.asList(keyValuePairs).toString()); + for( int i=0; i env; + private final EnvVars env; @DataBoundConstructor public CommandLauncher(String command) { this(command, null); } - public CommandLauncher(String command, Map env) { + public CommandLauncher(String command, EnvVars env) { this.agentCommand = command; this.env = env; } diff --git a/core/src/main/java/hudson/util/ProcessTreeKiller.java b/core/src/main/java/hudson/util/ProcessTreeKiller.java index 4313186773..26967ff494 100644 --- a/core/src/main/java/hudson/util/ProcessTreeKiller.java +++ b/core/src/main/java/hudson/util/ProcessTreeKiller.java @@ -114,9 +114,7 @@ public abstract class ProcessTreeKiller { * when we later kill the processes. */ public static EnvVars createCookie() { - EnvVars r = new EnvVars(); - r.put("HUDSON_COOKIE",UUID.randomUUID().toString()); - return r; + return new EnvVars("HUDSON_COOKIE",UUID.randomUUID().toString()); } /** diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 3c32afc0f3..902d47312e 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -27,6 +27,7 @@ import hudson.CloseProofOutputStream; import hudson.FilePath; import hudson.Functions; import hudson.WebAppMain; +import hudson.EnvVars; import hudson.Launcher.LocalLauncher; import hudson.matrix.MatrixProject; import hudson.maven.MavenModuleSet; @@ -389,7 +390,7 @@ public abstract class HudsonTestCase extends TestCase { /** * Creates a slave with certain additional environment variables */ - public DumbSlave createSlave(Label l, Map env) throws Exception { + public DumbSlave createSlave(Label l, EnvVars env) throws Exception { CommandLauncher launcher = new CommandLauncher( System.getProperty("java.home") + "/bin/java -jar \"" + new File(hudson.getJnlpJars("slave.jar").getURL().toURI()).getAbsolutePath() + "\"", env); diff --git a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java index b284449a8c..f864cf0adb 100644 --- a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java +++ b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java @@ -11,7 +11,6 @@ import hudson.tasks.Ant.AntInstallation; import hudson.tasks.Maven.MavenInstallation; import java.io.File; -import java.util.TreeMap; import org.apache.tools.ant.taskdefs.condition.Os; import org.jvnet.hudson.test.ExtractResourceSCM; @@ -47,8 +46,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase { } // createSlaves - TreeMap additionalEnv = new TreeMap(); - additionalEnv.put(DUMMY_LOCATION_VARNAME, ""); + EnvVars additionalEnv = new EnvVars(DUMMY_LOCATION_VARNAME, ""); slaveEnv = createSlave(new Label("slaveEnv"), additionalEnv); slaveRegular = createSlave(new Label("slaveRegular"));