commit e99af22217b19409499fbd5daec7bab9eb075a9a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu May 12 11:47:48 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 13 04:01:03 2016 +0000
tree 4cc0ba3e1328befe0fb21e15df1f4e968d524a82
parent 1125848f9562f4ba3940e58fa4a522ee6bf11155

Simplify method by removing transient use of Map.Entry

Change-Id: I045c4e55cf8470f3a89d0f95dae67d1020dde86a

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
index 6ab6235..00ad671 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceStore.java
@@ -17,7 +17,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
 import org.onlab.util.GuavaCollectors;
 import org.onlab.util.Tools;
 import org.onosproject.net.resource.ContinuousResource;
@@ -135,9 +134,10 @@
 
     Stream<ContinuousResource> getResources(ResourceConsumer consumer) {
         return consumers.values().stream()
-                .flatMap(x -> x.value().allocations().stream()
-                        .map(y -> Maps.immutableEntry(x.value().original(), y)))
-                .filter(x -> x.getValue().consumer().equals(consumer))
-                .map(x -> (ContinuousResource) (x.getValue().resource()));
+                .flatMap(x -> x.value().allocations().stream())
+                .filter(x -> x.consumer().equals(consumer))
+                // this cast is safe because this class stores
+                // continuous resource allocations only
+                .map(x -> (ContinuousResource) x.resource());
     }
 }