From 3b5213d7ef998e3f76d58a767230013be0a7927f Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Mon, 9 Dec 2019 12:53:47 +0100 Subject: [PATCH 1/1] Cleanup Change-Id: I3bc21a2f1eff39341a4eb9b0a06306b27fff2ea2 Issue-ID: NONRTRIC-81 Signed-off-by: elinuxhenrik --- policy-agent/src/main/java/org/oransc/policyagent/Beans.java | 2 ++ .../main/java/org/oransc/policyagent/configuration/RicConfig.java | 2 +- .../java/org/oransc/policyagent/controllers/PolicyController.java | 6 +----- .../java/org/oransc/policyagent/controllers/StartupService.java | 3 +++ .../src/main/java/org/oransc/policyagent/repository/PolicyType.java | 1 + .../main/java/org/oransc/policyagent/repository/PolicyTypes.java | 5 ----- .../src/test/java/org/oransc/policyagent/ApplicationTest.java | 3 ++- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/policy-agent/src/main/java/org/oransc/policyagent/Beans.java b/policy-agent/src/main/java/org/oransc/policyagent/Beans.java index 4b8adf40..cf88479f 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/Beans.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/Beans.java @@ -17,6 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent; import org.oransc.policyagent.configuration.ApplicationConfig; @@ -44,6 +45,7 @@ public class Beans { public Rics getRics() { return rics; } + @Bean public ApplicationConfig getApplicationConfig() { return new ApplicationConfig(); diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/RicConfig.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/RicConfig.java index ad7fe6f5..8af3a9c7 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/RicConfig.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/RicConfig.java @@ -17,10 +17,10 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent.configuration; import java.util.Vector; - import org.immutables.gson.Gson; import org.immutables.value.Value; 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 e40fe8c5..b2d0fab8 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 @@ -20,12 +20,10 @@ package org.oransc.policyagent.controllers; import com.google.gson.Gson; -import org.oransc.policyagent.Beans; import com.google.gson.GsonBuilder; - import java.util.Collection; import java.util.Vector; - +import org.oransc.policyagent.Beans; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.repository.ImmutablePolicy; @@ -46,7 +44,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class PolicyController { - private final Beans beans; private final ApplicationConfig appConfig; private final Rics rics; private final PolicyTypes types; @@ -57,7 +54,6 @@ public class PolicyController { @Autowired PolicyController(Beans beans) { - this.beans = beans; this.appConfig = beans.getApplicationConfig(); this.rics = beans.getRics(); this.types = beans.getPolicyTypes(); diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/StartupService.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/StartupService.java index c0a05d3a..12866ac0 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/StartupService.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/StartupService.java @@ -49,6 +49,9 @@ public class StartupService { this.rics = rics; } + /** + * Reads the configured Rics and performs the service discovery. The result is put into the repository. + */ public void startup() { applicationConfig.initialize(); Vector ricConfigs = applicationConfig.getRicConfigs(); diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyType.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyType.java index 184d3ec3..896e676a 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyType.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyType.java @@ -17,6 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent.repository; import org.immutables.gson.Gson; diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyTypes.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyTypes.java index dc299b62..d3c2c4fc 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyTypes.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/PolicyTypes.java @@ -22,14 +22,9 @@ package org.oransc.policyagent.repository; import java.util.HashMap; import java.util.Map; - import org.oransc.policyagent.exceptions.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class PolicyTypes { - private static final Logger logger = LoggerFactory.getLogger(PolicyTypes.class); - private Map types = new HashMap(); public PolicyTypes() { 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 c7d2e557..8bcd99aa 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -17,6 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; @@ -188,11 +189,11 @@ public class ApplicationTest { @Test public void getPoliciesFilter() throws Exception { - String url = "http://localhost:" + port + "/policies?type=type1"; addPolicy("id1", "type1", "service1"); addPolicy("id2", "type1", "service2"); addPolicy("id3", "type2", "service1"); + String url = "http://localhost:" + port + "/policies?type=type1"; String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); assertThat(rsp).contains("id1"); -- 2.16.6