Merge "Added STD sim 2.0.0 tests"

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

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Rics.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Rics.java
index 6f3b3e8..7faa376 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Rics.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Rics.java
@@ -20,9 +20,11 @@
 
 package org.oransc.policyagent.repository;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Vector;
 
 import org.oransc.policyagent.exceptions.ServiceException;
 
@@ -30,18 +32,18 @@ import org.oransc.policyagent.exceptions.ServiceException;
  * Dynamic representation of all Rics in the system.
  */
 public class Rics {
-    Map<String, Ric> rics = new HashMap<>();
+    Map<String, Ric> registeredRics = new HashMap<>();
 
     public synchronized void put(Ric ric) {
-        rics.put(ric.name(), ric);
+        registeredRics.put(ric.name(), ric);
     }
 
-    public synchronized Iterable<Ric> getRics() {
-        return rics.values();
+    public synchronized Collection<Ric> getRics() {
+        return new Vector<>(registeredRics.values());
     }
 
     public synchronized Ric getRic(String name) throws ServiceException {
-        Ric ric = rics.get(name);
+        Ric ric = registeredRics.get(name);
         if (ric == null) {
             throw new ServiceException("Could not find ric: " + name);
         }
@@ -49,24 +51,24 @@ public class Rics {
     }
 
     public synchronized Ric get(String name) {
-        return rics.get(name);
+        return registeredRics.get(name);
     }
 
     public synchronized void remove(String name) {
-        rics.remove(name);
+        registeredRics.remove(name);
     }
 
     public synchronized int size() {
-        return rics.size();
+        return registeredRics.size();
     }
 
     public synchronized void clear() {
-        this.rics.clear();
+        this.registeredRics.clear();
     }
 
     public synchronized Optional<Ric> lookupRicForManagedElement(String managedElementId) {
-        for (Ric ric : this.rics.values()) {
-            if (ric.getConfig().managedElementIds().contains(managedElementId)) {
+        for (Ric ric : this.registeredRics.values()) {
+            if (ric.getManagedElementIds().contains(managedElementId)) {
                 return Optional.of(ric);
             }
         }