From: Henrik Andersson <henrik.b.andersson@est.tech>
Date: Tue, 17 Mar 2020 14:21:01 +0000 (+0000)
Subject: Merge "Report code coverage of A1 controller to Sonar"
X-Git-Tag: 2.0.0~117
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2a1f2b461cfcfc341c3e4342707e4dbb8ad24369;hp=22d266b4219217547e68753b44b67cb131bc6179;p=nonrtric.git

Merge "Report code coverage of A1 controller to Sonar"
---

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Lock.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Lock.java
index ff3f3310..70d00cb0 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Lock.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Lock.java
@@ -168,7 +168,7 @@ public class Lock {
         lockRequestQueue.add(new LockRequest(callback, lockType, this));
     }
 
-    @SuppressWarnings("java:S2274")
+    @SuppressWarnings("java:S2274") // Always invoke wait() and await() methods inside a loop
     private synchronized void waitForUnlock() {
         try {
             this.wait();
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 0a0ab826..79b92e49 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
@@ -64,6 +64,7 @@ public class RicSynchronizationTask {
     private final Policies policies;
     private final Services services;
 
+    @SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally.
     public RicSynchronizationTask(A1ClientFactory a1ClientFactory, PolicyTypes policyTypes, Policies policies,
         Services services) {
         this.a1ClientFactory = a1ClientFactory;
@@ -72,7 +73,7 @@ public class RicSynchronizationTask {
         this.services = services;
     }
 
-    @SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally
+    @SuppressWarnings("squid:S2445") // Blocks should be synchronized on "private final" fields
     public void run(Ric ric) {
         logger.debug("Handling ric: {}", ric.getConfig().name());
 
@@ -101,7 +102,6 @@ public class RicSynchronizationTask {
         return Flux.concat(recoverTypes, policiesDeletedInRic, policiesRecreatedInRic);
     }
 
-    @SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally
     private void onSynchronizationComplete(Ric ric) {
         logger.info("Synchronization completed for: {}", ric.name());
         ric.setState(RicState.IDLE);
@@ -124,7 +124,6 @@ public class RicSynchronizationTask {
         }
     }
 
-    @SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally
     private void onSynchronizationError(Ric ric, Throwable t) {
         logger.warn("Synchronization failed for ric: {}, reason: {}", ric.name(), t.getMessage());
         // If synchronization fails, try to remove all instances
@@ -142,7 +141,6 @@ public class RicSynchronizationTask {
                 () -> onSynchronizationComplete(ric));
     }
 
-    @SuppressWarnings("squid:S2629") // Invoke method(s) only conditionally
     private void onRecoveryError(Ric ric, Throwable t) {
         logger.warn("Synchronization failure recovery failed for ric: {}, reason: {}", ric.name(), t.getMessage());
         ric.setState(RicState.UNDEFINED);
diff --git a/policy-agent/src/test/java/org/oransc/policyagent/repository/LockTest.java b/policy-agent/src/test/java/org/oransc/policyagent/repository/LockTest.java
index 6fd6c8b9..814056b3 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/repository/LockTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/repository/LockTest.java
@@ -36,6 +36,7 @@ import reactor.test.StepVerifier;
 @ExtendWith(MockitoExtension.class)
 public class LockTest {
 
+    @SuppressWarnings("squid:S2276") // Remove this use of "Thread.sleep()".
     private void sleep() {
         try {
             Thread.sleep(100);