From 1346500fa3aa1fd1ebe77c80f34df8d09324d5d2 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Wed, 4 Mar 2020 13:22:22 +0100 Subject: [PATCH] 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 --- policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java | 1 + .../main/java/org/oransc/policyagent/tasks/RepositorySupervision.java | 4 ++-- .../java/org/oransc/policyagent/tasks/RicSynchronizationTask.java | 2 +- .../src/main/java/org/oransc/policyagent/tasks/StartupService.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) 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 c50a0f09..a5de890e 100644 --- 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 8dcb8110..d9377850 100644 --- 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 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 9d25fa34..7c6e5caf 100644 --- 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 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 85521627..d3b8b351 100644 --- 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 { -- 2.16.6