Bg stop reorder #1761

vkalapov · 2026-01-09T12:20:21Z

No description provided.

Yavor16

Can you add also unit test for PrepareToStopDependentModulesStep

...ss/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/IncrementIndexStep.java

...va/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStep.java

Yavor16 · 2026-01-16T08:15:21Z

...va/org/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStep.java

+        Module applicationModule = findModuleInDeploymentDescriptor(context, getCurrentModuleToStop(context).getName());
+        context.setVariable(Variables.MODULE_TO_DEPLOY, applicationModule);
+        CloudApplicationExtended modifiedApp = getApplicationCloudModelBuilder(context).build(applicationModule, moduleToDeployHelper);
+        Map<String, String> calculatedAppEnv = applicationEnvironmentCalculator.calculateNewApplicationEnv(context, modifiedApp);
+        modifiedApp = ImmutableCloudApplicationExtended.builder()
+                                                       .from(modifiedApp)
+                                                       .staging(modifiedApp.getStaging())
+                                                       .routes(getApplicationRoutes(context, modifiedApp))
+                                                       .env(calculatedAppEnv)
+                                                       .build();
+        context.setVariable(Variables.APP_TO_PROCESS, modifiedApp);
+        return StepPhase.DONE;


Why are you creating here new APP_TO_PROCESS here and what is the difference from the old one?

APP_TO_PROCESS is set to the dependent app inside the subprocess. This is done due to the fact that ExecuteTaskStep relies on that variable to be set. Otherwise the logic would fail whenever a there's a need for hook executions.

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

...rg/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStepTest.java

...st/java/org/cloudfoundry/multiapps/controller/process/steps/StopDependentModuleStepTest.java

Yavor16 · 2026-01-16T09:23:31Z

...ler-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/deploy-app.bpmn

-    <sequenceFlow id="sid-0F200B9A-6462-48CD-BA2D-6E6F1CE15D96" sourceRef="deleteIdleRoutesTask" targetRef="shouldManageServiceBroker"></sequenceFlow>
-    <sequenceFlow id="skipDeleteIdleRoutesFlow" sourceRef="shouldDeleteIdleRoutes" targetRef="shouldManageServiceBroker"></sequenceFlow>


Why did you change the location of sequence flows?

Its changed due to the new added steps for stopping dependent modules. These specific flows should be unchanged, they've been re-ordered from the bpmn modeler.

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java

LMCROSSITXSADEPLOY-3367

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

s-yonkov-yonkov · 2026-01-21T12:41:37Z

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java

+        return result;
+    }
+
+    private boolean isDependencyAwareStopOrderEnabled(ProcessContext context, DeploymentDescriptor descriptor) {


all private methods may be declared as static for simplicity

They could be static, but I don’t see a clear simplicity gain. Can you share a specific reason?

...org/cloudfoundry/multiapps/controller/process/steps/BuildApplicationDeployModelStepTest.java

...g/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModulesStepTest.java

...java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolverTest.java

...g/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModulesStepTest.java

...st/java/org/cloudfoundry/multiapps/controller/process/steps/StopDependentModuleStepTest.java

s-yonkov-yonkov · 2026-01-22T15:00:14Z

...st/java/org/cloudfoundry/multiapps/controller/process/steps/StopDependentModuleStepTest.java

+    private ApplicationWaitAfterStopHandler waitAfterStopHandler;
+
+    @Mock
+    private MtaMetadataParser mtaMetadataParser;


getModuleDeterminer requires it to be not null, which is called in the abstract parent SyncFlowableStepWithHooks

s-yonkov-yonkov · 2026-01-22T15:00:25Z

...st/java/org/cloudfoundry/multiapps/controller/process/steps/StopDependentModuleStepTest.java

+    private MtaMetadataParser mtaMetadataParser;
+
+    @Mock
+    private HooksPhaseGetter hooksPhaseGetter;


Required for SyncFlowableStepWithHooks to not throw null pointer exception.

...rg/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModuleStepTest.java

sonarqubecloud · 2026-01-23T11:44:35Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
93.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

vkalapov force-pushed the bg-stop-reorder branch 7 times, most recently from dd016cb to 7150540 Compare January 14, 2026 09:34

Yavor16 requested changes Jan 16, 2026

View reviewed changes

s-yonkov-yonkov reviewed Jan 16, 2026

View reviewed changes

...main/java/org/cloudfoundry/multiapps/controller/process/steps/SyncFlowableStepWithHooks.java Show resolved Hide resolved

Adjust module order in BG deploy

1ff3efc

LMCROSSITXSADEPLOY-3367

vkalapov force-pushed the bg-stop-reorder branch 2 times, most recently from d053a35 to 6e242eb Compare January 19, 2026 09:13

Add changes from comments

2f8b5de

vkalapov force-pushed the bg-stop-reorder branch from 6e242eb to 2f8b5de Compare January 19, 2026 12:28

s-yonkov-yonkov reviewed Jan 20, 2026

View reviewed changes

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java Outdated Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 20, 2026

View reviewed changes

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java Outdated Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 20, 2026

View reviewed changes

...controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java Outdated Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 20, 2026

View reviewed changes

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java Outdated Show resolved Hide resolved

Add changes from comments 2

0f9090f

s-yonkov-yonkov reviewed Jan 21, 2026

View reviewed changes

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java Outdated Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 21, 2026

View reviewed changes

...ain/java/org/cloudfoundry/multiapps/controller/process/util/DependentModuleStopResolver.java Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 21, 2026

View reviewed changes

...org/cloudfoundry/multiapps/controller/process/steps/BuildApplicationDeployModelStepTest.java Outdated Show resolved Hide resolved

Yavor16 requested changes Jan 21, 2026

View reviewed changes

...g/cloudfoundry/multiapps/controller/process/steps/PrepareToStopDependentModulesStepTest.java Show resolved Hide resolved

s-yonkov-yonkov reviewed Jan 22, 2026

View reviewed changes

Fixes from comments

20c0c1b

vkalapov force-pushed the bg-stop-reorder branch from 2f35a2f to 20c0c1b Compare January 23, 2026 11:39

Yavor16 approved these changes Jan 23, 2026

View reviewed changes

		<sequenceFlow id="sid-0F200B9A-6462-48CD-BA2D-6E6F1CE15D96" sourceRef="deleteIdleRoutesTask" targetRef="shouldManageServiceBroker"></sequenceFlow>
		<sequenceFlow id="skipDeleteIdleRoutesFlow" sourceRef="shouldDeleteIdleRoutes" targetRef="shouldManageServiceBroker"></sequenceFlow>

Bg stop reorder #1761

Are you sure you want to change the base?

Bg stop reorder #1761

Uh oh!

Conversation

vkalapov commented Jan 9, 2026

Uh oh!

Yavor16 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vkalapov Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sonarqubecloud bot commented Jan 23, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vkalapov Jan 19, 2026 •

edited

Loading