Move RefreshConfigTask under tasks

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

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
index d2356ea..46587a2 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
@@ -27,22 +27,29 @@ import org.oransc.policyagent.repository.Policies;
 import org.oransc.policyagent.repository.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 /**
  * Loads information about RealTime-RICs at startup.
  */
 @Service("startupService")
-public class StartupService {
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class StartupService implements ApplicationConfig.Observer {
 
     private static final Logger logger = LoggerFactory.getLogger(StartupService.class);
 
     @Autowired
     ApplicationConfig applicationConfig;
 
+    @Autowired
+    RefreshConfigTask refreshConfigTask;
+
     @Autowired
     private Rics rics;
 
@@ -55,13 +62,36 @@ public class StartupService {
     @Autowired
     private Policies policies;
 
-    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, A1Client a1Client,
-        Policies policies) {
+    @Autowired
+    private Services services;
+
+    // Only for unittesting
+    StartupService(ApplicationConfig appConfig, RefreshConfigTask refreshTask, Rics rics, PolicyTypes policyTypes,
+        A1Client a1Client, Policies policies, Services services) {
         this.applicationConfig = appConfig;
+        this.refreshConfigTask = refreshTask;
         this.rics = rics;
         this.policyTypes = policyTypes;
         this.a1Client = a1Client;
         this.policies = policies;
+        this.services = services;
+    }
+
+    @Override
+    public void onRicConfigUpdate(RicConfig ricConfig, ApplicationConfig.RicConfigUpdate event) {
+        synchronized (this.rics) {
+            if (event.equals(ApplicationConfig.RicConfigUpdate.ADDED)
+                || event.equals(ApplicationConfig.RicConfigUpdate.CHANGED)) {
+                Ric ric = new Ric(ricConfig);
+                rics.put(ric);
+                RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies, services);
+                recoveryTask.run(ric);
+            } else if (event.equals(ApplicationConfig.RicConfigUpdate.REMOVED)) {
+                rics.remove(ricConfig.name());
+            } else {
+                logger.debug("Unhandled event :" + event);
+            }
+        }
     }
 
     /**
@@ -69,12 +99,8 @@ public class StartupService {
      */
     public void startup() {
         logger.debug("Starting up");
-        applicationConfig.initialize();
-        for (RicConfig ricConfig : applicationConfig.getRicConfigs()) {
-            rics.put(new Ric(ricConfig));
-        }
-        RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies);
-        recoveryTask.run(rics.getRics()); // recover all Rics
+        applicationConfig.addObserver(this);
+        refreshConfigTask.start();
     }
 
 }