Merge "Added STD sim 2.0.0 tests"

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / Application.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/Application.java b/policy-agent/src/main/java/org/oransc/policyagent/Application.java
index 6d8cd99..3bc7326 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/Application.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/Application.java
@@ -20,7 +20,8 @@
 
 package org.oransc.policyagent;
 
-import org.oransc.policyagent.tasks.StartupService;
+import org.oransc.policyagent.dmaap.DmaapMessageConsumer;
+import org.oransc.policyagent.tasks.RefreshConfigTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -32,24 +33,36 @@ import org.springframework.context.annotation.Bean;
 public class Application {
 
     @Autowired
-    private StartupService startupService;
+    private RefreshConfigTask configRefresh;
+
+    @Autowired
+    private DmaapMessageConsumer dmaapMessageConsumer;
 
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(Application.class);
     }
 
     /**
-     * Starts the service and reads the configuration.
+     * Starts the configuration refresh task and reads the configuration.
      *
      * @param ctx the application context.
      *
-     * @return the command line runner performing tasks at startup.
+     * @return the command line runner for the configuration refresh task.
      */
     @Bean
-    public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
-        return args -> {
+    public CommandLineRunner configRefreshRunner(ApplicationContext ctx) {
+        return args -> configRefresh.start();
+    }
 
-            startupService.startup();
-        };
+    /**
+     * Starts the DMaaP message consumer service.
+     *
+     * @param ctx the application context.
+     *
+     * @return the command line runner for the DMaaP message consumer service.
+     */
+    @Bean
+    public CommandLineRunner dmaapMessageConsumerRunner(ApplicationContext ctx) {
+        return args -> dmaapMessageConsumer.start();
     }
 }