홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
e99af222 1 parent 1125848f

Simplify method by removing transient use of Map.Entry 

Change-Id: I045c4e55cf8470f3a89d0f95dae67d1020dde86a
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
......@@ -17,7 +17,6 @@ package org.onosproject.store.resource.impl;
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 @@ class ConsistentContinuousResourceStore {
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());
}
}
......