Polishing (aligned with main)

Author: jhoeller

spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java

@@ -250,13 +250,13 @@ private void startBeans(boolean autoStartupOnly) {
 
 lifecycleBeans.forEach((beanName, bean) -> {
 if (!autoStartupOnly || isAutoStartupCandidate(beanName, bean)) {
-int phase = getPhase(bean);
-phases.computeIfAbsent(
-phase,
-p -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
+int startupPhase = getPhase(bean);
+phases.computeIfAbsent(startupPhase,
+phase -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
 ).add(beanName, bean);
 }
 });
+
 if (!phases.isEmpty()) {
 phases.values().forEach(LifecycleGroup::start);
 }
@@ -307,13 +307,14 @@ private boolean toBeStarted(String beanName, Lifecycle bean) {
 private void stopBeans() {
 Map<String, Lifecycle> lifecycleBeans = getLifecycleBeans();
 Map<Integer, LifecycleGroup> phases = new TreeMap<>(Comparator.reverseOrder());
+
 lifecycleBeans.forEach((beanName, bean) -> {
 int shutdownPhase = getPhase(bean);
-phases.computeIfAbsent(
-shutdownPhase,
-p -> new LifecycleGroup(shutdownPhase, this.timeoutPerShutdownPhase, lifecycleBeans, false)
+phases.computeIfAbsent(shutdownPhase,
+phase -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, false)
 ).add(beanName, bean);
 });
+
 if (!phases.isEmpty()) {
 phases.values().forEach(LifecycleGroup::stop);
 }