summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main/java
diff options
context:
space:
mode:
authorgrabinsk <maciej.grabinski@nokia.com>2019-05-31 11:23:13 +0200
committergrabinsk <maciej.grabinski@nokia.com>2019-05-31 14:27:50 +0200
commita7eed5cf5cefe05eeb2f5610d117b12d36b53512 (patch)
tree90b8ad569e497a44561865baa1f87859d9b95e77 /prh-app-server/src/main/java
parent20c84fd46a3cf1ffa2e07e740cdccc3c1b77c13c (diff)
Add test for ScheduleController;
moving web related logic out from ScheduleTasksRunner Change-Id: I57c0311509ca94b639e3dc9978fbe602aec1f0c4 Issue-ID: DCAEGEN2-1544 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java9
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasksRunner.java14
2 files changed, 7 insertions, 16 deletions
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 aa913654..a0aa17e3 100644
--- 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
@@ -60,15 +60,18 @@ public class ScheduleController {
@ApiOperation(value = "Receiving stop scheduling worker request")
public Mono<ResponseEntity<String>> stopTask() {
LOGGER.trace("Receiving stop scheduling worker request");
- return scheduledTasksRunner.getResponseFromCancellationOfTasks();
+ return Mono.defer(() -> {
+ scheduledTasksRunner.cancelTasks();
+ return Mono.just(new ResponseEntity<>("PRH Service has been stopped!", HttpStatus.OK));
+ }
+ );
}
- @ApiOperation(value = "Sends success or error response on starting task execution")
private ResponseEntity<String> createStartTaskResponse(boolean wasScheduled) {
if (wasScheduled) {
return new ResponseEntity<>("PRH Service has been started!", HttpStatus.CREATED);
} else {
- return new ResponseEntity<>("PRH Service is still running!", HttpStatus.NOT_ACCEPTABLE);
+ return new ResponseEntity<>("PRH Service is already running!", HttpStatus.NOT_ACCEPTABLE);
}
}
}
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 e9c18109..bc13ddc4 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,7 +20,6 @@
package org.onap.dcaegen2.services.prh.tasks;
-import io.swagger.annotations.ApiOperation;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -35,11 +34,8 @@ import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
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;
/**
@@ -70,16 +66,10 @@ public class ScheduledTasksRunner {
/**
* Function which have to stop tasks execution.
- *
- * @return response entity about status of cancellation operation
*/
- @ApiOperation(value = "Get response on stopping task execution")
- public synchronized Mono<ResponseEntity<String>> getResponseFromCancellationOfTasks() {
+ public synchronized void cancelTasks() {
scheduledPrhTaskFutureList.forEach(x -> x.cancel(false));
scheduledPrhTaskFutureList.clear();
- return Mono.defer(() ->
- Mono.just(new ResponseEntity<>("PRH Service has already been stopped!", HttpStatus.CREATED))
- );
}
/**
@@ -87,9 +77,7 @@ public class ScheduledTasksRunner {
*
* @return status of operation execution: true - started, false - not started
*/
-
@PostConstruct
- @ApiOperation(value = "Start task if possible")
public synchronized boolean tryToStartTask() {
LOGGER.info(ENTRY, "Start scheduling PRH workflow");
if (scheduledPrhTaskFutureList.isEmpty()) {