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

OPEN - issue BATCH-679: Non-sequential execution Remove generic features of flow abstraction

Browse Source
This commit is contained in:
dsyer
2008-10-30 09:29:51 +00:00
parent 4eaf7073bf
commit b1292a82d7
20 changed files with 147 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java
View File

@@ -25,11 +25,6 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.springframework.batch.core.job.flow.FlowExecution;
import org.springframework.batch.core.job.flow.FlowExecutionException;
import org.springframework.batch.core.job.flow.FlowExecutionListenerSupport;
import org.springframework.batch.core.job.flow.SimpleFlow;
import org.springframework.batch.core.job.flow.StateTransition;
/**
* @author Dave Syer
@@ -37,34 +32,34 @@ import org.springframework.batch.core.job.flow.StateTransition;
*/
public class BasicFlowTests {
private SimpleFlow<Object> flow = new SimpleFlow<Object>("job");
private SimpleFlow flow = new SimpleFlow("job");
private Object executor = "data";
private JobFlowExecutor executor = new JobFlowExecutorSupport();
@Test(expected = IllegalArgumentException.class)
public void testEmptySteps() throws Exception {
flow.setStateTransitions(Collections.<StateTransition<Object>> emptySet());
flow.setStateTransitions(Collections.<StateTransition> emptySet());
flow.afterPropertiesSet();
}
@Test(expected = IllegalArgumentException.class)
public void testNoNextStepSpecified() throws Exception {
flow.setStateTransitions(Collections.singleton(StateTransition.createStateTransition(new StateSupport<Object>(
flow.setStateTransitions(Collections.singleton(StateTransition.createStateTransition(new StateSupport(
"step"), "foo")));
flow.afterPropertiesSet();
}
@Test(expected = IllegalArgumentException.class)
public void testNoStartStep() throws Exception {
flow.setStateTransitions(collect(StateTransition.createStateTransition(new StateSupport<Object>("step"),
flow.setStateTransitions(collect(StateTransition.createStateTransition(new StateSupport("step"),
FlowExecution.FAILED, "step"), StateTransition
.createEndStateTransition(new StateSupport<Object>("step"))));
.createEndStateTransition(new StateSupport("step"))));
flow.afterPropertiesSet();
}
@Test(expected = IllegalArgumentException.class)
public void testNoEndStep() throws Exception {
flow.setStateTransitions(Collections.singleton(StateTransition.createStateTransition(new StateSupport<Object>(
flow.setStateTransitions(Collections.singleton(StateTransition.createStateTransition(new StateSupport(
"step"), FlowExecution.FAILED, "step")));
flow.setStartStateName("step");
flow.afterPropertiesSet();
@@ -109,7 +104,7 @@ public class BasicFlowTests {
.singleton(StateTransition.createEndStateTransition(new StubState("step1"))));
flow.afterPropertiesSet();
final List<FlowExecution> list = new ArrayList<FlowExecution>();
executor = new FlowExecutionListenerSupport() {
executor = new JobFlowExecutorSupport() {
@Override
public void close(FlowExecution result) {
list.add(result);
@@ -156,7 +151,7 @@ public class BasicFlowTests {
public void testFailedStep() throws Exception {
flow.setStateTransitions(collect(StateTransition.createStateTransition(new StubState("step1") {
@Override
public String handle(Object executor) {
public String handle(JobFlowExecutor executor) {
return FlowExecution.FAILED;
}
}, "step2"), StateTransition.createEndStateTransition(new StubState("step2"))));
@@ -185,7 +180,7 @@ public class BasicFlowTests {
private boolean paused = false;
@Override
public String handle(Object executor) throws Exception {
public String handle(JobFlowExecutor executor) throws Exception {
if (!paused) {
paused = true;
return FlowExecution.PAUSED;
@@ -204,23 +199,23 @@ public class BasicFlowTests {
assertEquals("step3", execution.getName());
}
private Collection<StateTransition<Object>> collect(StateTransition<Object> s1, StateTransition<Object> s2) {
Collection<StateTransition<Object>> list = new ArrayList<StateTransition<Object>>();
private Collection<StateTransition> collect(StateTransition s1, StateTransition s2) {
Collection<StateTransition> list = new ArrayList<StateTransition>();
list.add(s1);
list.add(s2);
return list;
}
private Collection<StateTransition<Object>> collect(StateTransition<Object> s1, StateTransition<Object> s2,
StateTransition<Object> s3) {
Collection<StateTransition<Object>> list = collect(s1, s2);
private Collection<StateTransition> collect(StateTransition s1, StateTransition s2,
StateTransition s3) {
Collection<StateTransition> list = collect(s1, s2);
list.add(s3);
return list;
}
private Collection<StateTransition<Object>> collect(StateTransition<Object> s1, StateTransition<Object> s2,
StateTransition<Object> s3, StateTransition<Object> s4) {
Collection<StateTransition<Object>> list = collect(s1, s2, s3);
private Collection<StateTransition> collect(StateTransition s1, StateTransition s2,
StateTransition s3, StateTransition s4) {
Collection<StateTransition> list = collect(s1, s2, s3);
list.add(s4);
return list;
}
@@ -229,7 +224,7 @@ public class BasicFlowTests {
* @author Dave Syer
*
*/
private static class StubState extends StateSupport<Object> {
private static class StubState extends StateSupport {
/**
* @param string

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

@@ -63,8 +63,8 @@ public class FlowJobTests {
@Test
public void testTwoSteps() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2"));
transitions.add(StateTransition.createEndStateTransition(new StepState(new StubStep("step2"))));
flow.setStateTransitions(transitions);
@@ -77,8 +77,8 @@ public class FlowJobTests {
@Test
public void testFailedStep() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StepSupport("step1") {
@Override
public void execute(StepExecution stepExecution) throws JobInterruptedException,
@@ -99,8 +99,8 @@ public class FlowJobTests {
@Test
public void testStoppingStep() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StepSupport("step1") {
@Override
public void execute(StepExecution stepExecution) throws JobInterruptedException,
@@ -124,8 +124,8 @@ public class FlowJobTests {
@Test
public void testEndStateStopped() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end"));
transitions.add(StateTransition.createStateTransition(new EndState(BatchStatus.STOPPED, "end"), "step2"));
transitions.add(StateTransition.createEndStateTransition(new StepState(new StubStep("step2"))));
@@ -143,8 +143,8 @@ public class FlowJobTests {
}
public void testEndStateFailed() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end"));
transitions.add(StateTransition.createStateTransition(new EndState(BatchStatus.FAILED, "end"), "step2"));
transitions.add(StateTransition.createEndStateTransition(new StepState(new StubStep("step2"))));
@@ -158,8 +158,8 @@ public class FlowJobTests {
@Test
public void testEndStateStoppedWithRestart() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end"));
transitions.add(StateTransition.createStateTransition(new EndState(BatchStatus.STOPPED, "end"), "step2"));
transitions.add(StateTransition.createEndStateTransition(new StepState(new StubStep("step2"))));
@@ -181,8 +181,8 @@ public class FlowJobTests {
@Test
public void testBranching() throws Exception {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2"));
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "COMPLETED",
"step3"));
@@ -199,7 +199,7 @@ public class FlowJobTests {
@Test
public void testBasicFlow() throws Throwable {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
SimpleFlow flow = new SimpleFlow("job");
Step step = new StubStep("step");
flow.setStateTransitions(Collections.singleton(StateTransition.createEndStateTransition(new StepState(step),
"*")));
@@ -214,7 +214,7 @@ public class FlowJobTests {
@Test
public void testDecisionFlow() throws Throwable {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
SimpleFlow flow = new SimpleFlow("job");
JobExecutionDecider decider = new JobExecutionDecider() {
public String decide(JobExecution jobExecution, StepExecution stepExecution) {
assertNotNull(stepExecution);
@@ -222,7 +222,7 @@ public class FlowJobTests {
}
};
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "*", "decision"));
transitions.add(StateTransition.createStateTransition(new DecisionState(decider, "decision"), "*", "step2"));
transitions.add(StateTransition
@@ -246,8 +246,8 @@ public class FlowJobTests {
@Test
public void testPauseFlow() throws Throwable {
SimpleFlow<JobFlowExecutor> flow = new SimpleFlow<JobFlowExecutor>("job");
Collection<StateTransition<JobFlowExecutor>> transitions = new ArrayList<StateTransition<JobFlowExecutor>>();
SimpleFlow flow = new SimpleFlow("job");
Collection<StateTransition> transitions = new ArrayList<StateTransition>();
transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "*", "pause"));
transitions.add(StateTransition.createStateTransition(new PauseState("pause"), "*", "step2"));
transitions.add(StateTransition.createEndStateTransition(new StepState(new StubStep("step2")), "*"));

3
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java
View File

@@ -41,4 +41,7 @@ public class JobFlowExecutorSupport implements JobFlowExecutor {
return null;
}
public void close(FlowExecution result) {
}
}

23
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java
View File

@@ -22,9 +22,6 @@ import java.util.Collection;
import org.easymock.EasyMock;
import org.junit.Test;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.job.flow.FlowExecution;
import org.springframework.batch.core.job.flow.SplitState;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -37,15 +34,13 @@ public class SplitStateTests {
@Test
public void testBasicHandling() throws Exception {
Collection<Flow<Object>> flows = new ArrayList<Flow<Object>>();
@SuppressWarnings("unchecked")
Flow<Object> flow1 = EasyMock.createMock(Flow.class);
@SuppressWarnings("unchecked")
Flow<Object> flow2 = EasyMock.createMock(Flow.class);
Collection<Flow> flows = new ArrayList<Flow>();
Flow flow1 = EasyMock.createMock(Flow.class);
Flow flow2 = EasyMock.createMock(Flow.class);
flows.add(flow1);
flows.add(flow2);
SplitState<Object> state = new SplitState<Object>(flows, "foo");
SplitState state = new SplitState(flows, "foo");
EasyMock.expect(flow1.start(null)).andReturn(new FlowExecution("step1", FlowExecution.COMPLETED));
EasyMock.expect(flow2.start(null)).andReturn(new FlowExecution("step1", FlowExecution.COMPLETED));
@@ -61,15 +56,13 @@ public class SplitStateTests {
@Test
public void testConcurrentHandling() throws Exception {
Collection<Flow<Object>> flows = new ArrayList<Flow<Object>>();
@SuppressWarnings("unchecked")
Flow<Object> flow1 = EasyMock.createMock(Flow.class);
@SuppressWarnings("unchecked")
Flow<Object> flow2 = EasyMock.createMock(Flow.class);
Collection<Flow> flows = new ArrayList<Flow>();
Flow flow1 = EasyMock.createMock(Flow.class);
Flow flow2 = EasyMock.createMock(Flow.class);
flows.add(flow1);
flows.add(flow2);
SplitState<Object> state = new SplitState<Object>(flows, "foo");
SplitState state = new SplitState(flows, "foo");
state.setTaskExecutor(new SimpleAsyncTaskExecutor());
EasyMock.expect(flow1.start(null)).andReturn(new FlowExecution("step1", FlowExecution.COMPLETED));

4
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java
View File

@@ -25,7 +25,7 @@ import org.springframework.batch.core.job.flow.State;
* @author Dave Syer
*
*/
public class StateSupport<T> extends AbstractState<T> {
public class StateSupport extends AbstractState {
/**
* @param name
@@ -35,7 +35,7 @@ public class StateSupport<T> extends AbstractState<T> {
}
@Override
public String handle(T context) throws Exception {
public String handle(JobFlowExecutor executor) throws Exception {
return FlowExecution.COMPLETED;
}

39
spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java
View File

@@ -20,7 +20,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.batch.core.job.flow.StateTransition;
/**
* @author Dave Syer
@@ -30,96 +29,96 @@ public class StateTransitionTests {
@Test
public void testIsEnd() {
StateTransition<String> transition = StateTransition.createEndStateTransition(null, "");
StateTransition transition = StateTransition.createEndStateTransition(null, "");
assertTrue(transition.isEnd());
assertNull(transition.getNext());
}
@Test
public void testMatchesStar() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "*", "start");
StateTransition transition = StateTransition.createStateTransition(null, "*", "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testMatchesNull() {
StateTransition<String> transition = StateTransition.createStateTransition(null, null, "start");
StateTransition transition = StateTransition.createStateTransition(null, null, "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testMatchesEmpty() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "", "start");
StateTransition transition = StateTransition.createStateTransition(null, "", "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testMatchesExact() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testMatchesWildcard() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN*", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN*", "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testMatchesPlaceholder() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
assertTrue(transition.matches("CONTINUABLE"));
}
@Test
public void testSimpleOrderingEqual() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
assertEquals(0, transition.compareTo(transition));
}
@Test
public void testSimpleOrderingMoreGeneral() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
StateTransition<String> other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
StateTransition other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
assertEquals(1, transition.compareTo(other));
assertEquals(-1, other.compareTo(transition));
}
@Test
public void testSimpleOrderingMostGeneral() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "*", "start");
StateTransition<String> other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "*", "start");
StateTransition other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
assertEquals(1, transition.compareTo(other));
assertEquals(-1, other.compareTo(transition));
}
@Test
public void testSubstringAndWildcard() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN*", "start");
StateTransition<String> other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN*", "start");
StateTransition other = StateTransition.createStateTransition(null, "CONTINUABLE", "start");
assertEquals(1, transition.compareTo(other));
assertEquals(-1, other.compareTo(transition));
}
@Test
public void testSimpleOrderingMostToNextGeneral() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "*", "start");
StateTransition<String> other = StateTransition.createStateTransition(null, "C?", "start");
StateTransition transition = StateTransition.createStateTransition(null, "*", "start");
StateTransition other = StateTransition.createStateTransition(null, "C?", "start");
assertEquals(1, transition.compareTo(other));
assertEquals(-1, other.compareTo(transition));
}
@Test
public void testSimpleOrderingAdjacent() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CON*", "start");
StateTransition<String> other = StateTransition.createStateTransition(null, "CON?", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CON*", "start");
StateTransition other = StateTransition.createStateTransition(null, "CON?", "start");
assertEquals(1, transition.compareTo(other));
assertEquals(-1, other.compareTo(transition));
}
@Test
public void testToString() {
StateTransition<String> transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
StateTransition transition = StateTransition.createStateTransition(null, "CONTIN???LE", "start");
String string = transition.toString();
assertTrue("Wrong string: " + string, string.contains("Transition"));
assertTrue("Wrong string: " + string, string.contains("start"));