From 23bb4461f0d66b568675016e60be1ad478a02e98 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Wed, 4 Mar 2020 09:13:50 +0100 Subject: [PATCH] Remove code smells in Policy Agent Change-Id: I3885bd0e1c7940c2929f8890705f0d3e31c89470 Issue-ID: NONRTRIC-142 Signed-off-by: elinuxhenrik --- .../java/org/oransc/policyagent/Application.java | 2 +- .../policyagent/controllers/PolicyController.java | 10 ++++---- .../policyagent/dmaap/DmaapMessageConsumer.java | 2 ++ .../org/oransc/policyagent/repository/Ric.java | 28 +++------------------- .../org/oransc/policyagent/ApplicationTest.java | 14 +++++++---- 5 files changed, 20 insertions(+), 36 deletions(-) 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 154ab1d2..18120e5b 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/Application.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/Application.java @@ -35,7 +35,7 @@ public class Application { private StartupService startupService; public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(Application.class); } /** diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java index 21a0eee6..3a49ff12 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java @@ -216,12 +216,10 @@ public class PolicyController { private Mono validateModifiedPolicy(Policy policy) { // Check that ric is not updated Policy current = this.policies.get(policy.id()); - if (current != null) { - if (!current.ric().name().equals(policy.ric().name())) { - return Mono.error(new Exception("Policy cannot change RIC, policyId: " + current.id() + // - ", RIC name: " + current.ric().name() + // - ", new name: " + policy.ric().name())); - } + if (current != null && !current.ric().name().equals(policy.ric().name())) { + return Mono.error(new Exception("Policy cannot change RIC, policyId: " + current.id() + // + ", RIC name: " + current.ric().name() + // + ", new name: " + policy.ric().name())); } return Mono.just("OK"); } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java index d2daead2..46dd2ee2 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java @@ -44,7 +44,9 @@ public class DmaapMessageConsumer implements Runnable { private static final Logger logger = LoggerFactory.getLogger(DmaapMessageConsumer.class); + @SuppressWarnings("squid:S00116") // To avoid warning about DMAAP abbreviation. final Duration TIME_BETWEEN_DMAAP_POLLS = Duration.ofSeconds(10); + private final ApplicationConfig applicationConfig; @Value("${server.port}") 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 ab320655..c50a0f09 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 @@ -20,10 +20,9 @@ package org.oransc.policyagent.repository; -import java.util.ArrayList; +import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Vector; @@ -39,7 +38,7 @@ import org.oransc.policyagent.configuration.RicConfig; public class Ric { private final RicConfig ricConfig; - private final List managedElementIds; + private final ImmutableList managedElementIds; private RicState state = RicState.UNDEFINED; private Map supportedPolicyTypes = new HashMap<>(); @@ -57,8 +56,7 @@ public class Ric { */ public Ric(RicConfig ricConfig) { this.ricConfig = ricConfig; - this.managedElementIds = new ArrayList<>(ricConfig.managedElementIds()); // TODO, this is config why is it - // copied here? + this.managedElementIds = ricConfig.managedElementIds(); } public String name() { @@ -96,26 +94,6 @@ public class Ric { return managedElementIds.contains(managedElementId); } - /** - * Adds the given node as managed by this Ric. - * - * @param managedElementId the node to add. - */ - public synchronized void addManagedElement(String managedElementId) { - if (!managedElementIds.contains(managedElementId)) { - managedElementIds.add(managedElementId); - } - } - - /** - * Removes the given node as managed by this Ric. - * - * @param managedElementId the node to remove. - */ - public synchronized void removeManagedElement(String managedElementId) { - managedElementIds.remove(managedElementId); - } - /** * Gets the policy types supported by this Ric. * diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index 917aca0c..db5e2bdb 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -34,7 +34,6 @@ import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; -import java.util.Vector; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; @@ -217,9 +216,8 @@ public class ApplicationTest { @Test public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception { String ricName = "ric1"; - Ric ric = addRic(ricName); String managedElementId = "kista_1"; - ric.addManagedElement(managedElementId); + addRic(ricName, managedElementId); String url = baseUrl() + "/ric?managedElementId=" + managedElementId; String rsp = this.restTemplate.getForObject(url, String.class); @@ -490,6 +488,7 @@ public class ApplicationTest { this.supervision = supervision; } + @Override public void run() { for (int i = 0; i < 100; ++i) { if (i % 10 == 0) { @@ -547,10 +546,17 @@ public class ApplicationTest { } private Ric addRic(String ricName) { + return addRic(ricName, null); + } + + private Ric addRic(String ricName, String managedElement) { if (rics.get(ricName) != null) { return rics.get(ricName); } - Vector mes = new Vector<>(); + List mes = new ArrayList<>(); + if (managedElement != null) { + mes.add(managedElement); + } RicConfig conf = ImmutableRicConfig.builder() // .name(ricName) // .baseUrl(ricName) // -- 2.16.6