onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514

Change-Id: I2bb8562c4942b6d6a6d60b663db2e17540477b81
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/framework/src/onos/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java b/framework/src/onos/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
index 1c6930bb..3014951a 100644
--- a/framework/src/onos/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
+++ b/framework/src/onos/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceManager.java
@@ -17,7 +17,6 @@ package org.onosproject.net.newresource.impl;
 
 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.List;
 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 @@ public final class ResourceManager extends AbstractListenerManager<ResourceEvent
     }
 
     @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 {