Fix odlparent 3 Checkstyle issues

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / netvirt / elan / utils / ElanUtils.java

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
index 40e107ce69396ed597dbc4f1157ed087596d5736..030d08d0a00de5220ea3d324ae430c33f61ce4a4 100755 (executable)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
@@ -651,7 +651,7 @@ public class ElanUtils {
             setupKnownSmacFlow(elanInfo, interfaceInfo, macTimeout, macAddress, mdsalManager,
                 writeFlowGroupTx);
             setupOrigDmacFlows(elanInfo, interfaceInfo, macAddress, configureRemoteFlows, mdsalManager,
-                broker, writeFlowGroupTx);
+                    writeFlowGroupTx);
         }
     }
 
@@ -833,7 +833,7 @@ public class ElanUtils {
 
     private void setupOrigDmacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress,
                                     boolean configureRemoteFlows, IMdsalApiManager mdsalApiManager,
-                                    DataBroker broker, WriteTransaction writeFlowGroupTx)
+                                    WriteTransaction writeFlowGroupTx)
                                     throws ElanException {
         BigInteger dpId = interfaceInfo.getDpId();
         String ifName = interfaceInfo.getInterfaceName();
@@ -1536,7 +1536,7 @@ public class ElanUtils {
      * Add Mac Address to ElanInterfaceForwardingEntries and ElanForwardingTables
      * Install SMAC and DMAC flows.
      */
-    public void addMacEntryToDsAndSetupFlows(IInterfaceManager interfaceManager, String interfaceName,
+    public void addMacEntryToDsAndSetupFlows(String interfaceName,
             String macAddress, String elanName, WriteTransaction interfaceTx, WriteTransaction flowTx, int macTimeOut)
             throws ElanException {
         LOG.trace("Adding mac address {} and interface name {} to ElanInterfaceForwardingEntries and "
@@ -1560,7 +1560,7 @@ public class ElanUtils {
      * Remove Mac Address from ElanInterfaceForwardingEntries and ElanForwardingTables
      * Remove SMAC and DMAC flows.
      */
-    public void deleteMacEntryFromDsAndRemoveFlows(IInterfaceManager interfaceManager, String interfaceName,
+    public void deleteMacEntryFromDsAndRemoveFlows(String interfaceName,
             String macAddress, String elanName, WriteTransaction interfaceTx, WriteTransaction flowTx) {
         LOG.trace("Deleting mac address {} and interface name {} from ElanInterfaceForwardingEntries "
                 + "and ElanForwardingTables DS", macAddress, interfaceName);
@@ -1727,7 +1727,7 @@ public class ElanUtils {
         return macTable.getMacEntry();
     }
 
-    public boolean isTunnelInLogicalGroup(String interfaceName, DataBroker broker) {
+    public boolean isTunnelInLogicalGroup(String interfaceName) {
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
             .ietf.interfaces.rev140508.interfaces.Interface configIface =
             interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName);