commit 2c7cecfa9068ff6acf7f122ed8e0ff0ddad01c33
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Nov 11 14:16:14 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 25 03:18:13 2015 +0000
tree 6b2c543042651357d81e9dd79765388f91dff0ac
parent 46297d2c92be5d2db4bd95f5f55fac17ddc05c26

Generalize the methods in ResourceAdminService

Change-Id: Ib78d2ec441651c3215c422ba4b46d726158de4a9

core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
index 1c6930b..3014951 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
@@ -17,7 +17,6 @@
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -41,7 +40,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -164,23 +162,17 @@
     }
 
     @Override
-    public <T> boolean registerResources(ResourcePath parent, List<T> children) {
-        checkNotNull(parent);
-        checkNotNull(children);
-        checkArgument(!children.isEmpty());
+    public boolean registerResources(List<ResourcePath> resources) {
+        checkNotNull(resources);
 
-        List<ResourcePath> resources = Lists.transform(children, parent::child);
         return store.register(resources);
     }
 
     @Override
-    public <T> boolean unregisterResources(ResourcePath parent, List<T> children) {
-        checkNotNull(parent);
-        checkNotNull(children);
-        checkArgument(!children.isEmpty());
+    public boolean unregisterResources(List<ResourcePath> resources) {
+        checkNotNull(resources);
 
-        List<ResourcePath> resources = Lists.transform(children, parent::child);
-        return store.unregister(resources);
+        return store.register(resources);
     }
 
     private class InternalStoreDelegate implements ResourceStoreDelegate {