From 362bd5648c003adbc93bff30539f7dfcf0dda547 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Mon, 8 Nov 2010 12:42:51 +0000
Subject: [PATCH] BATCH-1628: Extend to all params, and add javadocs

---
 .../launch/support/CommandLineJobRunner.java  | 35 +++++++++++--------
 .../support/CommandLineJobRunnerTests.java    | 16 +++++++++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
index 54099bc27..9942951c2 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
@@ -92,7 +92,8 @@ import org.springframework.util.StringUtils;
  * </p>
  * 
  * <p>
- * The arguments to this class are as follows:
+ * The arguments to this class can be provided on the command line (separated by
+ * spaces), or through stdin (separated by new line). They are as follows:
  * </p>
  * 
  * <code>
@@ -110,7 +111,8 @@ import org.springframework.util.StringUtils;
  * {@link JobParametersIncrementer} in the {@link Job}</li>
  * <li>jobIdentifier: the name of the job or the id of a job execution (for
  * -stop, -abandon or -restart).
- * <li>jobParameters: 0 to many parameters that will be used to launch a job.
+ * <li>jobParameters: 0 to many parameters that will be used to launch a job
+ * specified in the form of <code>key=value</code> pairs.
  * </ul>
  * </p>
  * 
@@ -125,7 +127,11 @@ import org.springframework.util.StringUtils;
  * {@link JobLauncher}. The job parameters passed in to the command line will be
  * converted to {@link Properties} by assuming that each individual element is
  * one parameter that is separated by an equals sign. For example,
- * "vendor.id=290232". Below is an example arguments list: "
+ * "vendor.id=290232". The resulting properties instance is converted to
+ * {@link JobParameters} using a {@link JobParametersConverter} from the
+ * application context (if there is one, or a
+ * {@link DefaultJobParametersConverter} otherwise). Below is an example
+ * arguments list: "
  * 
  * <p>
  * <code>
@@ -278,9 +284,8 @@ public class CommandLineJobRunner {
 
 			Assert.state(launcher != null, "A JobLauncher must be provided.  Please add one to the configuration.");
 			if (opts.contains("-restart") || opts.contains("-next")) {
-				Assert
-						.state(jobExplorer != null,
-								"A JobExplorer must be provided for a restart or start next operation.  Please add one to the configuration.");
+				Assert.state(jobExplorer != null,
+						"A JobExplorer must be provided for a restart or start next operation.  Please add one to the configuration.");
 			}
 
 			String jobName = jobIdentifier;
@@ -507,6 +512,15 @@ public class CommandLineJobRunner {
 
 		CommandLineJobRunner command = new CommandLineJobRunner();
 
+		List<String> newargs = new ArrayList<String>(Arrays.asList(args));
+
+		BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+		String line = reader.readLine();
+		while (line != null) {
+			newargs.add(line);
+			line = reader.readLine();
+		}
+
 		Set<String> opts = new HashSet<String>();
 		List<String> params = new ArrayList<String>();
 
@@ -514,7 +528,7 @@ public class CommandLineJobRunner {
 		String jobPath = null;
 		String jobIdentifier = null;
 
-		for (String arg : args) {
+		for (String arg : newargs) {
 			if (arg.startsWith("-")) {
 				opts.add(arg);
 			}
@@ -541,13 +555,6 @@ public class CommandLineJobRunner {
 			command.exit(1);
 		}
 
-		BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-		String line = reader.readLine();
-		while (line != null) {
-			params.add(line);
-			line = reader.readLine();
-		}
-
 		String[] parameters = params.toArray(new String[params.size()]);
 
 		int result = command.start(jobPath, jobIdentifier, parameters, opts);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
index 98b332307..dfd5ccd1d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
@@ -136,6 +136,22 @@ public class CommandLineJobRunnerTests {
 		assertEquals(new JobParameters(), StubJobLauncher.jobParameters);
 	}
 
+	@Test
+	public void testWithStdinCommandLine() throws Throwable {
+		System.setIn(new InputStream() {
+			char[] input = (jobPath+"\n"+jobName+"\nfoo=bar\nspam=bucket").toCharArray();
+
+			int index = 0;
+
+			public int read() {
+				return index<input.length-1 ? (int) input[index++] : -1;
+			}
+		});
+		CommandLineJobRunner.main(new String[0]);
+		assertEquals(0, StubSystemExiter.status);
+		assertEquals(2, StubJobLauncher.jobParameters.getParameters().size());
+	}
+
 	@Test
 	public void testWithStdinParameters() throws Throwable {
 		String[] args = new String[] { jobPath, jobName };