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

Add base DefaultStateMachineService implementation

Browse Source 
- First take on new interface StateMachineService with
  its default impl.
- Modify datajpapersist sample to use it.
- Relates to #432
This commit is contained in:
Janne Valkealahti
2017-11-21 10:46:49 +00:00
parent c0e5a9d305
commit 3d538f7600
4 changed files with 195 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-statemachine-samples/datajpapersist/src/main/java/demo/datajpapersist/StateMachineConfig.java
View File

@@ -20,14 +20,18 @@ import java.util.EnumSet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.statemachine.StateMachinePersist;
import org.springframework.statemachine.config.EnableStateMachineFactory;
import org.springframework.statemachine.config.StateMachineConfigurerAdapter;
import org.springframework.statemachine.config.StateMachineFactory;
import org.springframework.statemachine.config.builders.StateMachineConfigurationConfigurer;
import org.springframework.statemachine.config.builders.StateMachineStateConfigurer;
import org.springframework.statemachine.config.builders.StateMachineTransitionConfigurer;
import org.springframework.statemachine.data.jpa.JpaPersistingStateMachineInterceptor;
import org.springframework.statemachine.data.jpa.JpaStateMachineRepository;
import org.springframework.statemachine.persist.StateMachineRuntimePersister;
import org.springframework.statemachine.service.DefaultStateMachineService;
import org.springframework.statemachine.service.StateMachineService;
@Configuration
public class StateMachineConfig {
@@ -35,7 +39,7 @@ public class StateMachineConfig {
//tag::snippetA[]
@Configuration
@EnableStateMachineFactory
public static class Config extends StateMachineConfigurerAdapter<States, Events> {
public static class MachineConfig extends StateMachineConfigurerAdapter<States, Events> {
@Autowired
private JpaStateMachineRepository jpaStateMachineRepository;
@@ -93,6 +97,16 @@ public class StateMachineConfig {
}
//end::snippetA[]
@Configuration
public static class ServiceConfig {
@Bean
public StateMachineService<States, Events> stateMachineService(StateMachineFactory<States, Events> stateMachineFactory,
StateMachinePersist<States, Events, String> stateMachinePersist) {
return new DefaultStateMachineService<>(stateMachineFactory, stateMachinePersist);
}
}
//tag::snippetB[]
public enum States {
S1, S2, S3, S4, S5, S6;

55
spring-statemachine-samples/datajpapersist/src/main/java/demo/datajpapersist/StateMachineController.java
View File

@@ -22,9 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.statemachine.StateMachine;
import org.springframework.statemachine.StateMachineContext;
import org.springframework.statemachine.StateMachinePersist;
import org.springframework.statemachine.access.StateMachineAccess;
import org.springframework.statemachine.access.StateMachineFunction;
import org.springframework.statemachine.config.StateMachineFactory;
import org.springframework.statemachine.service.StateMachineService;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.ObjectUtils;
@@ -41,15 +39,15 @@ public class StateMachineController {
public final static String MACHINE_ID_2 = "datajpapersist2";
private final static String[] MACHINES = new String[] { MACHINE_ID_1, MACHINE_ID_2 };
private final StateMachineLogListener listener = new StateMachineLogListener();
private StateMachine<States, Events> currentStateMachine;
@Autowired
private StateMachineFactory<States, Events> stateMachineFactory;
private StateMachineService<States, Events> stateMachineService;
@Autowired
private StateMachinePersist<States, Events, String> stateMachinePersist;
private StateMachine<States, Events> cachedStateMachine;
private final StateMachineLogListener listener = new StateMachineLogListener();
@RequestMapping("/")
public String home() {
return "redirect:/state";
@@ -60,7 +58,6 @@ public class StateMachineController {
@RequestParam(value = "events", required = false) List<Events> events,
@RequestParam(value = "machine", required = false, defaultValue = MACHINE_ID_1) String machine,
Model model) throws Exception {
StateMachine<States, Events> stateMachine = getStateMachine(machine);
if (events != null) {
for (Events event : events) {
@@ -77,40 +74,18 @@ public class StateMachineController {
}
private synchronized StateMachine<States, Events> getStateMachine(String machineId) throws Exception {
if (cachedStateMachine == null) {
cachedStateMachine = buildStateMachine(machineId);
cachedStateMachine.start();
} else {
if (!ObjectUtils.nullSafeEquals(cachedStateMachine.getId(), machineId)) {
cachedStateMachine.stop();
cachedStateMachine = buildStateMachine(machineId);
cachedStateMachine.start();
}
}
return cachedStateMachine;
}
private StateMachine<States, Events> buildStateMachine(String machineId) throws Exception {
StateMachine<States, Events> stateMachine = stateMachineFactory.getStateMachine(machineId);
stateMachine.addStateListener(listener);
listener.resetMessages();
return restoreStateMachine(stateMachine, stateMachinePersist.read(machineId));
}
private StateMachine<States, Events> restoreStateMachine(StateMachine<States, Events> stateMachine,
StateMachineContext<States, Events> stateMachineContext) {
if (stateMachineContext == null) {
return stateMachine;
if (currentStateMachine == null) {
currentStateMachine = stateMachineService.acquireStateMachine(machineId);
currentStateMachine.addStateListener(listener);
currentStateMachine.start();
} else if (!ObjectUtils.nullSafeEquals(currentStateMachine.getId(), machineId)) {
currentStateMachine.stop();
currentStateMachine = stateMachineService.acquireStateMachine(machineId);
currentStateMachine.addStateListener(listener);
currentStateMachine.start();
}
stateMachine.stop();
stateMachine.getStateMachineAccessor().doWithAllRegions(new StateMachineFunction<StateMachineAccess<States, Events>>() {
@Override
public void apply(StateMachineAccess<States, Events> function) {
function.resetStateMachine(stateMachineContext);
}
});
return stateMachine;
return currentStateMachine;
}
private Events[] getEvents() {