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

Add final state support for uml model

Browse Source 
- Relates to #193
This commit is contained in:
Janne Valkealahti
2016-04-10 10:00:50 +01:00
parent 313fe954cb
commit 6f2e90f320
6 changed files with 187 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,6 +102,9 @@ public class UmlModelParser {
}
StateData<String, String> stateData = handleActions(
new StateData<String, String>(parent, regionId, state.getName(), UmlUtils.isInitialState(state)), state);
if (UmlUtils.isFinalState(state)) {
stateData.setEnd(true);
}
stateDatas.add(stateData);
// do recursive handling of regions
for (Region sub : state.getRegions()) {

11
spring-statemachine-uml/src/main/java/org/springframework/statemachine/uml/UmlUtils.java
View File

@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.uml2.uml.FinalState;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Pseudostate;
import org.eclipse.uml2.uml.PseudostateKind;
@@ -69,4 +70,14 @@ public abstract class UmlUtils {
}
return false;
}
/**
* Checks if {@link State} is a final state.
*
* @param state the state
* @return true, if is final state
*/
public static boolean isFinalState(State state) {
return state instanceof FinalState;
}
}

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

@@ -132,6 +132,32 @@ public class UmlStateMachineModelFactoryTests extends AbstractUmlTests {
}
}
@Test
public void testSimpleFlatEnd() {
context.refresh();
Resource model1 = new ClassPathResource("org/springframework/statemachine/uml/simple-flat-end.uml");
UmlStateMachineModelFactory builder = new UmlStateMachineModelFactory(model1);
builder.setBeanFactory(context);
assertThat(model1.exists(), is(true));
StateMachineModel<String, String> stateMachineModel = builder.build();
assertThat(stateMachineModel, notNullValue());
Collection<StateData<String, String>> stateDatas = stateMachineModel.getStatesData().getStateData();
assertThat(stateDatas.size(), is(3));
for (StateData<String, String> stateData : stateDatas) {
if (stateData.getState().equals("S1")) {
assertThat(stateData.isInitial(), is(true));
assertThat(stateData.isEnd(), is(false));
} else if (stateData.getState().equals("S2")) {
assertThat(stateData.isInitial(), is(false));
assertThat(stateData.isEnd(), is(false));
} else if (stateData.getState().equals("S3")) {
assertThat(stateData.isEnd(), is(true));
} else {
throw new IllegalArgumentException();
}
}
}
@Test
@SuppressWarnings("unchecked")
public void testSimpleFlatMachine() throws Exception {

2
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-flat-end.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"/>

123
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-flat-end.notation Normal file
View File

@@ -0,0 +1,123 @@
<?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="_yq-O0P7vEeW45bORGB4c_A" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_yq-O0f7vEeW45bORGB4c_A" type="2000">
<children xmi:type="notation:DecorationNode" xmi:id="_yq-O0v7vEeW45bORGB4c_A" type="2001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yq-O0_7vEeW45bORGB4c_A" width="700" height="23"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_yq-O1P7vEeW45bORGB4c_A" type="2002">
<children xmi:type="notation:Shape" xmi:id="_yq-O1f7vEeW45bORGB4c_A" type="3000">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yq-O1v7vEeW45bORGB4c_A" source="RegionAnnotationKey">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yq-O1_7vEeW45bORGB4c_A" key="RegionZoneKey" value=""/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_yq-O2P7vEeW45bORGB4c_A" type="3002">
<children xmi:type="notation:Shape" xmi:id="_15NscP7vEeW45bORGB4c_A" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_15OTgP7vEeW45bORGB4c_A" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_31l5kP7vEeW45bORGB4c_A" width="74"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_15OTgf7vEeW45bORGB4c_A" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_15OTgv7vEeW45bORGB4c_A" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_15OTg_7vEeW45bORGB4c_A" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_15OThP7vEeW45bORGB4c_A" y="-1" width="74"/>
</children>
<element xmi:type="uml:State" href="simple-flat-end.uml#_15Iz8P7vEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_15Nscf7vEeW45bORGB4c_A" x="170" y="87" width="74"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_4qh9gP7vEeW45bORGB4c_A" type="6000">
<children xmi:type="notation:DecorationNode" xmi:id="_4qh9gv7vEeW45bORGB4c_A" type="6001">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_6m3uYP7vEeW45bORGB4c_A" width="69"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_4qh9g_7vEeW45bORGB4c_A" type="19003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_4qh9hP7vEeW45bORGB4c_A" x="40"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_4qh9hf7vEeW45bORGB4c_A" type="6002">
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4qh9hv7vEeW45bORGB4c_A" y="-1" width="69"/>
</children>
<element xmi:type="uml:State" href="simple-flat-end.uml#_4qb24P7vEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4qh9gf7vEeW45bORGB4c_A" x="350" y="87" width="69"/>
</children>
<children xmi:type="notation:Shape" xmi:id="__PhUgP7vEeW45bORGB4c_A" type="8000">
<children xmi:type="notation:DecorationNode" xmi:id="__Ph7kP7vEeW45bORGB4c_A" type="8001">
<layoutConstraint xmi:type="notation:Location" xmi:id="__Ph7kf7vEeW45bORGB4c_A" x="25" y="3"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="__Ph7kv7vEeW45bORGB4c_A" type="8002">
<layoutConstraint xmi:type="notation:Location" xmi:id="__Ph7k_7vEeW45bORGB4c_A" x="25" y="-10"/>
</children>
<element xmi:type="uml:Pseudostate" href="simple-flat-end.uml#__Pam0P7vEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="__PhUgf7vEeW45bORGB4c_A" x="90" y="87"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_JffIcP7wEeW45bORGB4c_A" type="5000">
<children xmi:type="notation:DecorationNode" xmi:id="_JffvgP7wEeW45bORGB4c_A" type="5001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Jffvgf7wEeW45bORGB4c_A" x="25" y="3"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Jffvgv7wEeW45bORGB4c_A" type="5002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Jffvg_7wEeW45bORGB4c_A" x="25" y="-10"/>
</children>
<element xmi:type="uml:FinalState" href="simple-flat-end.uml#_JfSUIP7wEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_JffIcf7wEeW45bORGB4c_A" x="530" y="107"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yq-O2f7vEeW45bORGB4c_A"/>
</children>
<element xmi:type="uml:Region" href="simple-flat-end.uml#_yq8ZoP7vEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yq-O2v7vEeW45bORGB4c_A" width="700" height="287"/>
</children>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yq-O2_7vEeW45bORGB4c_A" y="23" width="700" height="287"/>
</children>
<element xmi:type="uml:StateMachine" href="simple-flat-end.uml#_yqwMYP7vEeW45bORGB4c_A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_yq-O3P7vEeW45bORGB4c_A" x="30" y="30" width="700" height="310"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_yq-O3f7vEeW45bORGB4c_A" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_yq-O3v7vEeW45bORGB4c_A"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_yq-O3_7vEeW45bORGB4c_A">
<owner xmi:type="uml:Model" href="simple-flat-end.uml#_yqPPAP7vEeW45bORGB4c_A"/>
</styles>
<element xmi:type="uml:StateMachine" href="simple-flat-end.uml#_yqwMYP7vEeW45bORGB4c_A"/>
<edges xmi:type="notation:Connector" xmi:id="_Fh-KAP7wEeW45bORGB4c_A" type="7000" source="__PhUgP7vEeW45bORGB4c_A" target="_15NscP7vEeW45bORGB4c_A">
<children xmi:type="notation:DecorationNode" xmi:id="_Fh_YIP7wEeW45bORGB4c_A" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Fh_YIf7wEeW45bORGB4c_A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Fh_YIv7wEeW45bORGB4c_A" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Fh_YI_7wEeW45bORGB4c_A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Fh_YJP7wEeW45bORGB4c_A" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Fh_YJf7wEeW45bORGB4c_A" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Fh-KAf7wEeW45bORGB4c_A"/>
<element xmi:type="uml:Transition" href="simple-flat-end.uml#_FfbzYP7wEeW45bORGB4c_A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fh-KAv7wEeW45bORGB4c_A" points="[8, 0, -121, -15]$[144, 16, 15, 1]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FiWkgP7wEeW45bORGB4c_A" id="(1.0,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FiWkgf7wEeW45bORGB4c_A" id="(0.0,0.3829787234042553)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_GuIbIP7wEeW45bORGB4c_A" type="7000" source="_15NscP7vEeW45bORGB4c_A" target="_4qh9gP7vEeW45bORGB4c_A">
<children xmi:type="notation:DecorationNode" xmi:id="_GuIbI_7wEeW45bORGB4c_A" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_GuIbJP7wEeW45bORGB4c_A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_GuIbJf7wEeW45bORGB4c_A" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_GuIbJv7wEeW45bORGB4c_A" x="2" y="-15"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_GuIbJ_7wEeW45bORGB4c_A" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_GuIbKP7wEeW45bORGB4c_A" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_GuIbIf7wEeW45bORGB4c_A"/>
<element xmi:type="uml:Transition" href="simple-flat-end.uml#_Gt-DEP7wEeW45bORGB4c_A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GuIbIv7wEeW45bORGB4c_A" points="[5, 0, -106, 24]$[165, 23, 54, 47]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GujR4P7wEeW45bORGB4c_A" id="(1.0,0.5106382978723404)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GujR4f7wEeW45bORGB4c_A" id="(0.0,0.5106382978723404)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_Ll2_EP7wEeW45bORGB4c_A" type="7000" source="_4qh9gP7vEeW45bORGB4c_A" target="_JffIcP7wEeW45bORGB4c_A">
<children xmi:type="notation:DecorationNode" xmi:id="_Ll3mIP7wEeW45bORGB4c_A" type="7001">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Ll3mIf7wEeW45bORGB4c_A"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ll3mIv7wEeW45bORGB4c_A" type="7002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Ll3mI_7wEeW45bORGB4c_A" x="2" y="-13"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_Ll3mJP7wEeW45bORGB4c_A" type="7003">
<layoutConstraint xmi:type="notation:Location" xmi:id="_Ll3mJf7wEeW45bORGB4c_A" y="60"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_Ll2_Ef7wEeW45bORGB4c_A"/>
<element xmi:type="uml:Transition" href="simple-flat-end.uml#_Llr_8P7wEeW45bORGB4c_A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ll2_Ev7wEeW45bORGB4c_A" points="[69, 10, -121, -20]$[188, 21, -2, -9]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LmU5IP7wEeW45bORGB4c_A" id="(1.0,0.46808510638297873)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LmU5If7wEeW45bORGB4c_A" id="(0.0,0.4)"/>
</edges>
</notation:Diagram>

22
spring-statemachine-uml/src/test/resources/org/springframework/statemachine/uml/simple-flat-end.uml Normal file
View File

@@ -0,0 +1,22 @@
<?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="_yqPPAP7vEeW45bORGB4c_A" name="RootElement">
<packagedElement xmi:type="uml:StateMachine" xmi:id="_yqwMYP7vEeW45bORGB4c_A" name="StateMachine">
<region xmi:type="uml:Region" xmi:id="_yq8ZoP7vEeW45bORGB4c_A" name="Region1">
<transition xmi:type="uml:Transition" xmi:id="_FfbzYP7wEeW45bORGB4c_A" source="__Pam0P7vEeW45bORGB4c_A" target="_15Iz8P7vEeW45bORGB4c_A"/>
<transition xmi:type="uml:Transition" xmi:id="_Gt-DEP7wEeW45bORGB4c_A" source="_15Iz8P7vEeW45bORGB4c_A" target="_4qb24P7vEeW45bORGB4c_A">
<trigger xmi:type="uml:Trigger" xmi:id="_eBd-wP7wEeW45bORGB4c_A" event="_WYeNEP7wEeW45bORGB4c_A"/>
</transition>
<transition xmi:type="uml:Transition" xmi:id="_Llr_8P7wEeW45bORGB4c_A" source="_4qb24P7vEeW45bORGB4c_A" target="_JfSUIP7wEeW45bORGB4c_A">
<trigger xmi:type="uml:Trigger" xmi:id="_f4kDQP7wEeW45bORGB4c_A" event="_Yu5R4P7wEeW45bORGB4c_A"/>
</transition>
<subvertex xmi:type="uml:State" xmi:id="_15Iz8P7vEeW45bORGB4c_A" name="S1"/>
<subvertex xmi:type="uml:State" xmi:id="_4qb24P7vEeW45bORGB4c_A" name="S2"/>
<subvertex xmi:type="uml:Pseudostate" xmi:id="__Pam0P7vEeW45bORGB4c_A"/>
<subvertex xmi:type="uml:FinalState" xmi:id="_JfSUIP7wEeW45bORGB4c_A" name="S3"/>
</region>
</packagedElement>
<packagedElement xmi:type="uml:Signal" xmi:id="_TPFaQP7wEeW45bORGB4c_A" name="E1"/>
<packagedElement xmi:type="uml:Signal" xmi:id="_UzQiwP7wEeW45bORGB4c_A" name="E2"/>
<packagedElement xmi:type="uml:SignalEvent" xmi:id="_WYeNEP7wEeW45bORGB4c_A" name="SignalEventE1" signal="_TPFaQP7wEeW45bORGB4c_A"/>
<packagedElement xmi:type="uml:SignalEvent" xmi:id="_Yu5R4P7wEeW45bORGB4c_A" name="SignalEventE2" signal="_UzQiwP7wEeW45bORGB4c_A"/>
</uml:Model>