Merge "Removed the duplicate dependency"

[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..2a4eb5a 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
@@ -23,15 +23,12 @@ package org.oransc.policyagent.repository;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 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<>();
@@ -74,7 +71,11 @@ public class Policies {
         return map.values();
     }
 
-    public synchronized Policy get(String id) throws ServiceException {
+    public synchronized boolean containsPolicy(String id) {
+        return policiesId.containsKey(id);
+    }
+
+    public synchronized Policy getPolicy(String id) throws ServiceException {
         Policy p = policiesId.get(id);
         if (p == null) {
             throw new ServiceException("Could not find policy: " + id);
@@ -100,7 +101,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 +112,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 synchronized void clear() {
+        while (policiesId.size() > 0) {
+            Set<String> keys = policiesId.keySet();
+            removeId(keys.iterator().next());
+        }
+    }
 }