mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 19:01:06 +02:00
Code Issues Projects Releases Wiki Activity

More idiomatic code in Stream API

Browse Source 
Change-Id: Ifa5a311cfc1ce43f5eab80be9ddce5fa36e47d92
This commit is contained in:
Sho SHIMIZU 2016-06-08 17:03:48 -07:00 committed by Gerrit Code Review
parent 891162b99f
commit 0e03f59bf5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
class MockResourceService implements ResourceService { class MockResourceService implements ResourceService {
@ -49,7 +50,7 @@ class MockResourceService implements ResourceService {
@Override @Override
public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) { public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) {
assignment.putAll( assignment.putAll(
resources.stream().collect(Collectors.toMap(x -> x, x -> consumer)) resources.stream().collect(Collectors.toMap(Function.identity(), x -> consumer))
); );
return resources.stream() return resources.stream()

3
incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
View File

@ -50,6 +50,7 @@ import org.slf4j.Logger;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.LoggerFactory.getLogger;
@ -209,7 +210,7 @@ public class MeterManager extends AbstractListenerProviderRegistry<MeterEvent, M
//FIXME: FOLLOWING CODE CANNOT BE TESTED UNTIL SOMETHING THAT //FIXME: FOLLOWING CODE CANNOT BE TESTED UNTIL SOMETHING THAT
//FIXME: IMPLEMENTS METERS EXISTS //FIXME: IMPLEMENTS METERS EXISTS
Map<Pair<DeviceId, MeterId>, Meter> storedMeterMap = store.getAllMeters().stream() Map<Pair<DeviceId, MeterId>, Meter> storedMeterMap = store.getAllMeters().stream()
.collect(Collectors.toMap(m -> Pair.of(m.deviceId(), m.id()), m -> m)); .collect(Collectors.toMap(m -> Pair.of(m.deviceId(), m.id()), Function.identity()));
meterEntries.stream() meterEntries.stream()
.filter(m -> storedMeterMap.remove(Pair.of(m.deviceId(), m.id())) != null) .filter(m -> storedMeterMap.remove(Pair.of(m.deviceId(), m.id())) != null)