Use Collection#forEach() instead of Stream#forEach() for simplicity
Change-Id: I0a1aea4bdb5d305c50273e6ff749fe71bd2a295a
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
index c07e1ab..f1fcbbc 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
@@ -530,7 +530,7 @@
Iterable<Host> allHosts = hostService.getHosts();
String tunnelName = "vxlan-" + DEFAULT_IP;
if (allHosts != null) {
- Sets.newHashSet(allHosts).stream().forEach(host -> {
+ Sets.newHashSet(allHosts).forEach(host -> {
MacAddress hostMac = host.mac();
String ifaceId = host.annotations().value(IFACEID);
if (ifaceId == null) {
@@ -549,7 +549,7 @@
.getControllerIpOfSwitch(remoteDevice);
if (remoteControllerIp == null) {
log.error("Can't find remote controller of device: {}",
- remoteDeviceId.toString());
+ remoteDeviceId.toString());
return;
}
IpAddress remoteIpAddress = IpAddress
@@ -557,10 +557,10 @@
ports.stream()
.filter(p -> p.name().equalsIgnoreCase(tunnelName))
.forEach(p -> {
- l2ForwardService
- .programTunnelOut(device.id(), segmentationId, p,
- hostMac, type, remoteIpAddress);
- });
+ l2ForwardService
+ .programTunnelOut(device.id(), segmentationId, p,
+ hostMac, type, remoteIpAddress);
+ });
});
}
}
@@ -899,7 +899,7 @@
programRouterInterface(routerInf, operation);
if (interfacesSet.size() == 1) {
routerInfFlagOfTenantRouter.remove(tenantRouter);
- interfacesSet.stream().forEach(r -> {
+ interfacesSet.forEach(r -> {
programRouterInterface(r, operation);
});
}
@@ -961,7 +961,7 @@
TenantRouter tenantRouter = TenantRouter
.tenantRouter(r.tenantId(), r.routerId());
routerInfFlagOfTenantRouter.put(tenantRouter, true);
- interfacesSet.stream().forEach(f -> {
+ interfacesSet.forEach(f -> {
programRouterInterface(f, operation);
});
break;
@@ -977,7 +977,7 @@
SegmentationId l3vni = vtnRscService.getL3vni(tenantRouter);
// Get all the host of the subnet
Map<HostId, Host> hosts = hostsOfSubnet.get(routerInf.subnetId());
- hosts.values().stream().forEach(h -> {
+ hosts.values().forEach(h -> {
applyEastWestL3Flows(h, l3vni, operation);
});
}
@@ -1292,7 +1292,7 @@
.stream().filter(r -> r.tenantId().equals(tenantId))
.filter(r -> r.subnetId().equals(subnetId))
.collect(Collectors.toSet());
- hostInterfaces.stream().forEach(routerInf -> {
+ hostInterfaces.forEach(routerInf -> {
Set<RouterInterface> interfacesSet = Sets.newHashSet(interfaces)
.stream().filter(r -> r.tenantId().equals(tenantId))
.filter(r -> r.routerId().equals(routerInf.routerId()))
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java
index 17471f6..c5697b5 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java
@@ -105,7 +105,7 @@
log.info("No tunnel port in device");
return;
}
- Sets.newHashSet(localTunnelPorts).stream().forEach(tp -> {
+ Sets.newHashSet(localTunnelPorts).forEach(tp -> {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchInPort(tp).add(Criteria.matchTunnelId(Long
.parseLong(segmentationId.toString())))
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
index a91b29e..7c9c30d 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
@@ -83,7 +83,7 @@
log.info("No other host port and tunnel in the device");
return;
}
- Sets.newHashSet(localVmPorts).stream().forEach(lp -> {
+ Sets.newHashSet(localVmPorts).forEach(lp -> {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchInPort(lp).matchEthDst(MacAddress.BROADCAST)
.add(Criteria.matchTunnelId(Long
@@ -124,7 +124,7 @@
log.info("No other host port or tunnel ports in the device");
return;
}
- Sets.newHashSet(localTunnelPorts).stream().forEach(tp -> {
+ Sets.newHashSet(localTunnelPorts).forEach(tp -> {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchInPort(tp)
.add(Criteria.matchTunnelId(Long
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java
index b8715d2..2ee889a 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java
@@ -128,7 +128,7 @@
FixedIp fixedIP) {
if (vPortStore != null) {
List<VirtualPort> vPorts = new ArrayList<>();
- vPortStore.values().stream().forEach(p -> {
+ vPortStore.values().forEach(p -> {
Iterator<FixedIp> fixedIps = p.fixedIps().iterator();
while (fixedIps.hasNext()) {
if (fixedIps.next().equals(fixedIP)) {
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
index b0c5df8..c394e85 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/virtualport/impl/VirtualPortManager.java
@@ -150,7 +150,7 @@
public VirtualPort getPort(FixedIp fixedIP) {
checkNotNull(fixedIP, FIXEDIP_NOT_NULL);
List<VirtualPort> vPorts = new ArrayList<>();
- vPortStore.values().stream().forEach(p -> {
+ vPortStore.values().forEach(p -> {
Iterator<FixedIp> fixedIps = p.fixedIps().iterator();
while (fixedIps.hasNext()) {
if (fixedIps.next().equals(fixedIP)) {
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
index a17ef6c..4d2f064 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
@@ -129,7 +129,7 @@
StringBuffer srcipbuf = new StringBuffer();
StringBuffer dstipbuf = new StringBuffer();
if (flowClassifierList != null) {
- flowClassifierList.stream().forEach(fcid -> {
+ flowClassifierList.forEach(fcid -> {
FlowClassifier fc = fcs.getFlowClassifier(fcid);
String srcip = fc.srcIpPrefix().toString();
String dstip = fc.dstIpPrefix().toString();
@@ -157,11 +157,11 @@
VirtualPortService vps = get(VirtualPortService.class);
List<VirtualPort> vpList = new ArrayList<VirtualPort>();
if (portPairGroupList != null) {
- portPairGroupList.stream().forEach(ppgid -> {
+ portPairGroupList.forEach(ppgid -> {
PortPairGroup ppg = ppgs.getPortPairGroup(ppgid);
List<PortPairId> portPairList = ppg.portPairs();
if (portPairList != null) {
- portPairList.stream().forEach(ppid -> {
+ portPairList.forEach(ppid -> {
PortPair pp = pps.getPortPair(ppid);
VirtualPort vp = vps.getPort(VirtualPortId.portId(pp.ingress()));
vpList.add(vp);