Make naming consistent regarding synchronization

When the class RecoveryTask was renamed to SynchronizationTask some
variables where not correctly named. This is corrected in this commit.

Also contains some minor formatting changes to align to the formatting standard.

Change-Id: I10a0d9bcf02c1b342da142f5669469875328d9a6
Issue-ID: NONRTRIC-142
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
index c50a0f0..a5de890 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java
@@ -21,6 +21,7 @@
 package org.oransc.policyagent.repository;
 
 import com.google.common.collect.ImmutableList;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
index 8dcb811..d937785 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
@@ -158,8 +158,8 @@ public class RepositorySupervision {
     }
 
     private Mono<RicData> startSynchronization(RicData ric) {
-        RicSynchronizationTask recovery = createSynchronizationTask();
-        recovery.run(ric.ric);
+        RicSynchronizationTask synchronizationTask = createSynchronizationTask();
+        synchronizationTask.run(ric.ric);
         return Mono.error(new Exception("Syncronization started"));
     }
 

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java
index 9d25fa3..7c6e5ca 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java
@@ -126,7 +126,7 @@ public class RicSynchronizationTask {
     @SuppressWarnings("squid:S2629")
     private void onSynchronizationError(Ric ric, Throwable t) {
         logger.warn("Synchronization failed for ric: {}, reason: {}", ric.name(), t.getMessage());
-        // If recovery fails, try to remove all instances
+        // If synchronization fails, try to remove all instances
         deleteAllPoliciesInRepository(ric);
 
         Flux<PolicyType> recoverTypes = this.a1ClientFactory.createA1Client(ric) //

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 8552162..d3b8b35 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
@@ -84,9 +84,9 @@ public class StartupService implements ApplicationConfig.Observer {
                 || event.equals(ApplicationConfig.RicConfigUpdate.CHANGED)) {
                 Ric ric = new Ric(ricConfig);
                 rics.put(ric);
-                RicSynchronizationTask recoveryTask =
+                RicSynchronizationTask synchronizationTask =
                     new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
-                recoveryTask.run(ric);
+                synchronizationTask.run(ric);
             } else if (event.equals(ApplicationConfig.RicConfigUpdate.REMOVED)) {
                 rics.remove(ricConfig.name());
             } else {