vpnmanager: drop nullToEmpty and reqNonNullOrElse

[netvirt.git] / vpnmanager / impl / src / main / java / org / opendaylight / netvirt / vpnmanager / intervpnlink / InterVpnLinkCacheImpl.java

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
index 973c7853f70ff1bdfe35aca3497dcdd2b402b206..2fbf2c10224f3ea65be345d038ee24d947d51c3b 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkCacheImpl.java
@@ -8,11 +8,8 @@
 
 package org.opendaylight.netvirt.vpnmanager.intervpnlink;
 
-import static org.opendaylight.netvirt.vpnmanager.VpnUtil.requireNonNullElse;
-
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -71,8 +68,7 @@ public class InterVpnLinkCacheImpl implements InterVpnLinkCache {
             return; // Nothing to be added to cache
         }
         InterVpnLinks interVpnLinks = optIVpnLinksOpData.get();
-        for (InterVpnLink interVpnLink : requireNonNullElse(interVpnLinks.getInterVpnLink(),
-                Collections.<InterVpnLink>emptyList())) {
+        for (InterVpnLink interVpnLink : interVpnLinks.nonnullInterVpnLink()) {
             addInterVpnLinkToCaches(interVpnLink);
         }
 
@@ -86,8 +82,7 @@ public class InterVpnLinkCacheImpl implements InterVpnLinkCache {
             return;
         }
         InterVpnLinkStates interVpnLinkStates = optIVpnLinkStateOpData.get();
-        for (InterVpnLinkState interVpnLinkState : requireNonNullElse(interVpnLinkStates.getInterVpnLinkState(),
-                Collections.<InterVpnLinkState>emptyList())) {
+        for (InterVpnLinkState interVpnLinkState : interVpnLinkStates.nonnullInterVpnLinkState()) {
             addInterVpnLinkStateToCaches(interVpnLinkState);
         }
     }