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

Add spel support for uml

Browse Source 
- Now Guards and Actions can be defined
  as expressions if 'spel' language is used.
- Fixes #215
This commit is contained in:
Janne Valkealahti
2016-05-01 15:35:50 +01:00
parent 3cf40e8220
commit e7c28c2353
5 changed files with 226 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,11 @@ import org.eclipse.uml2.uml.Transition;
import org.eclipse.uml2.uml.Trigger;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.Vertex;
import org.springframework.expression.spel.SpelCompilerMode;
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.statemachine.action.Action;
import org.springframework.statemachine.action.SpelExpressionAction;
import org.springframework.statemachine.config.model.ChoiceData;
import org.springframework.statemachine.config.model.EntryData;
import org.springframework.statemachine.config.model.ExitData;
@@ -55,6 +59,7 @@ import org.springframework.statemachine.config.model.StatesData;
import org.springframework.statemachine.config.model.TransitionData;
import org.springframework.statemachine.config.model.TransitionsData;
import org.springframework.statemachine.guard.Guard;
import org.springframework.statemachine.guard.SpelExpressionGuard;
import org.springframework.statemachine.state.PseudoStateKind;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -68,6 +73,7 @@ import org.springframework.util.StringUtils;
public class UmlModelParser {
public final static String LANGUAGE_BEAN = "bean";
public final static String LANGUAGE_SPEL = "spel";
private final Model model;
private final StateMachineComponentResolver<String, String> resolver;
private final Collection<StateData<String, String>> stateDatas = new ArrayList<StateData<String, String>>();
@@ -311,6 +317,13 @@ public class UmlModelParser {
String beanId = UmlUtils.resolveBodyByLanguage(LANGUAGE_BEAN, (OpaqueExpression)c.getSpecification());
if (StringUtils.hasText(beanId)) {
guard = resolver.resolveGuard(beanId);
} else {
String expression = UmlUtils.resolveBodyByLanguage(LANGUAGE_SPEL, (OpaqueExpression)c.getSpecification());
if (StringUtils.hasText(expression)) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
guard = new SpelExpressionGuard<String, String>(parser.parseExpression(expression));
}
}
}
}
@@ -367,6 +380,15 @@ public class UmlModelParser {
entrys.add(bean);
stateData.setEntryActions(entrys);
}
} else {
String expression = UmlUtils.resolveBodyByLanguage(LANGUAGE_SPEL, (OpaqueBehavior)state.getEntry());
if (StringUtils.hasText(expression)) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
ArrayList<Action<String, String>> entrys = new ArrayList<Action<String, String>>();
entrys.add(new SpelExpressionAction<String, String>(parser.parseExpression(expression)));
stateData.setEntryActions(entrys);
}
}
}
if (state.getExit() instanceof OpaqueBehavior) {
@@ -374,9 +396,18 @@ public class UmlModelParser {
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);
ArrayList<Action<String, String>> exits = new ArrayList<Action<String, String>>();
exits.add(bean);
stateData.setExitActions(exits);
}
} else {
String expression = UmlUtils.resolveBodyByLanguage(LANGUAGE_SPEL, (OpaqueBehavior)state.getExit());
if (StringUtils.hasText(expression)) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
ArrayList<Action<String, String>> exits = new ArrayList<Action<String, String>>();
exits.add(new SpelExpressionAction<String, String>(parser.parseExpression(expression)));
stateData.setExitActions(exits);
}
}
}

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

