Bump upstreams for Silicon

[genius.git] / arputil / arputil-impl / src / main / java / org / opendaylight / genius / arputil / internal / ArpUtilImpl.java

diff --git a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
index 788f69f9cd1287866fb5ba88f5b813a1982f04e9..c074ffc7d595e84eab6c2312df151054c9a449c0 100644 (file)
--- a/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
+++ b/arputil/arputil-impl/src/main/java/org/opendaylight/genius/arputil/internal/ArpUtilImpl.java
@@ -9,6 +9,7 @@ package org.opendaylight.genius.arputil.internal;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL;
 
 import com.google.common.util.concurrent.FutureCallback;
@@ -240,7 +241,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
                 srcIpBytes = getIpAddressBytes(interfaceAddress.getIpAddress());
 
                 GetPortFromInterfaceOutput portResult = getPortFromInterface(interfaceName);
-                checkNotNull(portResult);
+                requireNonNull(portResult);
                 dpnId = portResult.getDpid();
                 Long portid = portResult.getPortno().toJava();
                 checkArgument(null != dpnId && !Uint64.ZERO.equals(dpnId),
@@ -346,7 +347,7 @@ public class ArpUtilImpl extends AbstractLifecycle implements OdlArputilService,
         try {
             String interfaceName = input.getInterface();
             GetPortFromInterfaceOutput portResult = getPortFromInterface(interfaceName);
-            checkNotNull(portResult);
+            requireNonNull(portResult);
             dpnId = portResult.getDpid();
             Long portid = portResult.getPortno().toJava();
             NodeConnectorRef ref = MDSALUtil.getNodeConnRef(dpnId, portid.toString());