Use Objects.nonNull() to check if non-null
Change-Id: Ib32f56c1d53e4199592f457d04660228b7f437aa
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
index cd7a1b6..2c6e24c 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/CentecV350Pipeline.java
@@ -74,6 +74,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -188,12 +189,12 @@
switch (fwd.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
index c507e9c..cce9741 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/OFDPA2Pipeline.java
@@ -23,6 +23,7 @@
import java.util.Collections;
import java.util.Deque;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -178,12 +179,12 @@
switch (fwd.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/OVSCorsaPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/OVSCorsaPipeline.java
index 5a8c68c..46a360b 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/OVSCorsaPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/OVSCorsaPipeline.java
@@ -72,6 +72,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -173,12 +174,12 @@
switch (fwd.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
index c8def72..9e24a17 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
@@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.packet.EthType.EtherType;
@@ -104,11 +105,11 @@
rules = processForward(fwd);
switch (fwd.op()) {
case ADD:
- rules.stream().filter(rule -> rule != null)
+ rules.stream().filter(Objects::nonNull)
.forEach(flowOpsBuilder::add);
break;
case REMOVE:
- rules.stream().filter(rule -> rule != null)
+ rules.stream().filter(Objects::nonNull)
.forEach(flowOpsBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
index 7a92b4f..058283d 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
@@ -44,6 +44,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import static org.slf4j.LoggerFactory.getLogger;
@@ -106,12 +107,12 @@
switch (forwardingObjective.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
index 69d2083..6cb5b82 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/PicaPipeline.java
@@ -59,6 +59,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import static org.slf4j.LoggerFactory.getLogger;
@@ -129,12 +130,12 @@
switch (fwd.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java b/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
index d2c3cd9..8e5ce91 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
@@ -54,6 +54,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import static org.slf4j.LoggerFactory.getLogger;
@@ -120,12 +121,12 @@
switch (fwd.op()) {
case ADD:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::add);
break;
case REMOVE:
rules.stream()
- .filter(rule -> rule != null)
+ .filter(Objects::nonNull)
.forEach(flowOpsBuilder::remove);
break;
default:
diff --git a/drivers/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java b/drivers/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
index 5be8a3f..31fa0ef 100644
--- a/drivers/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
+++ b/drivers/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
@@ -82,6 +82,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -193,11 +194,11 @@
rules = processForward(fwd);
switch (fwd.op()) {
case ADD:
- rules.stream().filter(rule -> rule != null)
+ rules.stream().filter(Objects::nonNull)
.forEach(flowBuilder::add);
break;
case REMOVE:
- rules.stream().filter(rule -> rule != null)
+ rules.stream().filter(Objects::nonNull)
.forEach(flowBuilder::remove);
break;
default: