diff options
Diffstat (limited to 'prh-app-server/src/main/java/org/onap')
2 files changed, 47 insertions, 4 deletions
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..2aa154b2 --- /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; + } +} 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 25ed262e..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,11 +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; @@ -42,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 @@ -63,6 +66,7 @@ public class ScheduledTasksRunner { /** * Function which have to stop tasks execution. */ + @PreDestroy public synchronized void cancelTasks() { scheduledPrhTaskFutureList.forEach(x -> x.cancel(false)); scheduledPrhTaskFutureList.clear(); @@ -78,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; |