vpnmanager: drop nullToEmpty and reqNonNullOrElse

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

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
index 88719ad746f5b999703f3bdd40e8a3bc78f32d68..fdf96dc1ab0e2a1cb679de9b9b7c27057335537c 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
@@ -7,9 +7,7 @@
  */
 package org.opendaylight.netvirt.vpnmanager;
 
-import static java.util.Collections.emptyList;
 import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
-import static org.opendaylight.netvirt.vpnmanager.VpnUtil.requireNonNullElse;
 
 import com.google.common.base.Optional;
 import java.math.BigInteger;
@@ -72,7 +70,7 @@ public class DpnInVpnChangeListener implements OdlL3vpnListener {
                         SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.OPERATIONAL, id);
                 if (vpnOpValue.isPresent()) {
                     VpnInstanceOpDataEntry vpnInstOpData = vpnOpValue.get();
-                    List<VpnToDpnList> vpnToDpnList = requireNonNullElse(vpnInstOpData.getVpnToDpnList(), emptyList());
+                    List<VpnToDpnList> vpnToDpnList = vpnInstOpData.nonnullVpnToDpnList();
                     boolean flushDpnsOnVpn = true;
                     for (VpnToDpnList dpn : vpnToDpnList) {
                         if (dpn.getDpnState() == VpnToDpnList.DpnState.Active) {