Skip to content

Remove inherited variables #1676

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

Merged
Yavor16 merged 1 commit into from
Aug 7, 2025
Merged

Remove inherited variables #1676

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
22 changes: 19 additions & 3 deletions ...ess/src/main/resources/org/cloudfoundry/multiapps/controller/process/delete-services.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,26 @@
</intermediateCatchEvent>
<exclusiveGateway id="exclusivegateway1" name="Exclusive Gateway" default="waitFlow"></exclusiveGateway>
<sequenceFlow id="pollingFlow" name="Poll" sourceRef="timerintermediatecatchevent1" targetRef="deleteServiceWithPolling"></sequenceFlow>
<callActivity id="deleteServiceBindings" name="Delete service bindings
" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="deleteServiceBindings" name="Delete service bindings" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="serviceBindingToDelete" target="serviceBindingToDelete"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceBindingsToDelete" flowable:elementVariable="serviceBindingToDelete">
<extensionElements></extensionElements>
<extensionElements>
</extensionElements>
</multiInstanceLoopCharacteristics>
</callActivity>
<serviceTask id="determineServiceDeleteActionsToExecuteStep" name="Determine Service Delete Actions To Execute" flowable:async="true" default="sid-766B5EE5-3F06-4A47-86B8-5C2942CF27DD" flowable:delegateExpression="${determineServiceDeleteActionsToExecuteStep}"></serviceTask>
Expand Down
38 changes: 36 additions & 2 deletions ...-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/deploy-app.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,27 @@
<sequenceFlow id="flow84" sourceRef="timerintermediatecatchevent1" targetRef="startAppTask"></sequenceFlow>
<sequenceFlow id="sid-6C61C071-998D-48F2-8DB8-6CDD50E04F18" sourceRef="sid-F6B2FD75-29A0-4347-B49F-94B4CD7C1469" targetRef="exclusivegateway4"></sequenceFlow>
<sequenceFlow id="sid-E6050369-B93F-4433-8CDB-D7572FD2F525" sourceRef="sid-70329A91-339F-4215-9AB6-41ED6C769C40" targetRef="stopAppTask"></sequenceFlow>
<callActivity id="manageAppServiceBindingCallActivity" name="Manage Application Service Bindings Call Activity Parallel" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="manageAppServiceBindingCallActivity" name="Manage Application Service Bindings Call Activity Parallel" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="servicesToBind" target="servicesToBind"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="serviceBindingToDelete" target="serviceBindingToDelete"></flowable:in>
<flowable:in source="servicesToUnbindBind" target="servicesToUnbindBind"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="mtaArchiveElements" target="mtaArchiveElements"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="archiveEntriesPositions" target="archiveEntriesPositions"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="servicesToUnbindBind" flowable:elementVariable="serviceToUnbindBind">
<extensionElements></extensionElements>
Expand All @@ -156,10 +173,27 @@
<serviceTask id="determineVcapServicesPropertiesChangedTask" name="Determine vcap services properties changed" flowable:async="true" flowable:delegateExpression="${determineVcapServicesPropertiesChangedStep}"></serviceTask>
<exclusiveGateway id="sid-A9FA4E05-931E-4254-AB32-D476EF047D40" default="sid-C8B6AD2B-DCA7-4CB3-8ECE-CF48DE312ECD"></exclusiveGateway>
<sequenceFlow id="sid-0B8527EC-8771-4591-BA56-DB02AB9A5B7B" sourceRef="createAppTask" targetRef="sid-A9FA4E05-931E-4254-AB32-D476EF047D40"></sequenceFlow>
<callActivity id="sid-4430F9E3-B636-4A4E-B9CB-4485987F1EEF" name="Manage Application Service Bindings Call Activity Sequential" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="sid-4430F9E3-B636-4A4E-B9CB-4485987F1EEF" name="Manage Application Service Bindings Call Activity Sequential" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="servicesToBind" target="servicesToBind"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="servicesToUnbindBind" target="servicesToUnbindBind"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="serviceBindingToDelete" target="serviceBindingToDelete"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="archiveEntriesPositions" target="archiveEntriesPositions"></flowable:in>
<flowable:in source="mtaArchiveElements" target="mtaArchiveElements"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="true" flowable:collection="servicesToUnbindBind" flowable:elementVariable="serviceToUnbindBind">
<extensionElements></extensionElements>
Expand Down
28 changes: 22 additions & 6 deletions ...rocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,28 @@
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${execution.getVariable('delayAfterAppStop') != null}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="finishUndeployAppProcessFlow" sourceRef="deleteApplicationTask" targetRef="endEvent"></sequenceFlow>
<callActivity id="deleteServiceBindings" name="Delete service bindings
" flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceBindingsToDelete" flowable:elementVariable="serviceBindingToDelete">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
</callActivity>
<callActivity id="deleteServiceBindings" name="Delete service bindings " flowable:async="true" calledElement="manageAppServiceBindingSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="serviceBindingToDelete" target="serviceBindingToDelete"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="cloudServiceBindingsToDelete" flowable:elementVariable="serviceBindingToDelete">
<extensionElements>
</extensionElements>
</multiInstanceLoopCharacteristics>
</callActivity>
<sequenceFlow id="sid-4EAEB1E7-58CE-4F0F-A748-6917D2286F24" sourceRef="deleteServiceBindings" targetRef="deleteApplicationTask"></sequenceFlow>
<sequenceFlow id="sid-5F3776A3-77B8-4CB6-8747-EB1A0354FFEF" sourceRef="sid-54E9ED03-E535-4D00-A287-32D8E874D1F0" targetRef="sid-DFD29F59-3CDA-4F18-876E-E675418FFF0E"></sequenceFlow>
<serviceTask id="sid-DFD29F59-3CDA-4F18-876E-E675418FFF0E" name="Determine Service Bindings to Delete" flowable:async="true" flowable:delegateExpression="${determineServiceBindingsToDeleteStep}"></serviceTask>
Expand Down
Loading