commit 83e17a0f5921fe2637e31c8506479894757379a5
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Aug 20 14:07:05 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Aug 20 21:53:35 2015 +0000
tree ae8fb265b1494124a520f49bb97c180650da3dff
parent d28842c563960446f431c1636ebb147bc711b39b

ONOS-2710: Change singnatures of register/unregister in ResourceStore

Change-Id: I2e90871d79cac94474a39c797168870173441eeb

core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
index cf199ec..a071414 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
@@ -94,9 +94,8 @@
     }
 
     @Override
-    public boolean register(ResourcePath resource, List<ResourcePath> children) {
-        checkNotNull(resource);
-        checkNotNull(children);
+    public boolean register(List<ResourcePath> resources) {
+        checkNotNull(resources);
 
         TransactionContext tx = service.transactionContextBuilder().build();
         tx.begin();
@@ -105,12 +104,18 @@
             TransactionalMap<ResourcePath, List<ResourcePath>> childTxMap =
                     tx.getTransactionalMap(CHILD_MAP, SERIALIZER);
 
-            if (!isRegistered(childTxMap, resource)) {
-                return abortTransaction(tx);
-            }
+            Map<ResourcePath, List<ResourcePath>> resourceMap = resources.stream()
+                    .filter(x -> x.parent().isPresent())
+                    .collect(Collectors.groupingBy(x -> x.parent().get()));
 
-            if (!appendValues(childTxMap, resource, children)) {
-                return abortTransaction(tx);
+            for (Map.Entry<ResourcePath, List<ResourcePath>> entry: resourceMap.entrySet()) {
+                if (!isRegistered(childTxMap, entry.getKey())) {
+                    return abortTransaction(tx);
+                }
+
+                if (!appendValues(childTxMap, entry.getKey(), entry.getValue())) {
+                    return abortTransaction(tx);
+                }
             }
 
             return commitTransaction(tx);
@@ -121,9 +126,8 @@
     }
 
     @Override
-    public boolean unregister(ResourcePath resource, List<ResourcePath> children) {
-        checkNotNull(resource);
-        checkNotNull(children);
+    public boolean unregister(List<ResourcePath> resources) {
+        checkNotNull(resources);
 
         TransactionContext tx = service.transactionContextBuilder().build();
         tx.begin();
@@ -134,14 +138,20 @@
             TransactionalMap<ResourcePath, ResourceConsumer> consumerTxMap =
                     tx.getTransactionalMap(CONSUMER_MAP, SERIALIZER);
 
+            Map<ResourcePath, List<ResourcePath>> resourceMap = resources.stream()
+                    .filter(x -> x.parent().isPresent())
+                    .collect(Collectors.groupingBy(x -> x.parent().get()));
+
             // even if one of the resources is allocated to a consumer,
             // all unregistrations are regarded as failure
-            if (children.stream().anyMatch(x -> consumerTxMap.get(x) != null)) {
-                return abortTransaction(tx);
-            }
+            for (Map.Entry<ResourcePath, List<ResourcePath>> entry: resourceMap.entrySet()) {
+                if (entry.getValue().stream().anyMatch(x -> consumerTxMap.get(x) != null)) {
+                    return abortTransaction(tx);
+                }
 
-            if (!removeValues(childTxMap, resource, children)) {
-                return abortTransaction(tx);
+                if (!removeValues(childTxMap, entry.getKey(), entry.getValue())) {
+                    return abortTransaction(tx);
+                }
             }
 
             return commitTransaction(tx);