Fix PrhWorkflowSchedulingIntegrationTest

- Clean up scheduledTasksRunner after previous integration tests
- Prevent race condition

Change-Id: If3763cbc031ddca3a14568742265644b4472a448
Issue-ID: DCAEGEN2-1853
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
index 9e432546..70c54a51 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java
@@ -20,12 +20,12 @@
 
 package org.onap.dcaegen2.services.prh.tasks;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;
 
 import javax.annotation.PreDestroy;
+import org.onap.dcaegen2.services.prh.configuration.PrhProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Marker;
@@ -43,17 +43,19 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Configuration
 @EnableScheduling
 public class ScheduledTasksRunner {
-    private static final int SCHEDULING_DELAY_FOR_PRH_TASKS = 10;
     private static final Logger LOGGER = LoggerFactory.getLogger(ScheduledTasksRunner.class);
     private static final Marker ENTRY = MarkerFactory.getMarker("ENTRY");
     private static volatile List<ScheduledFuture> scheduledPrhTaskFutureList = new ArrayList<>();
 
     private final TaskScheduler taskScheduler;
     private final ScheduledTasks scheduledTask;
+    private final PrhProperties prhProperties;
 
-    public ScheduledTasksRunner(TaskScheduler taskScheduler, ScheduledTasks scheduledTask) {
+    public ScheduledTasksRunner(TaskScheduler taskScheduler, ScheduledTasks scheduledTask,
+        PrhProperties prhProperties) {
         this.taskScheduler = taskScheduler;
         this.scheduledTask = scheduledTask;
+        this.prhProperties = prhProperties;
     }
 
     @EventListener
@@ -80,7 +82,7 @@ public class ScheduledTasksRunner {
         if (scheduledPrhTaskFutureList.isEmpty()) {
             scheduledPrhTaskFutureList.add(taskScheduler
                 .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask,
-                    Duration.ofSeconds(SCHEDULING_DELAY_FOR_PRH_TASKS)));
+                    prhProperties.getWorkflowSchedulingInterval()));
             return true;
         } else {
             return false;