Cleanup

- Private constructor for utility class
- Replace .size() by .empty()
- Change method names to comply with Java style

Change-Id: I92038ae360f3d1f614546ef4806cad8fd171e546
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
index 15b1e1b9f4a5f6f322f1fe422b15b62e40f9c753..bf24f8fb7bb72429073026419d0f9691f999de77 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
@@ -13,7 +13,6 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -42,13 +41,14 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmInternalTunnelAddWorker {
+public final class ItmInternalTunnelAddWorker {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmInternalTunnelAddWorker.class) ;
     private static Boolean monitorEnabled;
     private static Integer monitorInterval;
     private static ItmConfig itmCfg;
     private static Class<? extends TunnelMonitoringTypeBase> monitorProtocol;
+
     private static final FutureCallback<Void> DEFAULT_CALLBACK = new FutureCallback<Void>() {
         @Override
         public void onSuccess(Void result) {
@@ -61,7 +61,10 @@ public class ItmInternalTunnelAddWorker {
         }
     };
 
-    public static List<ListenableFuture<Void>> build_all_tunnels(DataBroker dataBroker,
+    private ItmInternalTunnelAddWorker() {
+    }
+
+    public static List<ListenableFuture<Void>> buildAllTunnels(DataBroker dataBroker,
                                                                  IdManagerService idManagerService,
                                                                  IMdsalApiManager mdsalManager,
                                                                  List<DPNTEPsInfo> cfgdDpnList,
@@ -81,7 +84,7 @@ public class ItmInternalTunnelAddWorker {
 
         for (DPNTEPsInfo dpn : cfgdDpnList) {
             //#####if dpn is not in meshedDpnList
-            build_tunnel_from(dpn, meshedDpnList, dataBroker, idManagerService, mdsalManager, transaction, futures);
+            buildTunnelFrom(dpn, meshedDpnList, dataBroker, idManagerService, mdsalManager, transaction, futures);
             if (null == meshedDpnList) {
                 meshedDpnList = new ArrayList<>();
             }
@@ -103,11 +106,11 @@ public class ItmInternalTunnelAddWorker {
         ITMBatchingUtils.update(dep, tnlBuilder, ITMBatchingUtils.EntityType.DEFAULT_CONFIG);
     }
 
-    private static void build_tunnel_from(DPNTEPsInfo srcDpn,List<DPNTEPsInfo> meshedDpnList, DataBroker dataBroker,
+    private static void buildTunnelFrom(DPNTEPsInfo srcDpn,List<DPNTEPsInfo> meshedDpnList, DataBroker dataBroker,
                                           IdManagerService idManagerService, IMdsalApiManager mdsalManager,
                                           WriteTransaction transaction, List<ListenableFuture<Void>> futures) {
         LOG.trace("Building tunnels from DPN {} " , srcDpn);
-        if (null == meshedDpnList || 0 == meshedDpnList.size()) {
+        if (null == meshedDpnList || meshedDpnList.isEmpty()) {
             LOG.debug("No DPN in the mesh ");
             return ;
         }

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java
index 06a11394630547db7738f282a119eee50abd69aa..6563f8cfd17a1dc13ba5bba05da8e5e795ae0854 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java
@@ -52,7 +52,7 @@ public class ItmTepAddWorker implements Callable<List<ListenableFuture<Void>>> {
         this.meshedDpnList = ItmUtils.getTunnelMeshInfo(dataBroker) ;
         LOG.debug("Invoking Internal Tunnel build method with Configured DpnList {} ; Meshed DpnList {} ",
                 cfgdDpnList, meshedDpnList);
-        futures.addAll(ItmInternalTunnelAddWorker.build_all_tunnels(dataBroker, idManagerService, mdsalManager,
+        futures.addAll(ItmInternalTunnelAddWorker.buildAllTunnels(dataBroker, idManagerService, mdsalManager,
                 cfgdDpnList, meshedDpnList, itmConfig)) ;
         // IF EXTERNAL TUNNELS NEEDS TO BE BUILT, DO IT HERE. IT COULD BE TO DC GATEWAY OR TOR SWITCH
         List<DcGatewayIp> dcGatewayIpList = ItmUtils.getDcGatewayIpList(dataBroker);

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelAddTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelAddTest.java
index ba37fbfee5cbc0d4259dc690d5e352bf8708434a..fa98950f5ee99b0607773a521e8d622bde271450 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelAddTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmInternalTunnelAddTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ * Copyright (c) 2016, 2017 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -152,12 +152,9 @@ public class ItmInternalTunnelAddTest {
     @Mock ITMBatchingUtils batchingUtils;
     @Mock ItmConfig itmConfig;
 
-    ItmInternalTunnelAddWorker addWorker = new ItmInternalTunnelAddWorker();
-
     Optional<TunnelMonitorParams> tunnelMonitorParamsOptional;
     Optional<TunnelMonitorInterval> tunnelMonitorIntervalOptional;
 
-
     @Before
     public void setUp() {
         PowerMockito.mockStatic(ITMBatchingUtils.class);
@@ -257,8 +254,8 @@ public class ItmInternalTunnelAddTest {
         internalTunnel1 = ItmUtils.buildInternalTunnel(dpId1,dpId2,tunnelType1,trunkInterfaceName1);
         internalTunnel2 = ItmUtils.buildInternalTunnel(dpId2,dpId1,tunnelType1,trunkInterfaceName2);
 
-        addWorker.build_all_tunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListVxlan, meshDpnListVxlan,
-                itmConfig);
+        ItmInternalTunnelAddWorker.buildAllTunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListVxlan,
+                meshDpnListVxlan, itmConfig);
 
         //Add some verifications
         verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION, internalTunnelIdentifierVxlan1,
@@ -290,8 +287,8 @@ public class ItmInternalTunnelAddTest {
         internalTunnel1 = ItmUtils.buildInternalTunnel(dpId1,dpId2,tunnelType2,trunkInterfaceName1);
         internalTunnel2 = ItmUtils.buildInternalTunnel(dpId2,dpId1,tunnelType2,trunkInterfaceName2);
 
-        addWorker.build_all_tunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListGre, meshDpnListGre,
-                itmConfig);
+        ItmInternalTunnelAddWorker.buildAllTunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListGre,
+                meshDpnListGre, itmConfig);
 
         verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION, internalTunnelIdentifierGre1,
                 internalTunnel1,true);
@@ -323,8 +320,8 @@ public class ItmInternalTunnelAddTest {
         internalTunnel1 = ItmUtils.buildInternalTunnel(dpId1,dpId2,tunnelType1,trunkInterfaceName1);
         internalTunnel2 = ItmUtils.buildInternalTunnel(dpId2,dpId1,tunnelType2,trunkInterfaceName2);
 
-        addWorker.build_all_tunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListVxlan, meshDpnListGre,
-                itmConfig);
+        ItmInternalTunnelAddWorker.buildAllTunnels(dataBroker, idManagerService, mdsalApiManager, cfgdDpnListVxlan,
+                meshDpnListGre, itmConfig);
 
         verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION, internalTunnelIdentifierVxlan1,
                 internalTunnel1,true);