Skip to content

Commit

Permalink
JBPM-3178: Support priorities for constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
krisv committed Apr 15, 2011
1 parent cc481ef commit 7b0fa83
Show file tree
Hide file tree
Showing 6 changed files with 181 additions and 0 deletions.
8 changes: 8 additions & 0 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/core/SequenceFlow.java
View file
Expand Up @@ -30,6 +30,7 @@ public class SequenceFlow implements Serializable {
private String type;
private String language;
private String name;
private int priority;

public SequenceFlow(String id, String sourceRef, String targetRef) {
this.id = id;
Expand Down Expand Up @@ -89,4 +90,11 @@ public void setName(String name) {
this.name = name;
}

public int getPriority() {
return priority;
}

public void setPriority(int priority) {
this.priority = priority;
}
}
1 change: 1 addition & 0 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/ProcessHandler.java
View file
Expand Up @@ -210,6 +210,7 @@ public static void linkConnections(NodeContainer nodeContainer, List<SequenceFlo
if (connection.getExpression() != null) {
constraint.setConstraint(connection.getExpression());
}
constraint.setPriority(connection.getPriority());
split.addConstraint(
new ConnectionRef(target.getId(), NodeImpl.CONNECTION_DEFAULT_TYPE),
constraint);
Expand Down
4 changes: 4 additions & 0 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/SequenceFlowHandler.java
View file
Expand Up @@ -70,6 +70,7 @@ public Object start(final String uri, final String localName,
final String targetRef = attrs.getValue("targetRef");
final String bendpoints = attrs.getValue("g:bendpoints");
final String name = attrs.getValue("name");
final String priority = attrs.getValue("http://www.jboss.org/drools", "priority");

NodeContainer nodeContainer = (NodeContainer) parser.getParent();

Expand All @@ -92,6 +93,9 @@ public Object start(final String uri, final String localName,
SequenceFlow connection = new SequenceFlow(id, sourceRef, targetRef);
connection.setBendpoints(bendpoints);
connection.setName(name);
if (priority != null) {
connection.setPriority(Integer.parseInt(priority));
}

connections.add(connection);

Expand Down
3 changes: 3 additions & 0 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/XmlBPMNProcessDumper.java
View file
Expand Up @@ -641,6 +641,9 @@ public void visitConnection(Connection connection, StringBuilder xmlDump, int me
if (constraint.getName() != null && constraint.getName().trim().length() > 0) {
xmlDump.append("name=\"" + XmlBPMNProcessDumper.replaceIllegalCharsAttribute(constraint.getName()) + "\" ");
}
if (constraint.getPriority() != 0) {
xmlDump.append("tns:priority=\"" + constraint.getPriority() + "\" ");
}
xmlDump.append(">" + EOL +
" <conditionExpression xsi:type=\"tFormalExpression\" ");
if ("code".equals(constraint.getType())) {
Expand Down
11 changes: 11 additions & 0 deletions jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/SimpleBPMNProcessTest.java
View file
Expand Up @@ -271,6 +271,17 @@ public void testExclusiveSplit() throws Exception {
assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
}

public void testExclusiveSplitPriority() throws Exception {
KnowledgeBase kbase = createKnowledgeBase("BPMN2-ExclusiveSplitPriority.bpmn2");
StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
ksession.getWorkItemManager().registerWorkItemHandler("Email", new SystemOutWorkItemHandler());
Map<String, Object> params = new HashMap<String, Object>();
params.put("x", "First");
params.put("y", "Second");
ProcessInstance processInstance = ksession.startProcess("com.sample.test", params);
assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
}

public void testExclusiveSplitDefault() throws Exception {
KnowledgeBase kbase = createKnowledgeBase("BPMN2-ExclusiveSplitDefault.bpmn2");
StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
Expand Down
154 changes: 154 additions & 0 deletions jbpm-bpmn2/src/test/resources/BPMN2-ExclusiveSplitPriority.bpmn2
View file
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions id="Definition"
targetNamespace="http://www.jboss.org/drools"
typeLanguage="http://www.java.com/javaTypes"
expressionLanguage="http://www.mvel.org/2.0"
xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
xmlns:tns="http://www.jboss.org/drools">

<itemDefinition id="_xItem" />
<itemDefinition id="_yItem" />

<process processType="Private" isExecutable="true" id="com.sample.test" name="Test" >

<!-- process variables -->
<property id="x" itemSubjectRef="_xItem"/>
<property id="y" itemSubjectRef="_yItem"/>

<!-- nodes -->
<startEvent id="_1" name="Start" />
<exclusiveGateway id="_2" name="Split" gatewayDirection="Diverging" />
<scriptTask id="_3" name="Script1" >
<script>System.out.println("x=" + x);</script>
</scriptTask>
<scriptTask id="_4" name="Script2" >
<script>System.out.println("y=" + y);</script>
</scriptTask>
<exclusiveGateway id="_5" name="Join" gatewayDirection="Converging" />
<task id="_6" name="Email" tns:taskName="Email" >
<ioSpecification>
<dataInput id="_6_BodyInput" name="Body" />
<dataInput id="_6_SubjectInput" name="Subject" />
<dataInput id="_6_ToInput" name="To" />
<dataInput id="_6_FromInput" name="From" />
<inputSet>
<dataInputRefs>_6_BodyInput</dataInputRefs>
<dataInputRefs>_6_SubjectInput</dataInputRefs>
<dataInputRefs>_6_ToInput</dataInputRefs>
<dataInputRefs>_6_FromInput</dataInputRefs>
</inputSet>
<outputSet>
</outputSet>
</ioSpecification>
<dataInputAssociation>
<targetRef>_6_BodyInput</targetRef>
<assignment>
<from xsi:type="tFormalExpression">This is an urgent email #{x}</from>
<to xsi:type="tFormalExpression">_6_BodyInput</to>
</assignment>
</dataInputAssociation>
<dataInputAssociation>
<targetRef>_6_SubjectInput</targetRef>
<assignment>
<from xsi:type="tFormalExpression">Urgent email !</from>
<to xsi:type="tFormalExpression">_6_SubjectInput</to>
</assignment>
</dataInputAssociation>
<dataInputAssociation>
<targetRef>_6_ToInput</targetRef>
<assignment>
<from xsi:type="tFormalExpression">you@mail.com</from>
<to xsi:type="tFormalExpression">_6_ToInput</to>
</assignment>
</dataInputAssociation>
<dataInputAssociation>
<targetRef>_6_FromInput</targetRef>
<assignment>
<from xsi:type="tFormalExpression">me@mail.com</from>
<to xsi:type="tFormalExpression">_6_FromInput</to>
</assignment>
</dataInputAssociation>
</task>
<endEvent id="_7" name="End" >
<terminateEventDefinition/>
</endEvent>

<!-- connections -->
<sequenceFlow id="_1-_2" sourceRef="_1" targetRef="_2" />
<sequenceFlow id="_2-_3" sourceRef="_2" targetRef="_3" name="First" tns:priority="2">
<conditionExpression xsi:type="tFormalExpression" >return x != null;</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_2-_4" sourceRef="_2" targetRef="_4" name="Second" tns:priority="1">
<conditionExpression xsi:type="tFormalExpression" >return x != null;</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_3-_5" sourceRef="_3" targetRef="_5" />
<sequenceFlow id="_4-_5" sourceRef="_4" targetRef="_5" />
<sequenceFlow id="_5-_6" sourceRef="_5" targetRef="_6" />
<sequenceFlow id="_6-_7" sourceRef="_6" targetRef="_7" />

</process>

<bpmndi:BPMNDiagram>
<bpmndi:BPMNPlane bpmnElement="com.sample.test" >
<bpmndi:BPMNShape bpmnElement="_1" >
<dc:Bounds x="16" y="56" width="48" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_2" >
<dc:Bounds x="96" y="56" width="48" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_3" >
<dc:Bounds x="177" y="16" width="80" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_4" >
<dc:Bounds x="177" y="96" width="80" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" >
<dc:Bounds x="289" y="56" width="48" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_6" >
<dc:Bounds x="370" y="56" width="100" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_7" >
<dc:Bounds x="502" y="56" width="48" height="48" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_1-_2" >
<di:waypoint x="40" y="80" />
<di:waypoint x="120" y="80" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_2-_3" >
<di:waypoint x="120" y="80" />
<di:waypoint x="120" y="40" />
<di:waypoint x="217" y="40" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_2-_4" >
<di:waypoint x="120" y="80" />
<di:waypoint x="120" y="120" />
<di:waypoint x="217" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_3-_5" >
<di:waypoint x="217" y="40" />
<di:waypoint x="313" y="40" />
<di:waypoint x="313" y="80" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_4-_5" >
<di:waypoint x="217" y="120" />
<di:waypoint x="314" y="119" />
<di:waypoint x="313" y="80" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_5-_6" >
<di:waypoint x="313" y="80" />
<di:waypoint x="420" y="80" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_6-_7" >
<di:waypoint x="420" y="80" />
<di:waypoint x="526" y="80" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>

</definitions>

0 comments on commit 7b0fa83

Please sign in to comment.