From 5e8cf616cae25029be31104a23f9b20ca0a6a035 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Mon, 7 Jun 2021 11:14:41 +0200 Subject: Fix Sonar issues Issue-ID: CCSDK-3255 Signed-off-by: elinuxhenrik Change-Id: Iaf070882fac078d3441748b6dfc7218b1ac1ab31 --- .../ccsdk/oran/a1policymanagementservice/repository/Services.java | 8 ++++---- .../a1policymanagementservice/controllers/v2/ApplicationTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'a1-policy-management/src') diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Services.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Services.java index 2d2f6364..68a8d7dd 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Services.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Services.java @@ -52,11 +52,11 @@ public class Services { } public synchronized Service getService(String name) throws ServiceException { - Service s = registeredServices.get(name); - if (s == null) { + Service service = registeredServices.get(name); + if (service == null) { throw new ServiceException("Could not find service: " + name); } - return s; + return service; } public synchronized Service get(String name) { @@ -80,7 +80,7 @@ public class Services { try { Files.delete(getPath(service)); } catch (Exception e) { - + // Doesn't matter. } } } diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java index 9c9331da..ab9b7266 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java @@ -249,7 +249,7 @@ class ApplicationTest { // check that the service can be deleted this.services.remove(SERVICE); servicesRestored = new Services(this.applicationConfig); - assertThat(servicesRestored.size()).isEqualTo(0); + assertThat(servicesRestored.size()).isZero(); } @Test @@ -271,7 +271,7 @@ class ApplicationTest { // Test that the type has been synched Ric addedRic = this.rics.getRic(RIC); - assertThat(addedRic.getSupportedPolicyTypes().size()).isEqualTo(1); + assertThat(addedRic.getSupportedPolicyTypes()).hasSize(1); assertThat(addedRic.getSupportedPolicyTypes().iterator().next().getId()).isEqualTo(TYPE); // Check that a service callback for the AVAILABLE RIC is invoked @@ -298,9 +298,9 @@ class ApplicationTest { // Check that no service callback for the UNAVAILABLE RIC is invoked RappSimulatorController.TestResults receivedCallbacks = rAppSimulator.getTestResults(); - assertThat(receivedCallbacks.getReceivedInfo().size()).isEqualTo(0); + assertThat(receivedCallbacks.getReceivedInfo()).isEmpty(); - // Run a synch and check that the AVAILABLE notificationis received + // Run a synch and check that the AVAILABLE notification is received a1ClientFactory.reset(); supervision.checkAllRics(); waitForRicState(RIC, RicState.AVAILABLE); -- cgit 1.2.3-korg