Remove use of Objects.{is,non}Null

As noted in API documentation, these methods are to be used with
method handles. Replace their use with simple null checks.

Change-Id: Ifa02d42d5b38f62ab871be9768fffb1ea86d7463
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java
index 6475380315a00e50c80e15ea8879992522b88dcc..302a64ff5b4d7f46f6b49b24d42a6c879f06a8c9 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/protocol/deserialization/MessageCodeExperimenterKey.java
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.openflowplugin.api.openflow.protocol.deserialization;
 
-import java.util.Objects;
-
 import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterDeserializerKey;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 
 public class MessageCodeExperimenterKey extends MessageCodeKey implements ExperimenterDeserializerKey {
 
-    private Long experimenterId;
+    private final Long experimenterId;
 
     /**
      * Constructor.
@@ -35,7 +33,7 @@ public class MessageCodeExperimenterKey extends MessageCodeKey implements Experi
     @Override
     public int hashCode() {
         final int prime = 31;
-        return prime * super.hashCode() + (Objects.isNull(experimenterId) ? 0 : experimenterId.intValue());
+        return prime * super.hashCode() + (experimenterId == null ? 0 : experimenterId.intValue());
     }
 
     @Override

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
index 7e53159ae12f4644152f8a82f528a12965cab6d2..f8fc0f91e87353a64c830e5c09be3cec34c7020a 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
@@ -738,10 +738,10 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi
                         .flatMap(flowCapableNodeOptional
                             -> com.google.common.base.Optional.fromJavaUtil(flowCapableNodeOptional).asSet().stream())
                         .filter(Objects::nonNull)
-                        .filter(flowCapableNode -> Objects.nonNull(flowCapableNode.getTable()))
+                        .filter(flowCapableNode -> flowCapableNode.getTable() != null)
                         .flatMap(flowCapableNode -> flowCapableNode.getTable().stream())
                         .filter(Objects::nonNull)
-                        .filter(table -> Objects.nonNull(table.getFlow()))
+                        .filter(table -> table.getFlow() != null)
                         .flatMap(table -> table.getFlow().stream())
                         .filter(Objects::nonNull)
                         .count();

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java
index 8940655b556e9972d9dc0396280e0136f5bd2732..f15661e26888f39206c5fe2f4ebeb70a58fc499f 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java
@@ -130,13 +130,13 @@ public class DeviceFlowRegistryImpl implements DeviceFlowRegistry {
             public void onSuccess(Optional<FlowCapableNode> result) {
                 result.map(Collections::singleton).orElse(Collections.emptySet()).stream()
                         .filter(Objects::nonNull)
-                        .filter(flowCapableNode -> Objects.nonNull(flowCapableNode.getTable()))
+                        .filter(flowCapableNode -> flowCapableNode.getTable() != null)
                         .flatMap(flowCapableNode -> flowCapableNode.getTable().stream())
                         .filter(Objects::nonNull)
-                        .filter(table -> Objects.nonNull(table.getFlow()))
+                        .filter(table -> table.getFlow() != null)
                         .flatMap(table -> table.getFlow().stream())
                         .filter(Objects::nonNull)
-                        .filter(flow -> Objects.nonNull(flow.getId()))
+                        .filter(flow -> flow.getId() != null)
                         .forEach(flowConsumer);
 
                 // After we are done with reading from datastore, close the transaction