bgpmanager BgpUtil code clean-up: Make private what can, and rm unused

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

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
index 30bd89a6274f5b61c11a7c70e56f6e02d21b1835..0658a51d213fa3e031fccbc59ccb96f68325e313 100755 (executable)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java
@@ -9,7 +9,6 @@ package org.opendaylight.netvirt.bgpmanager;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -49,20 +48,25 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class BgpUtil {
+
     private static final Logger LOG = LoggerFactory.getLogger(BgpUtil.class);
+
     private static DataBroker dataBroker;
+
     public static final int PERIODICITY = 500;
     public static final int BATCH_SIZE = 1000;
+
     public static Integer batchSize;
     public static Integer batchInterval;
 
     private static BlockingQueue<ActionableResource> bgpResourcesBufferQ = new LinkedBlockingQueue<>();
 
-    /** get a translation from prefix ipv6 to afi<br>.
-    * "ffff::1/128" sets afi as 2 because is an IPv6 value
-    * @param argPrefix ip address as ipv4 or ipv6
-    * @return afi 1 for AFI_IP 2 for AFI_IPV6
-    */
+    /**
+     * get a translation from prefix ipv6 to afi<br>.
+     * "ffff::1/128" sets afi as 2 because is an IPv6 value
+     * @param argPrefix ip address as ipv4 or ipv6
+     * @return afi 1 for AFI_IP 2 for AFI_IPV6
+     */
     public static int getAFItranslatedfromPrefix(String argPrefix) {
         int retValue = af_afi.AFI_IP.getValue();//default afiValue is 1 (= ipv4)
         String prefixOnly;
@@ -177,7 +181,7 @@ public class BgpUtil {
                 .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(rd)).build();
     }
 
-    static String getElanNamefromRd(DataBroker broker, String rd)  {
+    private static String getElanNamefromRd(DataBroker broker, String rd)  {
         InstanceIdentifier<EvpnRdToNetwork> id = getEvpnRdToNetworkIdentifier(rd);
         Optional<EvpnRdToNetwork> evpnRdToNetworkOpData = MDSALUtil.read(broker,
                 LogicalDatastoreType.CONFIGURATION, id);
@@ -187,7 +191,7 @@ public class BgpUtil {
         return null;
     }
 
-    public static InstanceIdentifier<EvpnRdToNetwork> getEvpnRdToNetworkIdentifier(String rd) {
+    private static InstanceIdentifier<EvpnRdToNetwork> getEvpnRdToNetworkIdentifier(String rd) {
         return InstanceIdentifier.builder(EvpnRdToNetworks.class)
                 .child(EvpnRdToNetwork.class, new EvpnRdToNetworkKey(rd)).build();
     }
@@ -226,7 +230,7 @@ public class BgpUtil {
         BgpUtil.delete(dataBroker, LogicalDatastoreType.CONFIGURATION, externalTepsId);
     }
 
-    public static InstanceIdentifier<ExternalTeps> getExternalTepsIdentifier(String elanInstanceName, String tepIp) {
+    private static InstanceIdentifier<ExternalTeps> getExternalTepsIdentifier(String elanInstanceName, String tepIp) {
         IpAddress tepAdress = tepIp == null ? null : new IpAddress(tepIp.toCharArray());
         return InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class,
                 new ElanInstanceKey(elanInstanceName)).child(ExternalTeps.class,
@@ -238,4 +242,3 @@ public class BgpUtil {
         return vpnInstanceOpData != null ? vpnInstanceOpData.getVpnInstanceName() : null;
     }
 }
-