Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: handle null escalation code #913

Merged
merged 1 commit into from
Jun 12, 2024
Merged

fix: handle null escalation code #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...main/java/org/camunda/community/migration/converter/expression/ExpressionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ private String doTransform(final String juelExpression) {
if (juelExpression == null) {
return null;
}
if (juelExpression.length() == 0) {
if (juelExpression.isEmpty()) {
return "=null";
}
// split into expressions and non-expressions
List<String> nonExpressions =
Arrays.stream(juelExpression.split("(#|\\$)\\{.*}"))
.map(String::trim)
.filter(s -> s.length() > 0)
.collect(Collectors.toList());
.filter(s -> !s.isEmpty())
.toList();
if (nonExpressions.size() == 1
&& juelExpression.trim().length() == nonExpressions.get(0).length()) {
return juelExpression;
}
List<String> expressions =
Arrays.stream(juelExpression.split("(#|\\$)\\{|}"))
.map(String::trim)
.filter(s -> s.length() > 0)
.filter(s -> !s.isEmpty())
.map(s -> nonExpressions.contains(s) ? "\"" + s + "\"" : handleExpression(s))
.collect(Collectors.toList());
return "=" + String.join(" + ", expressions);
Expand Down
18 changes: 10 additions & 8 deletions .../camunda/community/migration/converter/visitor/impl/eventReference/EscalationVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@ protected SemanticVersion availableFrom(DomElementVisitorContext context) {
@Override
protected void postCreationVisitor(DomElementVisitorContext context) {
String escalationCode = context.getElement().getAttribute(BPMN, "escalationCode");
ExpressionTransformationResult expressionTransformationResult =
ExpressionTransformer.transform(escalationCode);
context.addConversion(
EscalationConvertible.class,
c -> c.setEscalationCode(expressionTransformationResult.getFeelExpression()));
if (expressionTransformationResult != null
&& expressionTransformationResult.getFeelExpression().startsWith("=")) {
context.addMessage(MessageFactory.escalationCodeNoExpression());
if (escalationCode != null) {
ExpressionTransformationResult expressionTransformationResult =
ExpressionTransformer.transform(escalationCode);
context.addConversion(
EscalationConvertible.class,
c -> c.setEscalationCode(expressionTransformationResult.getFeelExpression()));
if (expressionTransformationResult != null
&& expressionTransformationResult.getFeelExpression().startsWith("=")) {
context.addMessage(MessageFactory.escalationCodeNoExpression());
}
}
// this can be enabled as soon as escalation codes can be expressions
/*
Expand Down
3 changes: 2 additions & 1 deletion ...erter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public class BpmnConverterTest {
"empty-input-parameter.bpmn",
"flexible-timer-event.bpmn",
"business-rule-task-as-expression.bpmn",
"message-event-definition-handling.bpmn"
"message-event-definition-handling.bpmn",
"escalation-code.bpmn"
})
public void shouldConvert(String bpmnFile) {
BpmnConverter converter = BpmnConverterFactory.getInstance().get();
Expand Down
54 changes: 37 additions & 17 deletions backend-diagram-converter/core/src/test/resources/escalation-code.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" 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:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1gbx4qr" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.20.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.19.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" 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:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1gbx4qr" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.23.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.19.0">
<bpmn:process id="TransactionTestProcess" name="Transaction Test" isExecutable="true">
<bpmn:startEvent id="Event_1i3htun" name="Error code conversion should be tested">
<bpmn:outgoing>Flow_0we8gbc</bpmn:outgoing>
Expand All @@ -21,51 +21,71 @@
<bpmn:outgoing>Flow_03nn2dd</bpmn:outgoing>
<bpmn:escalationEventDefinition id="EscalationEventDefinition_075vn24" escalationRef="Escalation_2ja61hj" />
</bpmn:boundaryEvent>
<bpmn:boundaryEvent id="Event_0u2oqnd" attachedToRef="Activity_1h3hatw">
<bpmn:outgoing>Flow_1y19z4p</bpmn:outgoing>
<bpmn:escalationEventDefinition id="EscalationEventDefinition_1afde1d" escalationRef="Escalation_1rkitc1" />
</bpmn:boundaryEvent>
<bpmn:endEvent id="Event_075vs0j">
<bpmn:incoming>Flow_1y19z4p</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_1y19z4p" sourceRef="Event_0u2oqnd" targetRef="Event_075vs0j" />
</bpmn:process>
<bpmn:error id="Error_16zktjx" name="SomeName" errorCode="someCode" />
<bpmn:escalation id="Escalation_2ja61hj" name="EscalationName" escalationCode="EscalationCode" />
<bpmn:escalation id="Escalation_1rkitc1" name="escalationWithoutCode" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="TransactionTestProcess">
<bpmndi:BPMNShape id="Event_1i3htun_di" bpmnElement="Event_1i3htun">
<dc:Bounds x="142" y="102" width="36" height="36" />
<dc:Bounds x="142" y="202" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="116" y="145" width="89" height="40" />
<dc:Bounds x="116" y="245" width="89" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_10af0py_di" bpmnElement="Activity_1h3hatw">
<dc:Bounds x="230" y="80" width="100" height="80" />
<dc:Bounds x="230" y="180" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_09a497u_di" bpmnElement="Event_09a497u">
<dc:Bounds x="382" y="102" width="36" height="36" />
<dc:Bounds x="382" y="202" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="360" y="145" width="81" height="27" />
<dc:Bounds x="360" y="245" width="81" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1ey9c8f_di" bpmnElement="Event_1ey9c8f">
<dc:Bounds x="362" y="222" width="36" height="36" />
<dc:Bounds x="362" y="322" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="347" y="265" width="67" height="14" />
<dc:Bounds x="347" y="365" width="67" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_075vs0j_di" bpmnElement="Event_075vs0j">
<dc:Bounds x="402" y="82" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1w7mpnk_di" bpmnElement="Event_0apc6gw">
<dc:Bounds x="272" y="142" width="36" height="36" />
<dc:Bounds x="272" y="242" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="248" y="185" width="87" height="14" />
<dc:Bounds x="248" y="285" width="87" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0q8enhd_di" bpmnElement="Event_0u2oqnd">
<dc:Bounds x="312" y="162" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0we8gbc_di" bpmnElement="Flow_0we8gbc">
<di:waypoint x="178" y="120" />
<di:waypoint x="230" y="120" />
<di:waypoint x="178" y="220" />
<di:waypoint x="230" y="220" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0y3k84c_di" bpmnElement="Flow_0y3k84c">
<di:waypoint x="330" y="120" />
<di:waypoint x="382" y="120" />
<di:waypoint x="330" y="220" />
<di:waypoint x="382" y="220" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_03nn2dd_di" bpmnElement="Flow_03nn2dd">
<di:waypoint x="290" y="178" />
<di:waypoint x="290" y="240" />
<di:waypoint x="362" y="240" />
<di:waypoint x="290" y="278" />
<di:waypoint x="290" y="340" />
<di:waypoint x="362" y="340" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1y19z4p_di" bpmnElement="Flow_1y19z4p">
<di:waypoint x="330" y="162" />
<di:waypoint x="330" y="100" />
<di:waypoint x="402" y="100" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
Expand Down
Loading