Fix comments

Yavor16 · Yavor16 · commit c9e7df2bad08 · 2026-01-28T11:29:46.000+02:00
diff --git a/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/ApplicationShutdownServiceTest.java b/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/ApplicationShutdownServiceTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ApplicationShutdownServiceTest {
@@ -25,8 +26,10 @@ class ApplicationShutdownServiceTest {
                                            .toString();
     private final String INSTANCE_ID_2 = UUID.randomUUID()
                                              .toString();
-    private final ApplicationShutdown APPLICATION_SHUTDOWN = createApplicationShutdownInstance(INSTANCE_ID, 0);
-    private final ApplicationShutdown APPLICATION_SHUTDOWN_2 = createApplicationShutdownInstance(INSTANCE_ID_2, 1);
+    private final ApplicationShutdown APPLICATION_SHUTDOWN = createApplicationShutdownInstance(INSTANCE_ID, 0,
+                                                                                               ApplicationShutdown.Status.FINISHED);
+    private final ApplicationShutdown APPLICATION_SHUTDOWN_2 = createApplicationShutdownInstance(INSTANCE_ID_2, 1,
+                                                                                                 ApplicationShutdown.Status.RUNNING);
 
     private final ApplicationShutdownService applicationShutdownService = createApplicationShutdownService();
 
@@ -42,7 +45,7 @@ void testAdd() {
         assertEquals(1, applicationShutdownService.createQuery()
                                                   .list()
                                                   .size());
-        
+
         assertEquals(APPLICATION_SHUTDOWN.getId(), applicationShutdownService.createQuery()
                                                                              .id(APPLICATION_SHUTDOWN.getId())
                                                                              .singleResult()
@@ -71,61 +74,65 @@ void testAddWithMoreThanOneApplicationShutdown() {
 
     @Test
     void testQueryById() {
-        testQueryByCriteria((query, applicationShutdown) -> query.id(applicationShutdown.getId()), 1);
+        testQueryByCriteria((query, applicationShutdown) -> query.id(applicationShutdown.getId()), 1, true);
     }
 
     @Test
     void testQueryByApplicationId() {
-        testQueryByCriteria((query, applicationShutdown) -> query.applicationId(applicationShutdown.getApplicationId()), 2);
+        testQueryByCriteria((query, applicationShutdown) -> query.applicationId(applicationShutdown.getApplicationId()), 2, false);
     }
 
     @Test
     void testQueryByShutdownStatus() {
-        testQueryByCriteria((query, applicationShutdown) -> query.shutdownStatus(applicationShutdown.getStatus()), 2);
+        testQueryByCriteria((query, applicationShutdown) -> query.shutdownStatus(applicationShutdown.getStatus()), 1, true);
     }
 
     @Test
     void testQueryByApplicationInstanceIndex() {
         testQueryByCriteria(
-            (query, applicationShutdown) -> query.applicationInstanceIndex(applicationShutdown.getApplicationInstanceIndex()), 1);
+            (query, applicationShutdown) -> query.applicationInstanceIndex(applicationShutdown.getApplicationInstanceIndex()), 1, true);
     }
 
     @Test
     void testQueryByStartedAt() {
-        testQueryByCriteria((query, applicationShutdown) -> query.startedAt(applicationShutdown.getStartedAt()), 2);
+        testQueryByCriteria((query, applicationShutdown) -> query.startedAt(applicationShutdown.getStartedAt()), 2, false);
     }
 
     private interface ApplicationShutdownQueryBuilder {
         ApplicationShutdownQuery build(ApplicationShutdownQuery applicationShutdownQuery, ApplicationShutdown applicationShutdown);
     }
 
-    private void testQueryByCriteria(ApplicationShutdownQueryBuilder applicationShutdownQueryBuilder, int resultCount) {
+    private void testQueryByCriteria(ApplicationShutdownQueryBuilder applicationShutdownQueryBuilder, int resultCount,
+                                     boolean shouldAssertThatAppExists) {
         addApplicationShutdown(List.of(APPLICATION_SHUTDOWN, APPLICATION_SHUTDOWN_2));
         assertEquals(resultCount, applicationShutdownQueryBuilder.build(applicationShutdownService.createQuery(), APPLICATION_SHUTDOWN)
                                                                  .list()
                                                                  .size());
         assertEquals(resultCount, applicationShutdownQueryBuilder.build(applicationShutdownService.createQuery(), APPLICATION_SHUTDOWN)
                                                                  .delete());
-        assertApplicationShutdownExists(APPLICATION_SHUTDOWN_2.getId());
+        if (shouldAssertThatAppExists) {
+            assertApplicationShutdownExists(APPLICATION_SHUTDOWN_2.getId());
+        }
     }
 
     private void assertApplicationShutdownExists(String id) {
-        // If does not exist, will throw NoResultException
-        applicationShutdownService.createQuery()
-                                  .id(id);
+        ApplicationShutdown applicationShutdown = applicationShutdownService.createQuery()
+                                                                            .id(id)
+                                                                            .singleResult();
+        assertNotNull(applicationShutdown);
     }
 
     private void addApplicationShutdown(List<ApplicationShutdown> applicationShutdowns) {
         applicationShutdowns.forEach(applicationShutdownService::add);
     }
 
-    private ApplicationShutdown createApplicationShutdownInstance(String instanceId, int index) {
+    private ApplicationShutdown createApplicationShutdownInstance(String instanceId, int index, ApplicationShutdown.Status status) {
         return ImmutableApplicationShutdown.builder()
                                            .id(instanceId)
                                            .applicationId(APPLICATION_ID)
                                            .applicationInstanceIndex(index)
                                            .startedAt(Date.from(Instant.now()))
-                                           .status(ApplicationShutdown.Status.FINISHED)
+                                           .status(status)
                                            .build();
     }
 
diff --git a/multiapps-controller-process/pom.xml b/multiapps-controller-process/pom.xml
@@ -106,5 +106,9 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.cloudfoundry.multiapps</groupId>
+            <artifactId>multiapps-controller-shutdown-client</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/multiapps-controller-process/src/main/java/module-info.java b/multiapps-controller-process/src/main/java/module-info.java
@@ -56,5 +56,6 @@
 
     requires static java.compiler;
     requires static org.immutables.value;
+    requires org.cloudfoundry.multiapps.controller.shutdown.client;
 
 }
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
@@ -790,6 +790,8 @@ public class Messages {
     public static final String TOTAL_SIZE_OF_ALL_RESOLVED_CONTENT_0 = "Total size for all resolved content {0}";
     public static final String STARTED_SHUTTING_DOWN_APPLICATION_WITH_ID_AND_INDEX = "Started shutting down application with ID: \"{0}\" and index: \"{1}\"";
     public static final String SHUT_DOWN_APPLICATION_WITH_ID_AND_INDEX_FINISHED_SUCCESSFULLY = "Shut down application with ID: \"{0}\" and index: \"{1}\" finished successfully";
+    public static final String NO_LEFTOVER_APPLICATION_SHUTDOWNS = "No leftover application shutdowns";
+    public static final String DELETED_LEFTOVER_APPLICATION_SHUTDOWNS = "Deleted {0} leftover application shutdowns";
 
     public static final String IGNORING_NOT_FOUND_OPTIONAL_SERVICE = "Service {0} not found but is optional";
     public static final String IGNORING_NOT_FOUND_INACTIVE_SERVICE = "Service {0} not found but is inactive";
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/ApplicationShutdownJob.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/ApplicationShutdownJob.java
@@ -32,7 +32,7 @@ public ApplicationShutdownJob(FlowableFacade flowableFacade, ApplicationShutdown
         this.applicationConfiguration = applicationConfiguration;
     }
 
-    @Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
+    @Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS, initialDelay = 30)
     public void run() {
         ApplicationShutdown applicationShutdown = getApplicationToShutdown();
 
diff --git a/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/LeftoverApplicationShutdownCleaner.java b/multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/LeftoverApplicationShutdownCleaner.java
@@ -0,0 +1,52 @@
+package org.cloudfoundry.multiapps.controller.process.jobs;
+
+import java.text.MessageFormat;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import jakarta.inject.Named;
+import org.cloudfoundry.multiapps.controller.persistence.dto.ApplicationShutdown;
+import org.cloudfoundry.multiapps.controller.persistence.services.ApplicationShutdownService;
+import org.cloudfoundry.multiapps.controller.process.Messages;
+import org.cloudfoundry.multiapps.controller.shutdown.client.util.ShutdownUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Named
+public class LeftoverApplicationShutdownCleaner implements Cleaner {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LeftoverApplicationShutdownCleaner.class);
+
+    private final ApplicationShutdownService applicationShutdownService;
+
+    public LeftoverApplicationShutdownCleaner(ApplicationShutdownService applicationShutdownService) {
+        this.applicationShutdownService = applicationShutdownService;
+    }
+
+    @Override
+    public void execute(LocalDateTime expirationTime) {
+        List<ApplicationShutdown> leftoverApplicationShutdowns = getApplicationShutdownsScheduledForMoreThanADay();
+
+        if (leftoverApplicationShutdowns.isEmpty()) {
+            LOGGER.info(Messages.NO_LEFTOVER_APPLICATION_SHUTDOWNS);
+            return;
+        }
+        
+        deleteLeftoverApplicationShutdowns(leftoverApplicationShutdowns);
+        LOGGER.info(MessageFormat.format(Messages.DELETED_LEFTOVER_APPLICATION_SHUTDOWNS, leftoverApplicationShutdowns.size()));
+    }
+
+    private List<ApplicationShutdown> getApplicationShutdownsScheduledForMoreThanADay() {
+        List<ApplicationShutdown> applicationShutdowns = applicationShutdownService.createQuery()
+                                                                                   .list();
+        return applicationShutdowns.stream()
+                                   .filter(ShutdownUtil::isApplicationShutdownScheduledForMoreThanADay)
+                                   .toList();
+    }
+
+    private void deleteLeftoverApplicationShutdowns(List<ApplicationShutdown> leftoverApplicationShutdowns) {
+        leftoverApplicationShutdowns.forEach(applicationShutdown -> applicationShutdownService.createQuery()
+                                                                                              .id(applicationShutdown.getId())
+                                                                                              .delete());
+    }
+}
diff --git a/multiapps-controller-shutdown-client/src/main/java/module-info.java b/multiapps-controller-shutdown-client/src/main/java/module-info.java
@@ -2,6 +2,7 @@
 
     exports org.cloudfoundry.multiapps.controller.shutdown.client;
     exports org.cloudfoundry.multiapps.controller.shutdown.client.configuration;
+    exports org.cloudfoundry.multiapps.controller.shutdown.client.util;
 
     requires com.fasterxml.jackson.annotation;
     requires org.cloudfoundry.multiapps.common;
diff --git a/multiapps-controller-shutdown-client/src/main/java/org/cloudfoundry/multiapps/controller/shutdown/client/util/ShutdownUtil.java b/multiapps-controller-shutdown-client/src/main/java/org/cloudfoundry/multiapps/controller/shutdown/client/util/ShutdownUtil.java
@@ -17,6 +17,7 @@ private ShutdownUtil() {
     private static final Logger LOGGER = LoggerFactory.getLogger(ShutdownUtil.class);
 
     public static final int TIMEOUT_IN_SECONDS = 600; //10 minutes
+    public static final int DAY_IN_SECONDS = 86400; //1 day
 
     public static boolean areThereUnstoppedInstances(List<ApplicationShutdown> shutdownInstances) {
         return shutdownInstances.stream()
@@ -25,11 +26,19 @@ public static boolean areThereUnstoppedInstances(List<ApplicationShutdown> shutd
     }
 
     public static boolean isTimeoutExceeded(ApplicationShutdown applicationShutdown) {
-        Instant tenMinutesAfterStartedDate = Instant.from(applicationShutdown.getStartedAt()
-                                                                             .toInstant())
-                                                    .plusSeconds(TIMEOUT_IN_SECONDS);
+        return isTimeExceeded(applicationShutdown, TIMEOUT_IN_SECONDS);
+    }
+
+    public static boolean isApplicationShutdownScheduledForMoreThanADay(ApplicationShutdown applicationShutdown) {
+        return isTimeExceeded(applicationShutdown, DAY_IN_SECONDS);
+    }
+
+    private static boolean isTimeExceeded(ApplicationShutdown applicationShutdown, int seconds) {
+        Instant secondsAfterStartedDate = Instant.from(applicationShutdown.getStartedAt()
+                                                                          .toInstant())
+                                                 .plusSeconds(seconds);
         Instant timeNow = Instant.now();
-        return timeNow.isAfter(tenMinutesAfterStartedDate);
+        return timeNow.isAfter(secondsAfterStartedDate);
     }
 
     public static void logShutdownStatus(List<ApplicationShutdown> shutdownInstances) {
diff --git a/multiapps-controller-shutdown-client/src/test/java/org/cloudfoundry/multiapps/controller/shutdown/client/util/ShutdownUtilTest.java b/multiapps-controller-shutdown-client/src/test/java/org/cloudfoundry/multiapps/controller/shutdown/client/util/ShutdownUtilTest.java
@@ -52,6 +52,24 @@ void testIsTimeoutExceededWithTimeOutNotExceeded() {
         assertFalse(ShutdownUtil.isTimeoutExceeded(applicationShutdownInstance));
     }
 
+    @Test
+    void testIsApplicationShutdownScheduledForMoreThanADay() {
+        Instant timeBeforeTenMinutes = Instant.now()
+                                              .minusSeconds(ShutdownUtil.DAY_IN_SECONDS);
+        ApplicationShutdown applicationShutdownInstance = createApplicationShutdownInstance(true, Date.from(timeBeforeTenMinutes));
+
+        assertTrue(ShutdownUtil.isTimeoutExceeded(applicationShutdownInstance));
+    }
+
+    @Test
+    void testIsApplicationShutdownScheduledForMoreThanADayWithTimeOutNotExceeded() {
+        Instant timeBeforeTenMinutes = Instant.now()
+                                              .minusSeconds(TIMEOUT_IN_SECONDS);
+        ApplicationShutdown applicationShutdownInstance = createApplicationShutdownInstance(true, Date.from(timeBeforeTenMinutes));
+
+        assertFalse(ShutdownUtil.isTimeoutExceeded(applicationShutdownInstance));
+    }
+
     private ApplicationShutdown createApplicationShutdownInstance(boolean isInstanceStopped, Date startedAt) {
         return ImmutableApplicationShutdown.builder()
                                            .id(UUID.randomUUID()

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,6 @@`
`56`	`56`
`57`	`57`	`requires static java.compiler;`
`58`	`58`	`requires static org.immutables.value;`
	`59`	`+ requires org.cloudfoundry.multiapps.controller.shutdown.client;`
`59`	`60`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ApplicationShutdownJob(FlowableFacade flowableFacade, ApplicationShutdown`
`32`	`32`	`this.applicationConfiguration = applicationConfiguration;`
`33`	`33`	`}`
`34`	`34`
`35`		`- @Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)`
	`35`	`+ @Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS, initialDelay = 30)`
`36`	`36`	`public void run() {`
`37`	`37`	`ApplicationShutdown applicationShutdown = getApplicationToShutdown();`
`38`	`38`