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

Support FunctionBehavior for actions

Browse Source 
- Fixes #199
This commit is contained in:
Janne Valkealahti
2016-04-17 15:24:40 +01:00
parent 8cbb9c1e37
commit a4a4a28faf
6 changed files with 261 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-statemachine-core/src/main/java/org/springframework/statemachine/config/model/TransitionData.java
View File

@@ -51,6 +51,21 @@ public class TransitionData<S, E> {
this(source, target, null, event, null, null, null, null, TransitionKind.EXTERNAL, null);
}
/**
* Instantiates a new transition data.
*
* @param source the source
* @param target the target
* @param event the event
* @param actions the actions
* @param guard the guard
* @param kind the kind
*/
public TransitionData(S source, S target, E event, Collection<Action<S, E>> actions,
Guard<S, E> guard, TransitionKind kind) {
this(source, target, null, event, null, null, actions, guard, TransitionKind.EXTERNAL, null);
}
/**
* Instantiates a new transition data.
*

48
spring-statemachine-uml/src/main/java/org/springframework/statemachine/uml/UmlModelParser.java
View File

@@ -25,9 +25,11 @@ import java.util.Map;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.uml2.uml.Activity;
import org.eclipse.uml2.uml.BodyOwner;
import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.Event;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.OpaqueBehavior;
import org.eclipse.uml2.uml.OpaqueExpression;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.Pseudostate;
@@ -277,7 +279,7 @@ public class UmlModelParser {
Signal signal = ((SignalEvent)event).getSignal();
if (signal != null) {
transitionDatas.add(new TransitionData<String, String>(transition.getSource().getName(),
transition.getTarget().getName(), signal.getName()));
transition.getTarget().getName(), signal.getName(), resolveTransitionActions(transition), null, null));
}
}
}
@@ -285,11 +287,23 @@ public class UmlModelParser {
// create anonymous transition if needed
if (shouldCreateAnonymousTransition(transition)) {
transitionDatas.add(new TransitionData<String, String>(transition.getSource().getName(),
transition.getTarget().getName(), null));
transition.getTarget().getName(), null, resolveTransitionActions(transition), null, null));
}
}
}
private Collection<Action<String, String>> resolveTransitionActions(Transition transition) {
ArrayList<Action<String, String>> actions = new ArrayList<Action<String, String>>();
if (transition.getEffect() instanceof OpaqueBehavior) {
String beanId = resolveBodyLanguage("bean", (OpaqueBehavior)transition.getEffect());
Action<String, String> bean = resolver.resolveAction(beanId);
if (bean != null) {
actions.add(bean);
}
}
return actions;
}
private boolean shouldCreateAnonymousTransition(Transition transition) {
if (!transition.getTriggers().isEmpty()) {
return false;
@@ -314,6 +328,28 @@ public class UmlModelParser {
}
private StateData<String, String> handleActions(StateData<String, String> stateData, State state) {
if (state.getEntry() instanceof OpaqueBehavior) {
String beanId = resolveBodyLanguage("bean", (OpaqueBehavior)state.getEntry());
if (StringUtils.hasText(beanId)) {
Action<String, String> bean = resolver.resolveAction(beanId);
if (bean != null) {
ArrayList<Action<String, String>> entrys = new ArrayList<Action<String, String>>();
entrys.add(bean);
stateData.setEntryActions(entrys);
}
}
}
if (state.getExit() instanceof OpaqueBehavior) {
String beanId = resolveBodyLanguage("bean", (OpaqueBehavior)state.getExit());
if (StringUtils.hasText(beanId)) {
Action<String, String> bean = resolver.resolveAction(beanId);
if (bean != null) {
ArrayList<Action<String, String>> entrys = new ArrayList<Action<String, String>>();
entrys.add(bean);
stateData.setExitActions(entrys);
}
}
}
if (state.getEntry() instanceof Activity) {
String beanId = ((Activity)state.getEntry()).getName();
Action<String, String> bean = resolver.resolveAction(beanId);
@@ -335,6 +371,14 @@ public class UmlModelParser {
return stateData;
}
private static String resolveBodyLanguage(String language, BodyOwner owner) {
try {
return owner.getBodies().get(owner.getLanguages().indexOf(language));
} catch (Exception e) {
return null;
}
}
/**
* Holder object for results returned from uml parser.
*/

