Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue BATCH-1342: Check for valid parameter arguments in CommandLineJobRunner

Browse Source
This commit is contained in:
dsyer
2009-08-10 11:57:08 +00:00
parent b90e320e31
commit 842b9dac7a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java
View File

@@ -16,6 +16,7 @@
package org.springframework.batch.core.launch.support;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -273,6 +274,9 @@ public class CommandLineJobRunner {
JobParameters jobParameters = jobParametersConverter.getJobParameters(StringUtils
.splitArrayElementsIntoProperties(parameters, "="));
Assert.isTrue(parameters == null || parameters.length == 0 || !jobParameters.isEmpty(),
"Invalid JobParameters " + Arrays.asList(parameters)
+ ". If parameters are provided they should be in the form name=value (no whitespace).");
if (opts.contains("-restart")) {
jobParameters = getLastFailedJobParameters(jobName);
@@ -315,7 +319,7 @@ public class CommandLineJobRunner {
JobParameters jobParameters = null;
if (lastInstances.isEmpty()) {
throw new JobParametersNotFoundException("No job instance found for job=" + jobName);
throw new JobParametersNotFoundException("No job instance found for job=" + jobName);
}
while (!lastInstances.isEmpty()) {
@@ -339,7 +343,7 @@ public class CommandLineJobRunner {
start += count;
lastInstances = jobExplorer.getJobInstances(jobName, start, count);
}
}
if (jobParameters == null) {
throw new JobParametersNotFoundException("No failed or stopped execution found for job=" + jobName);

10
spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
View File

@@ -120,6 +120,16 @@ public class CommandLineJobRunnerTests {
assertEquals(new JobParameters(), StubJobLauncher.jobParameters);
}
@Test
public void testWithInvalidParameters() throws Throwable {
String[] args = new String[] { jobPath, jobName, "foo" };
CommandLineJobRunner.main(args);
assertEquals(1, StubSystemExiter.status);
String errorMessage = CommandLineJobRunner.getErrorMessage();
assertTrue("Wrong error message: " + errorMessage, errorMessage
.contains("in the form name=value"));
}
@Test
public void testRestart() throws Throwable {
String[] args = new String[] { jobPath, "-restart", jobName };