Fix (minor) usage of MacNotFoundException

Change-Id: I0f25d30bca67d97145be3e00b719d9d71f5c8661
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java b/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java
index c754ead45995e8f9be7fea8e5db47769af194e75..1bf418905f93f4ba6895ebbc0d5a62c7aa80cc3f 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java
+++ b/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elanmanager/exceptions/MacNotFoundException.java
@@ -8,14 +8,17 @@
 
 package org.opendaylight.netvirt.elanmanager.exceptions;
 
+/**
+ * Exception thrown when a MAC address was not found.
+ */
 public class MacNotFoundException extends Exception {
 
     private static final long serialVersionUID = 1L;
 
-    public MacNotFoundException() {
-
-    }
-
+    /**
+     * Constructor.
+     * @param message the eror message text, which must include the MAC address that was not found
+     */
     public MacNotFoundException(String message) {
         super(message);
     }

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
index fd1f90cff8730c93b0e5b87bde91bd080993e68d..0e8c6248bc7c53760acb380755350c83e3f4823a 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
@@ -20,19 +20,13 @@ import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.function.BiFunction;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.interfacemanager.exceptions.InterfaceAlreadyExistsException;
 import org.opendaylight.genius.interfacemanager.globals.IfmConstants;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
-import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
-import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils;
-import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
-import org.opendaylight.netvirt.elan.l2gw.utils.L2GatewayConnectionUtils;
 import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
 import org.opendaylight.netvirt.elan.utils.ElanConstants;
-import org.opendaylight.netvirt.elan.utils.ElanForwardingEntriesHandler;
 import org.opendaylight.netvirt.elan.utils.ElanUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.netvirt.elanmanager.exceptions.MacNotFoundException;
@@ -44,8 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstanceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface;
@@ -121,7 +113,7 @@ public class ElanServiceProvider implements IElanService {
                 .setLow(ElanConstants.ELAN_ID_LOW_VALUE).setHigh(ElanConstants.ELAN_ID_HIGH_VALUE).build();
         try {
             Future<RpcResult<Void>> result = idManager.createIdPool(createPool);
-            if ((result != null) && (result.get().isSuccessful())) {
+            if (result != null && result.get().isSuccessful()) {
                 logger.debug("ELAN Id Pool is created successfully");
             }
         } catch (Exception e) {
@@ -342,7 +334,7 @@ public class ElanServiceProvider implements IElanService {
             MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION,
                     ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName), elanInterface);
         } else {
-            throw new MacNotFoundException("Mac Not Found Exception");
+            throw new MacNotFoundException("deleteStaticMacAddress did not find MAC: " + macAddress);
         }
     }
 
@@ -461,51 +453,33 @@ public class ElanServiceProvider implements IElanService {
 
     @Override
     public void createExternalElanNetworks(Node node) {
-        handleExternalElanNetworks(node, new BiFunction<ElanInstance, String, Void>() {
-
-            @Override
-            public Void apply(ElanInstance elanInstance, String interfaceName) {
-                createExternalElanNetwork(elanInstance, interfaceName);
-                return null;
-            }
+        handleExternalElanNetworks(node, (elanInstance, interfaceName) -> {
+            createExternalElanNetwork(elanInstance, interfaceName);
+            return null;
         });
     }
 
     @Override
     public void createExternalElanNetwork(ElanInstance elanInstance) {
-        handleExternalElanNetwork(elanInstance, new BiFunction<ElanInstance, String, Void>() {
-
-            @Override
-            public Void apply(ElanInstance elanInstance, String interfaceName) {
-                createExternalElanNetwork(elanInstance, interfaceName);
-                return null;
-            }
-
+        handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+            createExternalElanNetwork(elanInstance1, interfaceName);
+            return null;
         });
     }
 
     @Override
     public void deleteExternalElanNetworks(Node node) {
-        handleExternalElanNetworks(node, new BiFunction<ElanInstance, String, Void>() {
-
-            @Override
-            public Void apply(ElanInstance elanInstance, String interfaceName) {
-                deleteExternalElanNetwork(elanInstance, interfaceName);
-                return null;
-            }
+        handleExternalElanNetworks(node, (elanInstance, interfaceName) -> {
+            deleteExternalElanNetwork(elanInstance, interfaceName);
+            return null;
         });
     }
 
     @Override
     public void deleteExternalElanNetwork(ElanInstance elanInstance) {
-        handleExternalElanNetwork(elanInstance, new BiFunction<ElanInstance, String, Void>() {
-
-            @Override
-            public Void apply(ElanInstance elanInstance, String interfaceName) {
-                deleteExternalElanNetwork(elanInstance, interfaceName);
-                return null;
-            }
-
+        handleExternalElanNetwork(elanInstance, (elanInstance1, interfaceName) -> {
+            deleteExternalElanNetwork(elanInstance1, interfaceName);
+            return null;
         });
     }