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

BATCH-1507: search path for steps extended in FlowJob

Browse Source
This commit is contained in:
dsyer
2010-02-08 10:38:52 +00:00
parent c2a2b59d64
commit 87c839d7f0
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
View File

@@ -71,6 +71,12 @@ public class FlowJob extends AbstractJob {
if (state instanceof StepHolder) {
return ((StepHolder) state).getStep();
}
// The state names can be prefixed with the job name for
// uniqueness...
state = this.flow.getState(getName()+"."+stepName);
if (state instanceof StepHolder) {
return ((StepHolder) state).getStep();
}
return null;
}

17
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java
View File

@@ -518,6 +518,23 @@ public class FlowJobTests {
assertEquals("step2", step.getName());
}
@Test
public void testGetStepExistsWithPrefix() throws Exception {
SimpleFlow flow = new SimpleFlow("job");
List<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState("job.step", new StubStep("step")), "end0"));
transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0")));
flow.setStateTransitions(transitions);
flow.afterPropertiesSet();
job.setFlow(flow);
job.setName(flow.getName());
job.afterPropertiesSet();
Step step = job.getStep("step");
assertNotNull(step);
assertEquals("step", step.getName());
}
@Test
public void testGetStepNotExists() throws Exception {
SimpleFlow flow = new SimpleFlow("job");