dhcpservice: drop nullToEmpty and reqNonNullOrElse

[netvirt.git] / dhcpservice / impl / src / main / java / org / opendaylight / netvirt / dhcpservice / DhcpAllocationPoolListener.java

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java
index 7ebe1a2c0b4fc1ec3070e157c049b0128f666314..e5c9cdfc3beda679b679b4d26092b87e0cd89ae3 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpAllocationPoolListener.java
@@ -52,7 +52,8 @@ public class DhcpAllocationPoolListener
     protected void add(InstanceIdentifier<AllocationPool> key, AllocationPool dataObjectModification) {
         String networkId = key.firstKeyOf(Network.class).getNetworkId();
         dhcpAllocationPoolManager.createIdAllocationPool(networkId, dataObjectModification);
-        Map<BigInteger, List<String>> elanDpnInterfacesByName = getDpnInterfacesByNetwork(networkId);
+        Map<BigInteger, List<String>> elanDpnInterfacesByName =
+            dhcpAllocationPoolManager.getElanDpnInterfacesByName(dataBroker, networkId);
         for (Entry<BigInteger, List<String>> entry : elanDpnInterfacesByName.entrySet()) {
             BigInteger dpnId = entry.getKey();
             for (String interfaceName : entry.getValue()) {
@@ -79,7 +80,8 @@ public class DhcpAllocationPoolListener
     protected void remove(InstanceIdentifier<AllocationPool> key, AllocationPool dataObjectModification) {
         String networkId = key.firstKeyOf(Network.class).getNetworkId();
         dhcpAllocationPoolManager.releaseIdAllocationPool(networkId, dataObjectModification);
-        Map<BigInteger, List<String>> elanDpnInterfacesByName = getDpnInterfacesByNetwork(networkId);
+        Map<BigInteger, List<String>> elanDpnInterfacesByName =
+            dhcpAllocationPoolManager.getElanDpnInterfacesByName(dataBroker, networkId);
         elanDpnInterfacesByName.values().forEach(interfaceNames -> interfaceNames.forEach(interfaceName -> {
             DhcpAllocationPoolRemoveJob job = new DhcpAllocationPoolRemoveJob(txRunner, interfaceName);
             jobCoordinator.enqueueJob(DhcpServiceUtils.getJobKey(interfaceName), job,
@@ -93,10 +95,4 @@ public class DhcpAllocationPoolListener
         // TODO Auto-generated method stub
 
     }
-
-    private Map<BigInteger, List<String>> getDpnInterfacesByNetwork(String networkId) {
-        Map<BigInteger, List<String>> elanDpnInterfacesByName = dhcpAllocationPoolManager
-                .getElanDpnInterfacesByName(dataBroker, networkId);
-        return elanDpnInterfacesByName;
-    }
 }