@@ -538,6 +538,34 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests {
assertThat(initialAction.latch.await(1, TimeUnit.SECONDS), is(true));
}
@Test
@SuppressWarnings("unchecked")
public void testSimpleSpelsAllow() throws Exception {
context.register(Config16.class);
context.refresh();
StateMachine<String, String> stateMachine = context.getBean(StateMachine.class);
stateMachine.start();
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1"));
stateMachine.sendEvent(MessageBuilder.withPayload("E1").setHeader("foo", "bar").build());
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S2"));
assertThat(stateMachine.getExtendedState().get("myvar1", String.class), is("myvalue1"));
assertThat(stateMachine.getExtendedState().get("myvar2", String.class), is("myvalue2"));
}
@Test
@SuppressWarnings("unchecked")
public void testSimpleSpelsDeny() throws Exception {
context.register(Config16.class);
context.refresh();
StateMachine<String, String> stateMachine = context.getBean(StateMachine.class);
stateMachine.start();
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1"));
stateMachine.sendEvent("E1");
assertThat(stateMachine.getState().getIds(), containsInAnyOrder("S1"));
}
@Configuration
@EnableStateMachine
public static class Config2 extends StateMachineConfigurerAdapter<String, String> {
@@ -845,6 +873,23 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests {
}
}
@Configuration
@EnableStateMachine
public static class Config16 extends StateMachineConfigurerAdapter<String, String> {
@Override
public void configure(StateMachineModelConfigurer<String, String> model) throws Exception {
model
.withModel()
.factory(modelFactory());
}
@Bean
public StateMachineModelFactory<String, String> modelFactory() {
return new UmlStateMachineModelFactory("classpath:org/springframework/statemachine/uml/simple-spels.uml");
}
}
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-spels.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"/>

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

