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

Triggerless transition doesn't work from initial to terminate

Browse Source 
- Fix correct handling in this case.
- Tune lifecycle so that recursive calls to
  start() in a same thread doesn't cause multiple
  calls to doStart().
This commit is contained in:
Janne Valkealahti
2015-05-09 17:45:42 +01:00
parent 44c6e53834
commit 214f8a45e3
3 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
View File

@@ -371,7 +371,7 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
}
}
}
private State<S, E> findStateWithPseudoState(PseudoState<S, E> pseudoState) {
for (State<S, E> s : states) {
if (s.getPseudoState() == pseudoState) {

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/support/LifecycleObjectSupport.java
View File

@@ -101,8 +101,8 @@ public abstract class LifecycleObjectSupport implements InitializingBean, SmartL
this.lifecycleLock.lock();
try {
if (!this.running) {
this.doStart();
this.running = true;
this.doStart();
if (log.isInfoEnabled()) {
log.info("started " + this);
} else {

72
spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionTests.java
View File

@@ -17,6 +17,7 @@ package org.springframework.statemachine.transition;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -59,7 +60,33 @@ public class TransitionTests extends AbstractStateMachineTests {
machine.sendEvent(MessageBuilder.withPayload(TestEvents.E1).build());
assertThat(machine.getState().getIds(), contains(TestStates.S3));
ctx.close();
}
@SuppressWarnings({ "unchecked" })
@Test
public void testTriggerlessTransitionFromInitial() throws Exception {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(BaseConfig.class, Config3.class);
assertTrue(ctx.containsBean(StateMachineSystemConstants.DEFAULT_ID_STATEMACHINE));
EnumStateMachine<TestStates,TestEvents> machine =
ctx.getBean(StateMachineSystemConstants.DEFAULT_ID_STATEMACHINE, EnumStateMachine.class);
machine.start();
assertThat(machine.getState().getIds(), contains(TestStates.S2));
ctx.close();
}
@SuppressWarnings({ "unchecked" })
@Test
public void testTriggerlessTransitionFromInitialToEnd() throws Exception {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(BaseConfig.class, Config4.class);
assertTrue(ctx.containsBean(StateMachineSystemConstants.DEFAULT_ID_STATEMACHINE));
EnumStateMachine<TestStates,TestEvents> machine =
ctx.getBean(StateMachineSystemConstants.DEFAULT_ID_STATEMACHINE, EnumStateMachine.class);
machine.start();
// end state terminates sm so state is null
assertThat(machine.getState(), nullValue());
assertThat(machine.isComplete(), is(true));
assertThat(machine.isRunning(), is(false));
ctx.close();
}
@SuppressWarnings({ "unchecked" })
@@ -174,4 +201,49 @@ public class TransitionTests extends AbstractStateMachineTests {
}
@Configuration
@EnableStateMachine
public static class Config3 extends EnumStateMachineConfigurerAdapter<TestStates, TestEvents> {
@Override
public void configure(StateMachineStateConfigurer<TestStates, TestEvents> states) throws Exception {
states
.withStates()
.initial(TestStates.S1)
.states(EnumSet.allOf(TestStates.class));
}
@Override
public void configure(StateMachineTransitionConfigurer<TestStates, TestEvents> transitions) throws Exception {
transitions
.withExternal()
.source(TestStates.S1)
.target(TestStates.S2);
}
}
@Configuration
@EnableStateMachine
public static class Config4 extends EnumStateMachineConfigurerAdapter<TestStates, TestEvents> {
@Override
public void configure(StateMachineStateConfigurer<TestStates, TestEvents> states) throws Exception {
states
.withStates()
.initial(TestStates.S1)
.state(TestStates.SF)
.end(TestStates.SF);
}
@Override
public void configure(StateMachineTransitionConfigurer<TestStates, TestEvents> transitions) throws Exception {
transitions
.withExternal()
.source(TestStates.S1)
.target(TestStates.SF);
}
}
}