From a07ea7cc1f8b8673afbd31f4cfdcda2d6c8e8c2b Mon Sep 17 00:00:00 2001 From: pkaras Date: Thu, 15 Nov 2018 09:15:49 +0100 Subject: Cycle between configuration & tasks removed Change-Id: Ida3b77ab3f3d197d8ca0bf81f344801df46e6627 Issue-ID: DCAEGEN2-974 Signed-off-by: piotr.karas --- .../services/prh/controllers/ScheduleController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/ScheduleController.java') 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 9386b9e8..aa913654 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 @@ -22,7 +22,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.ScheduledTasksRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,25 +42,25 @@ public class ScheduleController { private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleController.class); - private final SchedulerConfig schedulerConfig; + private final ScheduledTasksRunner scheduledTasksRunner; @Autowired - public ScheduleController(SchedulerConfig schedulerConfig) { - this.schedulerConfig = schedulerConfig; + public ScheduleController(ScheduledTasksRunner scheduledTasksRunner) { + this.scheduledTasksRunner = scheduledTasksRunner; } @RequestMapping(value = "start", method = RequestMethod.GET) @ApiOperation(value = "Start scheduling worker request") public Mono> startTasks() { LOGGER.trace("Receiving start scheduling worker request"); - return Mono.fromSupplier(schedulerConfig::tryToStartTask).map(this::createStartTaskResponse); + return Mono.fromSupplier(scheduledTasksRunner::tryToStartTask).map(this::createStartTaskResponse); } @RequestMapping(value = "stopPrh", method = RequestMethod.GET) @ApiOperation(value = "Receiving stop scheduling worker request") public Mono> stopTask() { LOGGER.trace("Receiving stop scheduling worker request"); - return schedulerConfig.getResponseFromCancellationOfTasks(); + return scheduledTasksRunner.getResponseFromCancellationOfTasks(); } @ApiOperation(value = "Sends success or error response on starting task execution") -- cgit 1.2.3-korg