| commit | a09e1bbdbd58ca16c40e221720514d3b6c5577c4 | [log] [tgz] |
|---|---|---|
| author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Mon Aug 01 14:25:25 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Tue Aug 09 17:44:13 2016 +0000 |
| tree | 7b90d478ce6f4c121fe44ee20ec76caa05bb5837 | |
| parent | c13082f7fbc1333d6e926aee8e571a9f483e604f [diff] |
Use Collection#forEach() instead of Stream#forEach() for simplicity Change-Id: I0a1aea4bdb5d305c50273e6ff749fe71bd2a295a
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 7f469af..dfbbd16 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
@@ -216,7 +216,7 @@ .filter(m -> storedMeterMap.remove(Pair.of(m.deviceId(), m.id())) != null) .forEach(m -> store.updateMeterState(m)); - storedMeterMap.values().stream().forEach(m -> { + storedMeterMap.values().forEach(m -> { if (m.state() == MeterState.PENDING_ADD) { provider().performMeterOperation(m.deviceId(), new MeterOperation(m,
diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java index 955a657..5934939 100644 --- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java +++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceProvider.java
@@ -78,8 +78,7 @@ rpcRegistry.unregister(this); // shutdown all channels - channels.values().stream() - .forEach(ManagedChannel::shutdown); + channels.values().forEach(ManagedChannel::shutdown); // Should we wait for shutdown? How? channels.clear(); log.info("Stopped");
diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java index 099ed20..260a709 100644 --- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java +++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/GrpcRemoteServiceServer.java
@@ -143,8 +143,7 @@ Thread.currentThread().interrupt(); } - registeredProviders.stream() - .forEach(deviceProviderRegistry::unregister); + registeredProviders.forEach(deviceProviderRegistry::unregister); server.shutdown(); // Should we wait for shutdown?