Added run task after application is up

Change-Id: I91985184352dda7937b0c5bf036c916228cb6055
Issue-ID: DCAEGEN2-545
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
index ff2f8bd..0cc12d4 100644 (file)
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
@@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 
 /**
@@ -36,6 +37,7 @@ import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration(exclude = {JacksonAutoConfiguration.class})
+@EnableScheduling
 public class MainApp {
 
     public static void main(String[] args) {

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java
new file mode 100644 (file)
index 0000000..a650fe8
--- /dev/null
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SchedulerConfig.java
@@ -0,0 +1,76 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PNF-REGISTRATION-HANDLER
+ * ================================================================================
+ * Copyright (C) 2018 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 io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ScheduledFuture;
+import javax.annotation.PostConstruct;
+import org.onap.dcaegen2.services.prh.tasks.ScheduledTasks;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 6/13/18
+ */
+@Configuration
+@EnableScheduling
+public class SchedulerConfig extends PrhAppConfig {
+
+    private static final int SCHEDULING_DELAY = 2000;
+    private static volatile List<ScheduledFuture> scheduledFutureList = new ArrayList<>();
+
+    private final TaskScheduler taskScheduler;
+    private final ScheduledTasks scheduledTask;
+
+    @Autowired
+    public SchedulerConfig(TaskScheduler taskScheduler, ScheduledTasks scheduledTask) {
+        this.taskScheduler = taskScheduler;
+        this.scheduledTask = scheduledTask;
+    }
+
+    @ApiOperation(value = "Get response on stopping task execution")
+    public synchronized Mono<ResponseEntity<String>> getResponseFromCancellationOfTasks() {
+        scheduledFutureList.forEach(x -> x.cancel(false));
+        scheduledFutureList.clear();
+        return Mono.defer(() ->
+            Mono.just(new ResponseEntity<>("PRH Service has already been stopped!", HttpStatus.CREATED))
+        );
+    }
+
+    @PostConstruct
+    @ApiOperation(value = "Start task if possible")
+    public synchronized boolean tryToStartTask() {
+        if (scheduledFutureList.isEmpty()) {
+            scheduledFutureList.add(taskScheduler
+                .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask, SCHEDULING_DELAY));
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+}

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java
index dbac6a5..a55cb10 100644 (file)
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java
@@ -1,4 +1,4 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * PNF-REGISTRATION-HANDLER
  * ================================================================================
@@ -21,6 +21,7 @@ package org.onap.dcaegen2.services.prh.controllers;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.onap.dcaegen2.services.prh.configuration.SchedulerConfig;
 import org.onap.dcaegen2.services.prh.tasks.ScheduledTasks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,52 +46,26 @@ import java.util.concurrent.ScheduledFuture;
 public class ScheduleController {
 
     private static final Logger logger = LoggerFactory.getLogger(ScheduleController.class);
-    private static final int SCHEDULING_DELAY = 5000;
-    private static volatile List<ScheduledFuture> scheduledFutureList = new ArrayList<>();
-
-    private final TaskScheduler taskScheduler;
-    private final ScheduledTasks scheduledTask;
 
+    private final SchedulerConfig schedulerConfig;
 
     @Autowired
-    public ScheduleController(TaskScheduler taskScheduler, ScheduledTasks scheduledTask) {
-        this.taskScheduler = taskScheduler;
-        this.scheduledTask = scheduledTask;
+    public ScheduleController(SchedulerConfig schedulerConfig) {
+        this.schedulerConfig = schedulerConfig;
     }
 
     @RequestMapping(value = "start", method = RequestMethod.GET)
     @ApiOperation(value = "Start scheduling worker request")
     public Mono<ResponseEntity<String>> startTasks() {
         logger.trace("Receiving start scheduling worker request");
-        return Mono.fromSupplier(this::tryToStartTask).map(this::createStartTaskResponse);
+        return Mono.fromSupplier(schedulerConfig::tryToStartTask).map(this::createStartTaskResponse);
     }
 
     @RequestMapping(value = "stopPrh", method = RequestMethod.GET)
     @ApiOperation(value = "Receiving stop scheduling worker request")
     public Mono<ResponseEntity<String>> stopTask() {
         logger.trace("Receiving stop scheduling worker request");
-        return getResponseFromCancellationOfTasks();
-    }
-
-    @ApiOperation(value = "Get response on stopping task execution")
-    private synchronized Mono<ResponseEntity<String>> getResponseFromCancellationOfTasks() {
-        scheduledFutureList.forEach(x -> x.cancel(false));
-        scheduledFutureList.clear();
-        return Mono.defer(() ->
-            Mono.just(new ResponseEntity<>("PRH Service has already been stopped!", HttpStatus.CREATED))
-        );
-    }
-
-    @ApiOperation(value = "Start task if possible")
-    private synchronized boolean tryToStartTask() {
-        if (scheduledFutureList.isEmpty()) {
-            scheduledFutureList.add(taskScheduler
-                .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask, SCHEDULING_DELAY));
-            return true;
-        } else {
-            return false;
-        }
-
+        return schedulerConfig.getResponseFromCancellationOfTasks();
     }
 
     @ApiOperation(value = "Sends success or error response on starting task execution")