From 84430dbbf3aab095066417c9a3293d3fd49c4e3b Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Thu, 21 Nov 2019 11:18:09 +0100
Subject: 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>
---
 .../services/prh/configuration/PrhProperties.java  | 39 ++++++++++++++++++++++
 .../services/prh/tasks/ScheduledTasksRunner.java   | 10 +++---
 prh-app-server/src/main/resources/application.yaml |  3 ++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java

(limited to 'prh-app-server/src/main')

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java
new file mode 100644
index 00000000..ad35b98b
--- /dev/null
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/PrhProperties.java
@@ -0,0 +1,39 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PNF-REGISTRATION-HANDLER
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.prh.configuration;
+
+import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties("prh")
+public class PrhProperties {
+    private Duration workflowSchedulingInterval = Duration.ofSeconds(10);
+
+    public Duration getWorkflowSchedulingInterval() {
+        return workflowSchedulingInterval;
+    }
+
+    public void setWorkflowSchedulingInterval(Duration schedulingDelay) {
+        this.workflowSchedulingInterval = schedulingDelay;
+    }
+}
\ No newline at end of file
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;
diff --git a/prh-app-server/src/main/resources/application.yaml b/prh-app-server/src/main/resources/application.yaml
index 2d244887..8f1950d0 100644
--- a/prh-app-server/src/main/resources/application.yaml
+++ b/prh-app-server/src/main/resources/application.yaml
@@ -12,6 +12,9 @@ server:
 
 management.endpoints.web.exposure.include: "loggers,refresh,env,health"
 
+prh:
+  workflow-scheduling-interval: 10s
+
 ---
 spring:
   profiles: dev
-- 
cgit 1.2.3-korg