Fix variable naming

This fixes variable names to comply with checkstyle, by either
changing their name or making them static.

Change-Id: I10242c5088d2d1b41321d98c6b3065e3e10e970b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtilTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtilTest.java
index 957495927b8eeaeb8b201b1c22efd34400f73dd9..89bceea88c289354cb2f3f2f92ad7af43a5b7e87 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtilTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerUtilTest.java
@@ -31,9 +31,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 
 public class BgpPeerUtilTest {
 
-    private final TablesKey IPV4_TABLE_KEY = new TablesKey(Ipv4AddressFamily.class,
+    private static final TablesKey IPV4_TABLE_KEY = new TablesKey(Ipv4AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
-    private final TablesKey IPV6_TABLE_KEY = new TablesKey(Ipv6AddressFamily.class,
+    private static final TablesKey IPV6_TABLE_KEY = new TablesKey(Ipv6AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
 
     @Test

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
index 598518f5de65dad64652ce2c08d713e0ac541eb2..008fccdfb2cf4f41f57355557aff80b6f130a52e 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/GracefulRestartTest.java
@@ -81,9 +81,9 @@ public class GracefulRestartTest extends AbstractAddPathTest {
     private final BgpParameters parameters = createParameter(false, true, Collections.singletonMap(TABLES_KEY, true));
     private static final int DEFERRAL_TIMER = 5;
     private static final RibId RIBID = new RibId("test-rib");
-    private final Ipv4Prefix PREFIX2 = new Ipv4Prefix("2.2.2.2/32");
-    private final Ipv6Prefix PREFIX3 = new Ipv6Prefix("dead:beef::/64");
-    private final Ipv6Address IPV6_NEXT_HOP = new Ipv6Address("dead:beef::1");
+    private static final Ipv4Prefix PREFIX2 = new Ipv4Prefix("2.2.2.2/32");
+    private static final Ipv6Prefix PREFIX3 = new Ipv6Prefix("dead:beef::/64");
+    private static final Ipv6Address IPV6_NEXT_HOP = new Ipv6Address("dead:beef::1");
     private static final TablesKey IPV6_TABLES_KEY = new TablesKey(Ipv6AddressFamily.class,
             UnicastSubsequentAddressFamily.class);
 
@@ -344,16 +344,16 @@ public class GracefulRestartTest extends AbstractAddPathTest {
         org.opendaylight.protocol.util.CheckUtil.checkReceivedMessages(this.listener, 6);
         // verify sending of Ipv4 update with route, Ipv4 EOT and Ipv6 EOT; order can vary based on ODTC order
         final List<Notification> subList = this.listener.getListMsg().subList(3, 6);
-        int EOTCount = 0;
+        int eotCount = 0;
         int routeUpdateCount = 0;
         for (Notification message : subList) {
             if (BgpPeerUtil.isEndOfRib((Update) message)) {
-                EOTCount++;
+                eotCount++;
             } else {
                 routeUpdateCount++;
             }
         }
-        assertEquals(2, EOTCount);
+        assertEquals(2, eotCount);
         assertEquals(1, routeUpdateCount);
     }