Remove code smells and increase code coverage

[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 46587a2..8552162 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
@@ -20,7 +20,7 @@
 
 package org.oransc.policyagent.tasks;
 
-import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Policies;
@@ -57,7 +57,7 @@ public class StartupService implements ApplicationConfig.Observer {
     PolicyTypes policyTypes;
 
     @Autowired
-    private A1Client a1Client;
+    private A1ClientFactory a1ClientFactory;
 
     @Autowired
     private Policies policies;
@@ -65,14 +65,14 @@ public class StartupService implements ApplicationConfig.Observer {
     @Autowired
     private Services services;
 
-    // Only for unittesting
+    // Only for unit testing
     StartupService(ApplicationConfig appConfig, RefreshConfigTask refreshTask, Rics rics, PolicyTypes policyTypes,
-        A1Client a1Client, Policies policies, Services services) {
+        A1ClientFactory a1ClientFactory, Policies policies, Services services) {
         this.applicationConfig = appConfig;
         this.refreshConfigTask = refreshTask;
         this.rics = rics;
         this.policyTypes = policyTypes;
-        this.a1Client = a1Client;
+        this.a1ClientFactory = a1ClientFactory;
         this.policies = policies;
         this.services = services;
     }
@@ -84,12 +84,13 @@ public class StartupService implements ApplicationConfig.Observer {
                 || event.equals(ApplicationConfig.RicConfigUpdate.CHANGED)) {
                 Ric ric = new Ric(ricConfig);
                 rics.put(ric);
-                RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies, services);
+                RicSynchronizationTask recoveryTask =
+                    new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
                 recoveryTask.run(ric);
             } else if (event.equals(ApplicationConfig.RicConfigUpdate.REMOVED)) {
                 rics.remove(ricConfig.name());
             } else {
-                logger.debug("Unhandled event :" + event);
+                logger.debug("Unhandled event: {}", event);
             }
         }
     }