Change to JUnit5 and clean up pom

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / repository / Policies.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Policies.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Policies.java
index cddd8a3..9895ff1 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Policies.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Policies.java
@@ -26,12 +26,8 @@ import java.util.Map;
 import java.util.Vector;
 
 import org.oransc.policyagent.exceptions.ServiceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class Policies {
-    private static final Logger logger = LoggerFactory.getLogger(Policies.class);
-
     private Map<String, Policy> policiesId = new HashMap<>();
     private Map<String, Map<String, Policy>> policiesRic = new HashMap<>();
     private Map<String, Map<String, Policy>> policiesService = new HashMap<>();
@@ -100,7 +96,7 @@ public class Policies {
 
     public synchronized Policy removeId(String id) {
         Policy p = policiesId.get(id);
-        if (p == null) {
+        if (p != null) {
             remove(p);
         }
         return p;
@@ -111,7 +107,16 @@ public class Policies {
         multiMapRemove(policiesRic, policy.ric().name(), policy);
         multiMapRemove(policiesService, policy.ownerServiceName(), policy);
         multiMapRemove(policiesType, policy.type().name(), policy);
+    }
 
+    public synchronized int size() {
+        return policiesId.size();
+    }
+
+    public void clear() {
+        for (String id : policiesId.keySet()) {
+            removeId(id);
+        }
     }
 
 }