From 0e03f59bf538fdeda3ff3b2acbbf6c72f9e9fb11 Mon Sep 17 00:00:00 2001 From: Sho SHIMIZU Date: Wed, 8 Jun 2016 17:03:48 -0700 Subject: [PATCH] More idiomatic code in Stream API Change-Id: Ifa5a311cfc1ce43f5eab80be9ddce5fa36e47d92 --- .../net/intent/impl/compiler/MockResourceService.java | 3 ++- .../org/onosproject/incubator/net/meter/impl/MeterManager.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 c808d91ec1..18ba79edd1 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 @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; class MockResourceService implements ResourceService { @@ -49,7 +50,7 @@ class MockResourceService implements ResourceService { @Override public List allocate(ResourceConsumer consumer, List resources) { assignment.putAll( - resources.stream().collect(Collectors.toMap(x -> x, x -> consumer)) + resources.stream().collect(Collectors.toMap(Function.identity(), x -> consumer)) ); return resources.stream() diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java index ea4af1a6e4..7f469af586 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java +++ b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java @@ -50,6 +50,7 @@ import org.slf4j.Logger; import java.util.Collection; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; import static org.slf4j.LoggerFactory.getLogger; @@ -209,7 +210,7 @@ public class MeterManager extends AbstractListenerProviderRegistry, 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() .filter(m -> storedMeterMap.remove(Pair.of(m.deviceId(), m.id())) != null)