Skip to content

Commit e024303

Browse files
karrgovkarrgov
committed
Remove inherit variables in Flowable for executeHooksCallActivity
LMCROSSITXSADEPLOY-3026
1 parent 7995b80 commit e024303

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,17 @@
1010
<serviceTask id="stopApplicationUndeploymentTask" name="Stop Application Undeployment Step" flowable:async="true" flowable:delegateExpression="${stopApplicationUndeploymentStep}"></serviceTask>
1111
<endEvent id="endEvent"></endEvent>
1212
<exclusiveGateway id="hasStepWithHooksCompleted" default="reExecuteStepFlow"></exclusiveGateway>
13-
<callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
13+
<callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
14+
<extensionElements>
15+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
16+
<flowable:in source="namespace" target="namespace"></flowable:in>
17+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
18+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
19+
<flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
20+
</extensionElements>
1421
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
15-
<extensionElements></extensionElements>
22+
<extensionElements>
23+
</extensionElements>
1624
</multiInstanceLoopCharacteristics>
1725
</callActivity>
1826
<sequenceFlow id="checkIfStepHasCompleted" sourceRef="executeHooksCallActivity" targetRef="hasStepWithHooksCompleted"></sequenceFlow>

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,19 @@
1111
<serviceTask id="deleteApplicationTask" name="Delete Application Step" flowable:async="true" flowable:delegateExpression="${deleteApplicationStep}"></serviceTask>
1212
<endEvent id="endEvent"></endEvent>
1313
<exclusiveGateway id="hasStepWithHooksCompleted" default="reExecuteStepFlow"></exclusiveGateway>
14-
<callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
14+
<callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
15+
<extensionElements>
16+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
17+
<flowable:in source="user" target="user"></flowable:in>
18+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
19+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
20+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
21+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
22+
<flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
23+
</extensionElements>
1524
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
16-
<extensionElements></extensionElements>
25+
<extensionElements>
26+
</extensionElements>
1727
</multiInstanceLoopCharacteristics>
1828
</callActivity>
1929
<sequenceFlow id="checkIfStepHasCompleted" sourceRef="executeHooksCallActivity" targetRef="hasStepWithHooksCompleted"></sequenceFlow>
@@ -26,9 +36,21 @@
2636
</sequenceFlow>
2737
<serviceTask id="deleteApplicationRoutesTask" name="Delete Application Routes Step" flowable:async="true" flowable:delegateExpression="${deleteApplicationRoutesStep}"></serviceTask>
2838
<exclusiveGateway id="sid-C0D28E29-9B86-4F49-940D-0B0B4D49814F" default="sid-5284C7E5-D22E-44C5-AB00-3A8646246978"></exclusiveGateway>
29-
<callActivity id="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
39+
<callActivity id="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
40+
<extensionElements>
41+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
42+
<flowable:in source="user" target="user"></flowable:in>
43+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
44+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
45+
<!-- <flowable:in source="delayAfterAppStop" target="delayAfterAppStop"></flowable:in> -->
46+
<!-- <flowable:in source="cloudServiceBindingsToDelete" target="cloudServiceBindingsToDelete"></flowable:in> -->
47+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
48+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
49+
<flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
50+
</extensionElements>
3051
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
31-
<extensionElements></extensionElements>
52+
<extensionElements>
53+
</extensionElements>
3254
</multiInstanceLoopCharacteristics>
3355
</callActivity>
3456
<sequenceFlow id="sid-BC0FC2FE-4289-4744-BB2F-C6472CE2C33A" sourceRef="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" targetRef="sid-C0D28E29-9B86-4F49-940D-0B0B4D49814F"></sequenceFlow>

0 commit comments

Comments
 (0)