commit 851e57f3d3c7699e28d8d74ab3aa05fab480044d
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Feb 23 19:38:40 2017 +0900
committer Hyunsun Moon <hyunsun.moon@gmail.com> Thu Feb 23 20:12:53 2017 +0900
tree 185583f26ff50884b9abc3f3503b37850f6cb7bf
parent 3af3448af931244ee46b6f52484b54e8215fa3b0

Replaced Stream#forEach() with Collection#forEach()

And also replaced comparators to Compatator#comparing

Change-Id: I3759a872ee65ad6a4c660aa74ab893b67891c50f

src/main/java/org/opencord/cordvtn/impl/handler/DependencyHandler.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/DependencyHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/DependencyHandler.java
index 684bc6e..772e1bc 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/DependencyHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/DependencyHandler.java
@@ -234,20 +234,18 @@
     private boolean isProviderInUse(NetworkId providerId) {
         return snetService.serviceNetworks().stream()
                 .flatMap(net -> net.providers().keySet().stream())
-                .filter(provider -> Objects.equals(provider, providerId))
-                .findAny().isPresent();
+                .anyMatch(provider -> Objects.equals(provider, providerId));
     }
 
     private void removeGroup(NetworkId netId) {
         GroupKey groupKey = getGroupKey(netId);
-        nodeManager.completeNodes().stream()
-                .forEach(node -> {
-                    DeviceId deviceId = node.integrationBridgeId();
-                    Group group = groupService.getGroup(deviceId, groupKey);
-                    if (group != null) {
-                        groupService.removeGroup(deviceId, groupKey, appId);
-                    }
-                });
+        nodeManager.completeNodes().forEach(node -> {
+            DeviceId deviceId = node.integrationBridgeId();
+            Group group = groupService.getGroup(deviceId, groupKey);
+            if (group != null) {
+                groupService.removeGroup(deviceId, groupKey, appId);
+            }
+        });
         log.debug("Removed group for network {}", netId);
     }
 
@@ -287,7 +285,7 @@
         Map<DeviceId, GroupId> providerGroups = Maps.newHashMap();
         Map<DeviceId, Set<PortNumber>> subscriberPorts = Maps.newHashMap();
 
-        nodeManager.completeNodes().stream().forEach(node -> {
+        nodeManager.completeNodes().forEach(node -> {
             DeviceId deviceId = node.integrationBridgeId();
             GroupId groupId = getProviderGroup(provider, deviceId);
             providerGroups.put(deviceId, groupId);
@@ -357,7 +355,7 @@
                 .transition(TABLE_DST)
                 .build();
 
-        nodeManager.completeNodes().stream().forEach(node -> {
+        nodeManager.completeNodes().forEach(node -> {
             DeviceId deviceId = node.integrationBridgeId();
             FlowRule flowRuleDirect = DefaultFlowRule.builder()
                     .fromApp(appId)
@@ -383,7 +381,7 @@
             if (groupId == null) {
                 continue;
             }
-            ports.stream().forEach(port -> {
+            ports.forEach(port -> {
                 TrafficSelector selector = DefaultTrafficSelector.builder()
                         .matchInPort(port)
                         .build();
@@ -410,7 +408,7 @@
     private GroupBuckets getProviderGroupBuckets(DeviceId deviceId, long tunnelId,
                                                  Set<Instance> instances) {
         List<GroupBucket> buckets = Lists.newArrayList();
-        instances.stream().forEach(instance -> {
+        instances.forEach(instance -> {
             Ip4Address tunnelIp = nodeManager.dataIp(instance.deviceId()).getIp4Address();
 
             if (deviceId.equals(instance.deviceId())) {