@@ -0,0 +1,113 @@
<?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="_uuFsgA-YEeaqleSKKcvuHQ" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_uuFsgQ-YEeaqleSKKcvuHQ" type="2000">
<children xmi:type="notation:DecorationNode" xmi:id="_uuFsgg-YEeaqleSKKcvuHQ" type="2001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uuFsgw-YEeaqleSKKcvuHQ" width="700" height="23"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_uuGTkA-YEeaqleSKKcvuHQ" type="2002">
<children xmi:type="notation:Shape" xmi:id="_uuGTkQ-YEeaqleSKKcvuHQ" type="3000">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uuGTkg-YEeaqleSKKcvuHQ" source="RegionAnnotationKey">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uuGTkw-YEeaqleSKKcvuHQ" key="RegionZoneKey" value=""/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_uuGTlA-YEeaqleSKKcvuHQ" type="3002">
<children xmi:type="notation:Shape" xmi:id="_ySx7QA-YEeaqleSKKcvuHQ" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_ySyiUA-YEeaqleSKKcvuHQ" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_3QRI8A-YEeaqleSKKcvuHQ" width="212"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_ySyiUQ-YEeaqleSKKcvuHQ" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_ySyiUg-YEeaqleSKKcvuHQ" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_ySyiUw-YEeaqleSKKcvuHQ" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySyiVA-YEeaqleSKKcvuHQ" y="-1" width="212"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_yS2zwA-YEeaqleSKKcvuHQ" type="compartment_shape_display">
<styles xmi:type="notation:TitleStyle" xmi:id="_yS2zwQ-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yS2zwg-YEeaqleSKKcvuHQ"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_BsQX8A-fEeaqleSKKcvuHQ" type="692">
<element xmi:type="uml:OpaqueBehavior" href="simple-spels.uml#_BsFY0A-fEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_BsQX8Q-fEeaqleSKKcvuHQ"/>
</children>
<element xmi:type="uml:State" href="simple-spels.uml#_ySvfAA-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySx7QQ-YEeaqleSKKcvuHQ" x="103" y="64" width="212" height="139"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_zmrzIA-YEeaqleSKKcvuHQ" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_zmsaMA-YEeaqleSKKcvuHQ" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_5KUa0A-YEeaqleSKKcvuHQ" width="212"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_zmsaMQ-YEeaqleSKKcvuHQ" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_zmsaMg-YEeaqleSKKcvuHQ" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_zmsaMw-YEeaqleSKKcvuHQ" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zmsaNA-YEeaqleSKKcvuHQ" y="-1" width="212"/>
</children>
<children xmi:type="notation:BasicCompartment" xmi:id="_zmvdgA-YEeaqleSKKcvuHQ" type="compartment_shape_display">
<styles xmi:type="notation:TitleStyle" xmi:id="_zmvdgQ-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zmvdgg-YEeaqleSKKcvuHQ"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_6koAMA-ZEeaqleSKKcvuHQ" type="690">
<element xmi:type="uml:OpaqueBehavior" href="simple-spels.uml#_6kSpAA-ZEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_6koAMQ-ZEeaqleSKKcvuHQ"/>
</children>
<element xmi:type="uml:State" href="simple-spels.uml#_zmov0A-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zmrzIQ-YEeaqleSKKcvuHQ" x="449" y="64" width="212" height="139"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_CUC_cA-ZEeaqleSKKcvuHQ" type="8000">
<children xmi:type="notation:DecorationNode" xmi:id="_CUC_cg-ZEeaqleSKKcvuHQ" type="8001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_CUC_cw-ZEeaqleSKKcvuHQ" x="25" y="3"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_CUDmgA-ZEeaqleSKKcvuHQ" type="8002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_CUDmgQ-ZEeaqleSKKcvuHQ" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="simple-spels.uml#_CT-G8A-ZEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_CUC_cQ-ZEeaqleSKKcvuHQ" x="17" y="89"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uuGTlQ-YEeaqleSKKcvuHQ"/>
</children>
<element xmi:type="uml:Region" href="simple-spels.uml#_uuFFcA-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uuGTlg-YEeaqleSKKcvuHQ" width="700" height="287"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uuGTlw-YEeaqleSKKcvuHQ" y="23" width="700" height="287"/>
</children>
<element xmi:type="uml:StateMachine" href="simple-spels.uml#_uuCpMA-YEeaqleSKKcvuHQ"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uuGTmA-YEeaqleSKKcvuHQ" x="30" y="30" width="700" height="310"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_uuGTmQ-YEeaqleSKKcvuHQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_uuGTmg-YEeaqleSKKcvuHQ"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_uuGTmw-YEeaqleSKKcvuHQ">
<owner xmi:type="uml:Model" href="simple-spels.uml#_ut2b8A-YEeaqleSKKcvuHQ"/>
</styles>
<element xmi:type="uml:StateMachine" href="simple-spels.uml#_uuCpMA-YEeaqleSKKcvuHQ"/>
<edges xmi:type="notation:Connector" xmi:id="_Dx42cA-ZEeaqleSKKcvuHQ" type="7000" source="_CUC_cA-ZEeaqleSKKcvuHQ" target="_ySx7QA-YEeaqleSKKcvuHQ">
<children xmi:type="notation:DecorationNode" xmi:id="_Dx42cw-ZEeaqleSKKcvuHQ" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Dx42dA-ZEeaqleSKKcvuHQ"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Dx42dQ-ZEeaqleSKKcvuHQ" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Dx42dg-ZEeaqleSKKcvuHQ"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Dx42dw-ZEeaqleSKKcvuHQ" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Dx42eA-ZEeaqleSKKcvuHQ" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Dx42cQ-ZEeaqleSKKcvuHQ"/>
<element xmi:type="uml:Transition" href="simple-spels.uml#_DxzW4A-ZEeaqleSKKcvuHQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Dx42cg-ZEeaqleSKKcvuHQ" points="[8, 0, -109, 0]$[76, -22, -41, -22]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DyFqwA-ZEeaqleSKKcvuHQ" id="(1.0,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DyFqwQ-ZEeaqleSKKcvuHQ" id="(0.0,0.2517985611510791)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_E-YewA-ZEeaqleSKKcvuHQ" type="7000" source="_ySx7QA-YEeaqleSKKcvuHQ" target="_zmrzIA-YEeaqleSKKcvuHQ">
<children xmi:type="notation:DecorationNode" xmi:id="_E-Yeww-ZEeaqleSKKcvuHQ" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_E-YexA-ZEeaqleSKKcvuHQ"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_E-YexQ-ZEeaqleSKKcvuHQ" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_E-Yexg-ZEeaqleSKKcvuHQ" x="2" y="-33"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_E-Yexw-ZEeaqleSKKcvuHQ" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_E-YeyA-ZEeaqleSKKcvuHQ" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_E-YewQ-ZEeaqleSKKcvuHQ"/>
<element xmi:type="uml:Transition" href="simple-spels.uml#_E-Qi8A-ZEeaqleSKKcvuHQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E-Yewg-ZEeaqleSKKcvuHQ" points="[19, -1, -146, 0]$[153, -2, -12, -1]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E-sAwA-ZEeaqleSKKcvuHQ" id="(1.0,0.11510791366906475)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E-sAwQ-ZEeaqleSKKcvuHQ" id="(0.0,0.11510791366906475)"/>
</edges>
</notation:Diagram>

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

