commit 83258ae50443aa41ee660a53d0d920329397427c
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Jan 29 17:39:07 2016 -0800
committer Ray Milkey <ray@onlab.us> Sat Jan 30 16:33:41 2016 +0000
tree a99bf87fc56e32e48a135aa18b1cccc094c06e75
parent dc4394c6d3b9e9807fe715d4086a504cc98e93a0

Use more concrete type for return value

Same resources are not allowed for a parent and Set is more suitable than
Collection

Change-Id: Ib45179819d81376678bf8949864b12b5bd721085

core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java

diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
index e0c7fd7..6dcd7ef 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -162,7 +163,7 @@
      * @return available resources under the specified resource
      */
     // TODO: need to change the argument type to ResourceId or ResourceId.Discrete
-    Collection<Resource> getAvailableResources(Resource parent);
+    Set<Resource> getAvailableResources(Resource parent);
 
     /**
      * Returns resources registered under the specified resource.
@@ -171,7 +172,7 @@
      * @return registered resources under the specified resource
      */
     // TODO: need to change the argument type to ResourceId or ResourceId.Discrete
-    Collection<Resource> getRegisteredResources(Resource parent);
+    Set<Resource> getRegisteredResources(Resource parent);
 
 
     /**

core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java

diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
index 321c861..cca8ed0 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
@@ -20,6 +20,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Service for storing resource and consumer information.
@@ -104,13 +105,13 @@
     Collection<Resource> getResources(ResourceConsumer consumer);
 
     /**
-     * Returns a collection of the child resources of the specified parent.
+     * Returns a set of the child resources of the specified parent.
      *
      * @param parent parent of the resource to be returned
-     * @return a collection of the child resources of the specified resource
+     * @return a set of the child resources of the specified resource
      */
     // TODO: need to change the argument type to ResourceId or ResourceId.Discrete
-    Collection<Resource> getChildResources(Resource parent);
+    Set<Resource> getChildResources(Resource parent);
 
     /**
      * Returns a collection of the resources which are children of the specified parent and