1 files changed, 19 insertions, 15 deletions

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 70c54a51..5a5eb075 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
@@ -3,6 +3,7 @@
  * PNF-REGISTRATION-HANDLER
  * ================================================================================
  * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2023 Deutsche Telekom 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.
@@ -23,44 +24,41 @@ package org.onap.dcaegen2.services.prh.tasks;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledFuture;
-
 import javax.annotation.PreDestroy;
+import org.onap.dcaegen2.services.prh.configuration.CbsConfiguration;
 import org.onap.dcaegen2.services.prh.configuration.PrhProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-
 /**
  * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 6/13/18
  */
+
+@Profile("!autoCommitDisabled")
 @Configuration
 @EnableScheduling
 public class ScheduledTasksRunner {
-    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 static volatile List<ScheduledFuture> scheduledPrhTaskFutureList = new ArrayList<>();
     private final TaskScheduler taskScheduler;
     private final ScheduledTasks scheduledTask;
     private final PrhProperties prhProperties;
-
+    private final CbsConfiguration cbsConfiguration;
     public ScheduledTasksRunner(TaskScheduler taskScheduler, ScheduledTasks scheduledTask,
-        PrhProperties prhProperties) {
+        PrhProperties prhProperties, CbsConfiguration cbsConfiguration) {
         this.taskScheduler = taskScheduler;
         this.scheduledTask = scheduledTask;
         this.prhProperties = prhProperties;
+        this.cbsConfiguration = cbsConfiguration;
     }
-
+    
     @EventListener
     public void onApplicationStartedEvent(ApplicationStartedEvent applicationStartedEvent) {
-        tryToStartTask();
+            tryToStartTask();
     }
 
     /**
@@ -78,7 +76,6 @@ public class ScheduledTasksRunner {
      * @return status of operation execution: true - started, false - not started
      */
     public synchronized boolean tryToStartTask() {
-        LOGGER.info(ENTRY, "Start scheduling PRH workflow");
         if (scheduledPrhTaskFutureList.isEmpty()) {
             scheduledPrhTaskFutureList.add(taskScheduler
                 .scheduleWithFixedDelay(scheduledTask::scheduleMainPrhEventTask,
@@ -88,5 +85,12 @@ public class ScheduledTasksRunner {
             return false;
         }
     }
-
+    
+    /**
+     * Function for cleaning resources for kafka subscriber and publisher.
+     */
+    public synchronized void closeKafkaPublisherSubscriber() {
+        cbsConfiguration.getMessageRouterSubscriber().close();
+        cbsConfiguration.getMessageRouterPublisher().close();
+    }
 }