@@ -0,0 +1,32 @@
<?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="_ut2b8A-YEeaqleSKKcvuHQ" name="RootElement">
<packagedElement xmi:type="uml:StateMachine" xmi:id="_uuCpMA-YEeaqleSKKcvuHQ" name="StateMachine">
<region xmi:type="uml:Region" xmi:id="_uuFFcA-YEeaqleSKKcvuHQ" name="Region1">
<transition xmi:type="uml:Transition" xmi:id="_DxzW4A-ZEeaqleSKKcvuHQ" source="_CT-G8A-ZEeaqleSKKcvuHQ" target="_ySvfAA-YEeaqleSKKcvuHQ"/>
<transition xmi:type="uml:Transition" xmi:id="_E-Qi8A-ZEeaqleSKKcvuHQ" guard="_VV1OUA-ZEeaqleSKKcvuHQ" source="_ySvfAA-YEeaqleSKKcvuHQ" target="_zmov0A-YEeaqleSKKcvuHQ">
<ownedRule xmi:type="uml:Constraint" xmi:id="_VV1OUA-ZEeaqleSKKcvuHQ">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_VV1OUQ-ZEeaqleSKKcvuHQ" name="spelGuard">
<language>spel</language>
<body>messageHeaders.get('foo')=='bar'</body>
</specification>
</ownedRule>
<trigger xmi:type="uml:Trigger" xmi:id="_Kgk8AA-ZEeaqleSKKcvuHQ" event="_HSa98A-ZEeaqleSKKcvuHQ"/>
</transition>
<subvertex xmi:type="uml:State" xmi:id="_ySvfAA-YEeaqleSKKcvuHQ" name="S1">
<exit xmi:type="uml:OpaqueBehavior" xmi:id="_BsFY0A-fEeaqleSKKcvuHQ" name="spelAction">
<language>spel</language>
<body>extendedState.variables.put('myvar2','myvalue2')</body>
</exit>
</subvertex>
<subvertex xmi:type="uml:State" xmi:id="_zmov0A-YEeaqleSKKcvuHQ" name="S2">
<entry xmi:type="uml:OpaqueBehavior" xmi:id="_6kSpAA-ZEeaqleSKKcvuHQ" name="spelAction">
<language>spel</language>
<body>extendedState.variables.put('myvar1','myvalue1')</body>
</entry>
</subvertex>
<subvertex xmi:type="uml:Pseudostate" xmi:id="_CT-G8A-ZEeaqleSKKcvuHQ" name=""/>
</region>
</packagedElement>
<packagedElement xmi:type="uml:Signal" xmi:id="_GD-04A-ZEeaqleSKKcvuHQ" name="E1"/>
<packagedElement xmi:type="uml:SignalEvent" xmi:id="_HSa98A-ZEeaqleSKKcvuHQ" name="SignalEventE1" signal="_GD-04A-ZEeaqleSKKcvuHQ"/>
</uml:Model>