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

Clean machine id when restored with null context

Browse Source 
- Resetting a machine with null context currently
  just resets to initial state and clear extended
  state variables. Enhance also to clear machine id
  which as a user level variable may cause some other
  trouble. There are no internal functionality for this
  id as it's meant for user consumption.
- Fixes #390
This commit is contained in:
Janne Valkealahti
2017-07-08 18:00:02 +01:00
parent 8c18dc86de
commit a9cf3e1acc
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,9 +591,10 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
public void resetStateMachine(StateMachineContext<S, E> stateMachineContext) {
// TODO: this function needs a serious rewrite
if (stateMachineContext == null) {
log.info("Got null context, resetting to initial state and clearing extended state");
log.info("Got null context, resetting to initial state, clearing extended state and machine id");
currentState = initialState;
extendedState.getVariables().clear();
setId(null);
return;
}
if (log.isDebugEnabled()) {

19
spring-statemachine-core/src/test/java/org/springframework/statemachine/persist/StateMachinePersistTests3.java
View File

@@ -113,6 +113,25 @@ public class StateMachinePersistTests3 extends AbstractStateMachineTests {
assertThat(stateMachine.getId(), is("newid"));
}
@Test
public void testRestoreClearWithNullContext() throws Exception {
context.register(Config1.class);
context.refresh();
InMemoryStateMachinePersist1 stateMachinePersist = new InMemoryStateMachinePersist1();
StateMachinePersister<String, String, String> persister = new DefaultStateMachinePersister<>(stateMachinePersist);
@SuppressWarnings("unchecked")
StateMachineFactory<String, String> stateMachineFactory = context.getBean(StateMachineFactory.class);
StateMachine<String,String> stateMachine = stateMachineFactory.getStateMachine("testid2");
assertThat(stateMachine, notNullValue());
assertThat(stateMachine.getId(), is("testid2"));
persister.persist(stateMachine, "xxx");
stateMachine = persister.restore(stateMachine, "notfound");
assertThat(stateMachine.getId(), nullValue());
}
@Configuration
@EnableStateMachineFactory
public static class Config1 extends StateMachineConfigurerAdapter<String, String> {