@@ -82,32 +82,31 @@ public static void addTracingEnter(
82
82
request .setActivityId (Optional .ofNullable (execution .getCurrentActivityId ()));
83
83
request .setBusinessKey (Optional .ofNullable (execution .getProcessBusinessKey ()));
84
84
85
- name :
86
- {
87
- if (execution .getBpmnModelElementInstance () != null ) {
88
- // TODO lambda does not work due to access modifier
89
- if (execution .getBpmnModelElementInstance () instanceof EndEvent ) {
90
- EndEvent e = (EndEvent ) execution .getBpmnModelElementInstance ();
91
-
92
- if (e .getEventDefinitions () == null || e .getEventDefinitions ().isEmpty ()) {
85
+ if (execution .getBpmnModelElementInstance () != null ) {
86
+ // TODO lambda does not work due to access modifier
87
+ if (execution .getBpmnModelElementInstance () instanceof EndEvent ) {
88
+ EndEvent e = (EndEvent ) execution .getBpmnModelElementInstance ();
89
+
90
+ if (e .getEventDefinitions () == null || e .getEventDefinitions ().isEmpty ()) {
91
+ request .setActivityName (Optional .of ("End" ));
92
+ }
93
+ for (EventDefinition ed : e .getEventDefinitions ()) {
94
+ if (ed instanceof TerminateEventDefinition ) {
95
+ request .setActivityName (Optional .of ("End" ));
96
+ } else if (ed instanceof ErrorEventDefinition ) {
97
+ request .setActivityName (Optional .of ("Error End" ));
98
+ } else if (ed instanceof CompensateEventDefinition ) {
99
+ request .setActivityName (Optional .of ("Compensation End" ));
100
+ } else {
93
101
request .setActivityName (Optional .of ("End" ));
94
102
}
95
- for (EventDefinition ed : e .getEventDefinitions ()) {
96
- if (ed instanceof TerminateEventDefinition ) {
97
- request .setActivityName (Optional .of ("End" ));
98
- } else if (ed instanceof ErrorEventDefinition ) {
99
- request .setActivityName (Optional .of ("Error End" ));
100
- } else if (ed instanceof CompensateEventDefinition ) {
101
- request .setActivityName (Optional .of ("Compensation End" ));
102
- } else {
103
- request .setActivityName (Optional .of ("End" ));
104
- }
105
- }
106
- break name ;
107
- } else if (execution .getBpmnModelElementInstance () instanceof Gateway ) {
108
- // TODO
109
103
}
104
+ } else if (execution .getBpmnModelElementInstance () instanceof Gateway ) {
105
+ // TODO
106
+ } else {
107
+ request .setActivityName (Optional .ofNullable (execution .getCurrentActivityName ()));
110
108
}
109
+ } else {
111
110
request .setActivityName (Optional .ofNullable (execution .getCurrentActivityName ()));
112
111
}
113
112
0 commit comments