51
spring-statemachine-uml/src/test/java/org/springframework/statemachine/uml/UmlStateMachineModelFactoryTests.java
View File

@@ -390,6 +390,24 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests {
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S7"));
}
@Test
@SuppressWarnings("unchecked")
public void testSimpleActions() throws Exception {
context.register(Config11.class);
context.refresh();
StateMachine<String, String> stateMachine = context.getBean(StateMachine.class);
LatchAction e1Action = context.getBean("e1Action", LatchAction.class);
LatchAction s1Exit = context.getBean("s1Exit", LatchAction.class);
LatchAction s2Entry = context.getBean("s2Entry", LatchAction.class);
stateMachine.start();
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1"));
stateMachine.sendEvent("E1");
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2"));
assertThat(e1Action.latch.await(1, TimeUnit.SECONDS), is(true));
assertThat(s1Exit.latch.await(1, TimeUnit.SECONDS), is(true));
assertThat(s2Entry.latch.await(1, TimeUnit.SECONDS), is(true));
}
@Configuration
@EnableStateMachine
public static class Config2 extends StateMachineConfigurerAdapter<String, String> {
@@ -577,6 +595,39 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests {
}
}
@Configuration
@EnableStateMachine
public static class Config11 extends StateMachineConfigurerAdapter<String, String> {
@Override
public void configure(StateMachineModelConfigurer<String, String> model) throws Exception {
model
.withModel()
.factory(modelFactory());
}
@Bean
public StateMachineModelFactory<String, String> modelFactory() {
Resource model = new ClassPathResource("org/springframework/statemachine/uml/simple-actions.uml");
return new UmlStateMachineModelFactory(model);
}
@Bean
public LatchAction s1Exit() {
return new LatchAction();
}
@Bean
public LatchAction s2Entry() {
return new LatchAction();
}
@Bean
public LatchAction e1Action() {
return new LatchAction();
}
}
public static class LatchAction implements Action<String, String> {
CountDownLatch latch = new CountDownLatch(1);
@Override

2
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-actions.di Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

117
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-actions.notation Normal file
View File

@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_UVhBUASXEeaXyaQL1WyV3A" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_UVhBUQSXEeaXyaQL1WyV3A" type="2000">
<children xmi:type="notation:DecorationNode" xmi:id="_UVhBUgSXEeaXyaQL1WyV3A" type="2001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVhBUwSXEeaXyaQL1WyV3A" width="700" height="23"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_UVhBVASXEeaXyaQL1WyV3A" type="2002">
<children xmi:type="notation:Shape" xmi:id="_UVhBVQSXEeaXyaQL1WyV3A" type="3000">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UVhBVgSXEeaXyaQL1WyV3A" source="RegionAnnotationKey">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UVhBVwSXEeaXyaQL1WyV3A" key="RegionZoneKey" value=""/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_UVhBWASXEeaXyaQL1WyV3A" type="3002">
<children xmi:type="notation:Shape" xmi:id="_skH6YASXEeaXyaQL1WyV3A" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_skH6YgSXEeaXyaQL1WyV3A" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yadboASXEeaXyaQL1WyV3A" width="261"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_skH6YwSXEeaXyaQL1WyV3A" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_skH6ZASXEeaXyaQL1WyV3A" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_skH6ZQSXEeaXyaQL1WyV3A" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_skH6ZgSXEeaXyaQL1WyV3A" y="-1" width="261"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_skK9sASXEeaXyaQL1WyV3A" type="compartment_shape_display">
<styles xmi:type="notation:TitleStyle" xmi:id="_skK9sQSXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_skK9sgSXEeaXyaQL1WyV3A"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_F02XwASYEeaXyaQL1WyV3A" type="692">
<element xmi:type="uml:OpaqueBehavior" href="simple-actions.uml#_F0fLYASYEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_F02XwQSYEeaXyaQL1WyV3A"/>
</children>
<element xmi:type="uml:State" href="simple-actions.uml#_skGFMASXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_skH6YQSXEeaXyaQL1WyV3A" x="230" y="27" width="261" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_s9FM8ASXEeaXyaQL1WyV3A" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_s9FM8gSXEeaXyaQL1WyV3A" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_weYJcASXEeaXyaQL1WyV3A" width="261"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_s9FM8wSXEeaXyaQL1WyV3A" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_s9FM9ASXEeaXyaQL1WyV3A" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_s9FM9QSXEeaXyaQL1WyV3A" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9FM9gSXEeaXyaQL1WyV3A" y="-1" width="261"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_s9IQQASXEeaXyaQL1WyV3A" type="compartment_shape_display">
<styles xmi:type="notation:TitleStyle" xmi:id="_s9IQQQSXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9IQQgSXEeaXyaQL1WyV3A"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Pk_cIASYEeaXyaQL1WyV3A" type="690">
<element xmi:type="uml:FunctionBehavior" href="simple-actions.uml#_Pk2SMASYEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Pk_cIQSYEeaXyaQL1WyV3A"/>
</children>
<element xmi:type="uml:State" href="simple-actions.uml#_s9CwsASXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_s9FM8QSXEeaXyaQL1WyV3A" x="230" y="207" width="261" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_tTzD0ASXEeaXyaQL1WyV3A" type="8000">
<children xmi:type="notation:DecorationNode" xmi:id="_tTzD0gSXEeaXyaQL1WyV3A" type="8001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_tTzD0wSXEeaXyaQL1WyV3A" x="25" y="3"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_tTzD1ASXEeaXyaQL1WyV3A" type="8002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_tTzD1QSXEeaXyaQL1WyV3A" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="simple-actions.uml#_tTvZcASXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzD0QSXEeaXyaQL1WyV3A" x="10" y="47"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVhBWQSXEeaXyaQL1WyV3A"/>
</children>
<element xmi:type="uml:Region" href="simple-actions.uml#_UVgaQASXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVhBWgSXEeaXyaQL1WyV3A" width="700" height="287"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVhBWwSXEeaXyaQL1WyV3A" y="23" width="700" height="287"/>
</children>
<element xmi:type="uml:StateMachine" href="simple-actions.uml#_UVfzMASXEeaXyaQL1WyV3A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UVhBXASXEeaXyaQL1WyV3A" x="30" y="30" width="700" height="310"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_UVhBXQSXEeaXyaQL1WyV3A" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_UVhBXgSXEeaXyaQL1WyV3A"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_UVhBXwSXEeaXyaQL1WyV3A">
<owner xmi:type="uml:Model" href="simple-actions.uml#_UVfMIASXEeaXyaQL1WyV3A"/>
</styles>
<element xmi:type="uml:StateMachine" href="simple-actions.uml#_UVfzMASXEeaXyaQL1WyV3A"/>
<edges xmi:type="notation:Connector" xmi:id="_uGtugASXEeaXyaQL1WyV3A" type="7000" source="_skH6YASXEeaXyaQL1WyV3A" target="_s9FM8ASXEeaXyaQL1WyV3A">
<children xmi:type="notation:DecorationNode" xmi:id="_uGtugwSXEeaXyaQL1WyV3A" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_uGtuhASXEeaXyaQL1WyV3A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_uGtuhQSXEeaXyaQL1WyV3A" type="7002">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AXe6sASZEeaXyaQL1WyV3A" source="QualifiedName">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AXfhwASZEeaXyaQL1WyV3A" key="QualifiedNameDepth" value="0"/>
</eAnnotations>
<styles xmi:type="notation:StringValueStyle" xmi:id="_Nq-xEASZEeaXyaQL1WyV3A" name="textAlignment" stringValue="left"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_uGtuhgSXEeaXyaQL1WyV3A" x="-7" y="47"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_uGtuhwSXEeaXyaQL1WyV3A" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_uGtuiASXEeaXyaQL1WyV3A" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_uGtugQSXEeaXyaQL1WyV3A"/>
<element xmi:type="uml:Transition" href="simple-actions.uml#_uGoO8ASXEeaXyaQL1WyV3A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uGtuggSXEeaXyaQL1WyV3A" points="[50, 4, -190, 4]$[242, 3, 2, 3]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uG6i0ASXEeaXyaQL1WyV3A" id="(0.14942528735632185,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uG6i0QSXEeaXyaQL1WyV3A" id="(0.1532567049808429,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_3QgkkASXEeaXyaQL1WyV3A" type="7000" source="_tTzD0ASXEeaXyaQL1WyV3A" target="_skH6YASXEeaXyaQL1WyV3A">
<children xmi:type="notation:DecorationNode" xmi:id="_3QhLoASXEeaXyaQL1WyV3A" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_3QhLoQSXEeaXyaQL1WyV3A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_3QhLogSXEeaXyaQL1WyV3A" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_3QhLowSXEeaXyaQL1WyV3A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_3QhLpASXEeaXyaQL1WyV3A" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_3QhLpQSXEeaXyaQL1WyV3A" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_3QgkkQSXEeaXyaQL1WyV3A"/>
<element xmi:type="uml:Transition" href="simple-actions.uml#_3QbFAASXEeaXyaQL1WyV3A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3QgkkgSXEeaXyaQL1WyV3A" points="[8, -4, -77, 0]$[70, -5, -15, -1]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Qv1IASXEeaXyaQL1WyV3A" id="(1.0,0.4)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Qv1IQSXEeaXyaQL1WyV3A" id="(0.0,0.4262295081967213)"/>
</edges>
</notation:Diagram>

30
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-actions.uml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_UVfMIASXEeaXyaQL1WyV3A" name="RootElement">
<packagedElement xmi:type="uml:StateMachine" xmi:id="_UVfzMASXEeaXyaQL1WyV3A" name="StateMachine">
<region xmi:type="uml:Region" xmi:id="_UVgaQASXEeaXyaQL1WyV3A" name="Region1">
<transition xmi:type="uml:Transition" xmi:id="_uGoO8ASXEeaXyaQL1WyV3A" source="_skGFMASXEeaXyaQL1WyV3A" target="_s9CwsASXEeaXyaQL1WyV3A">
<effect xmi:type="uml:FunctionBehavior" xmi:id="_arDKkASYEeaXyaQL1WyV3A" name="e1Action">
<language>bean</language>
<body>e1Action</body>
</effect>
<trigger xmi:type="uml:Trigger" xmi:id="_9AxTAASXEeaXyaQL1WyV3A" event="_5unlwASXEeaXyaQL1WyV3A"/>
</transition>
<transition xmi:type="uml:Transition" xmi:id="_3QbFAASXEeaXyaQL1WyV3A" source="_tTvZcASXEeaXyaQL1WyV3A" target="_skGFMASXEeaXyaQL1WyV3A"/>
<subvertex xmi:type="uml:State" xmi:id="_skGFMASXEeaXyaQL1WyV3A" name="S1">
<exit xmi:type="uml:OpaqueBehavior" xmi:id="_F0fLYASYEeaXyaQL1WyV3A" name="s1Exit">
<language>bean</language>
<body>s1Exit</body>
</exit>
</subvertex>
<subvertex xmi:type="uml:State" xmi:id="_s9CwsASXEeaXyaQL1WyV3A" name="S2">
<entry xmi:type="uml:FunctionBehavior" xmi:id="_Pk2SMASYEeaXyaQL1WyV3A" name="s2Entry">
<language>bean</language>
<body>s2Entry</body>
</entry>
</subvertex>
<subvertex xmi:type="uml:Pseudostate" xmi:id="_tTvZcASXEeaXyaQL1WyV3A"/>
</region>
</packagedElement>
<packagedElement xmi:type="uml:Signal" xmi:id="_4ZMq8ASXEeaXyaQL1WyV3A" name="E1"/>
<packagedElement xmi:type="uml:SignalEvent" xmi:id="_5unlwASXEeaXyaQL1WyV3A" name="SignalEventE1" signal="_4ZMq8ASXEeaXyaQL1WyV3A"/>
</uml:Model>