commit 84515f36cc1fade7806528d4fafa6ee9ed516ee2
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Feb 10 14:42:33 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 11 02:38:20 2016 +0000
tree 9529c14dc9ea6e24093b01047cbf3a68afeca18f
parent 15551272ca0b49ef4b116533678ac6de7f173b68

Use lower bound wildcard for API to be more flexible

Change-Id: Ia6bcec5afb2e872b55bae4bbd9139ad35ce01284

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 878f202..bbc8678 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
@@ -80,7 +80,7 @@
 
     @Override
     public List<ResourceAllocation> allocate(ResourceConsumer consumer,
-                                             List<Resource> resources) {
+                                             List<? extends Resource> resources) {
         checkNotNull(consumer);
         checkNotNull(resources);
 
@@ -171,14 +171,14 @@
     }
 
     @Override
-    public boolean register(List<Resource> resources) {
+    public boolean register(List<? extends Resource> resources) {
         checkNotNull(resources);
 
         return store.register(resources);
     }
 
     @Override
-    public boolean unregister(List<ResourceId> ids) {
+    public boolean unregister(List<? extends ResourceId> ids) {
         checkNotNull(ids);
 
         return store.unregister(ids);

core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
index 4083f5b..b3ad768 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
@@ -44,7 +44,7 @@
     private final Map<Resource, ResourceConsumer> assignment = new HashMap<>();
 
     @Override
-    public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
+    public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) {
         assignment.putAll(
                 resources.stream().collect(Collectors.toMap(x -> x, x -> consumer))
         );