commit 94b7ff4f7f822cde591975dec57913efe8fec860
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed May 06 17:51:49 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 07 17:11:42 2015 +0000
tree f367cabd2feea385219967ddbd38d4009927915b
parent 100e3b809dff63502a96feae6dd2ff0b93a10033

Rename Lambda in org.onosproject.net.resource to LambdaResource

To avoid naming conflict with Lambda in org.onosproject.net

Change-Id: Ic8a670e7e2fb022f44f5a83cf4805f3ce0f29694

core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
index d60dee2..ff120fe 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
@@ -28,7 +28,7 @@
 import org.onosproject.net.resource.BandwidthResourceAllocation;
 import org.onosproject.net.resource.BandwidthResourceRequest;
 import org.onosproject.net.resource.DefaultLinkResourceAllocations;
-import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LambdaResource;
 import org.onosproject.net.resource.LambdaResourceAllocation;
 import org.onosproject.net.resource.LambdaResourceRequest;
 import org.onosproject.net.resource.LinkResourceAllocations;
@@ -92,13 +92,13 @@
      * @param link the link
      * @return available lambdas on specified link
      */
-    private Set<Lambda> getAvailableLambdas(Link link) {
+    private Set<LambdaResource> getAvailableLambdas(Link link) {
         checkNotNull(link);
         Set<ResourceAllocation> resAllocs = store.getFreeResources(link);
         if (resAllocs == null) {
             return Collections.emptySet();
         }
-        Set<Lambda> lambdas = new HashSet<>();
+        Set<LambdaResource> lambdas = new HashSet<>();
         for (ResourceAllocation res : resAllocs) {
             if (res.type() == ResourceType.LAMBDA) {
                 lambdas.add(((LambdaResourceAllocation) res).lambda());
@@ -114,11 +114,11 @@
      * @param links the links
      * @return available lambdas on specified links
      */
-    private Iterable<Lambda> getAvailableLambdas(Iterable<Link> links) {
+    private Iterable<LambdaResource> getAvailableLambdas(Iterable<Link> links) {
         checkNotNull(links);
         Iterator<Link> i = links.iterator();
         checkArgument(i.hasNext());
-        Set<Lambda> lambdas = new HashSet<>(getAvailableLambdas(i.next()));
+        Set<LambdaResource> lambdas = new HashSet<>(getAvailableLambdas(i.next()));
         while (i.hasNext()) {
             lambdas.retainAll(getAvailableLambdas(i.next()));
         }
@@ -162,7 +162,7 @@
                 allocs.add(new BandwidthResourceAllocation(br.bandwidth()));
                 break;
             case LAMBDA:
-                Iterator<Lambda> lambdaIterator =
+                Iterator<LambdaResource> lambdaIterator =
                         getAvailableLambdas(req.links()).iterator();
                 if (lambdaIterator.hasNext()) {
                     allocs.add(new LambdaResourceAllocation(lambdaIterator.next()));