Reorder the modifiers to comply with the Java Language Specification

Change-Id: I0017515575a08271a3a1d6aeeedae3b6a072a9fb
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/OpaqueUtilTest.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/OpaqueUtilTest.java
index 3aee20abb34f272189c3326ed2d6ce134398340b..be712ff80720302ac94314e6ee89f5229cf6b4ce 100644 (file)
--- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/OpaqueUtilTest.java
+++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/OpaqueUtilTest.java
@@ -26,12 +26,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tun
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev160812.pmsi.tunnel.pmsi.tunnel.tunnel.identifier.mldp.p2mp.lsp.mldp.p2mp.lsp.OpaqueValueBuilder;
 
 public class OpaqueUtilTest {
-    private final static byte[] OPAQUE_WRONG= {
+    private static final byte[] OPAQUE_WRONG= {
         (byte) 0xfc, (byte) 0x00, (byte) 0x03, // Opaque Type - Length
         (byte) 0xb5, (byte) 0xeb, (byte) 0x2d,  //Value
     };
 
-    private final static byte[] OPAQUE_EXPECTED = {
+    private static final byte[] OPAQUE_EXPECTED = {
         (byte) 0x01, (byte) 0x00, (byte) 0x0e, // Opaque Type - Length
         (byte) 0x07, (byte) 0x00, (byte) 0x0B, //Value
         (byte) 0x00, (byte) 0x00, (byte) 0x01,
@@ -39,7 +39,7 @@ public class OpaqueUtilTest {
         (byte) 0x01, (byte) 0x00, (byte) 0x00,
         (byte) 0x00, (byte) 0x00
     };
-    private final static byte[] OPAQUE_EXT_EXPECTED = {
+    private static final byte[] OPAQUE_EXT_EXPECTED = {
         (byte) 0xff, (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0x10, // Opaque Type -Ext Type - Length
         (byte) 0x07, (byte) 0x00, (byte) 0x0B, //Value
         (byte) 0x00, (byte) 0x00, (byte) 0x01,
@@ -48,7 +48,7 @@ public class OpaqueUtilTest {
         (byte) 0x00, (byte) 0x00, (byte) 0x01,
         (byte) 0x02
     };
-    private final static byte[] OPAQUE_VALUES_EXPECTED = {
+    private static final byte[] OPAQUE_VALUES_EXPECTED = {
         (byte) 0x01, (byte) 0x00, (byte) 0x0e, // Opaque Type - Length
         (byte) 0x07, (byte) 0x00, (byte) 0x0B, //Value
         (byte) 0x00, (byte) 0x00, (byte) 0x01,
@@ -66,10 +66,10 @@ public class OpaqueUtilTest {
 
     static final HexString OPAQUE_TEST = new HexString("07:00:0b:00:00:01:00:00:00:01:00:00:00:00");
     static final HexString OPAQUE_TEST2 = new HexString ("07:00:0b:00:00:01:00:00:00:01:00:00:00:00:01:02");
-    private final static Opaque OPAQUE = new OpaqueValueBuilder().setOpaque(OPAQUE_TEST).setOpaqueType(OpaqueUtil.GENERIC_LSP_IDENTIFIER).build();
-    private final static Opaque OPAQUE_EXTENDED = new OpaqueValueBuilder().setOpaque(OPAQUE_TEST2).setOpaqueType((short) 2)
+    private static final Opaque OPAQUE = new OpaqueValueBuilder().setOpaque(OPAQUE_TEST).setOpaqueType(OpaqueUtil.GENERIC_LSP_IDENTIFIER).build();
+    private static final Opaque OPAQUE_EXTENDED = new OpaqueValueBuilder().setOpaque(OPAQUE_TEST2).setOpaqueType((short) 2)
         .setOpaqueType(OpaqueUtil.EXTENDED_TYPE).setOpaqueExtendedType(4).build();
-    private final static List<OpaqueValue> OPAQUE_VALUE_LIST = Arrays.asList((OpaqueValue) OPAQUE, (OpaqueValue) OPAQUE_EXTENDED);
+    private static final List<OpaqueValue> OPAQUE_VALUE_LIST = Arrays.asList((OpaqueValue) OPAQUE, (OpaqueValue) OPAQUE_EXTENDED);
 
     @Test
     public void serializeOpaque() throws Exception {

diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
index b7c8b563adf5794ecc5f7e362ac8831b3e78ac23..c7a2d7f26bccb48f85cdf85ca8bce58aed98d53d 100644 (file)
--- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
+++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java
@@ -28,14 +28,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tun
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public class PAddressPMulticastGroupUtilTest {
-    private final static byte[] IPV4_ADDRESS_EXPECTED = {
+    private static final byte[] IPV4_ADDRESS_EXPECTED = {
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01
     };
-    private final static byte[] IPV6_ADDRESS_EXPECTED = {
+    private static final byte[] IPV6_ADDRESS_EXPECTED = {
         0x20, (byte) 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
     };
 
-    private final static byte[] SENDER_P_MULTICAST_GROUP_EXPECTED = {
+    private static final byte[] SENDER_P_MULTICAST_GROUP_EXPECTED = {
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
         (byte) 0x17, (byte) 0x01, (byte) 0x01, (byte) 0x01
     };

diff --git a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java
index 0c5a1e22ad77e10e37a1027f285d4c9d56c2b66c..502e7213aa5ce9e5f61baea0d5e9cd5950aa3ab0 100644 (file)
--- a/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java
+++ b/bgp/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/PMSITunnelAttributeHandlerTestUtil.java
@@ -46,7 +46,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 0- MPLS LABEL
      * No tunnel information present
      */
-    final static byte[] NO_TUNNEL_INFORMATION_PRESENT_EXPECTED = {
+    static final byte[] NO_TUNNEL_INFORMATION_PRESENT_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x05,
         (byte) 0x01, (byte) 0x00, (byte) 0x05, (byte) 0xdc, (byte) 0x10
     };
@@ -55,7 +55,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 1- MPLS LABEL
      * mLDP P2MP LSP
      */
-    final static byte[] RSVP_TE_P2MP_LSP_LSP_EXPECTED = {
+    static final byte[] RSVP_TE_P2MP_LSP_LSP_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x11,
         (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x00, (byte) 0x00, (byte) 0x0d, (byte) 0x82,
@@ -67,7 +67,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 2- MPLS LABEL
      * mLDP P2MP LSP
      */
-    final static byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4 = {
+    static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4 = {
         (byte) 0x80, (byte) 0x16, (byte) 0x35,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x01, (byte) 0x04,
@@ -92,7 +92,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 2- MPLS LABEL
      * mLDP P2MP LSP
      */
-    final static byte[] M_LDP_P2MP_LSP_EXPECTED_WRONG_FAMILY = {
+    static final byte[] M_LDP_P2MP_LSP_EXPECTED_WRONG_FAMILY = {
         (byte) 0x80, (byte) 0x16, (byte) 0x20,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0xfc, (byte) 0x04,
@@ -108,7 +108,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 2- MPLS LABEL
      * mLDP P2MP LSP L2VPN
      */
-    final static byte[] M_LDP_P2MP_LSP_EXPECTED_L2VPN = {
+    static final byte[] M_LDP_P2MP_LSP_EXPECTED_L2VPN = {
         (byte) 0x80, (byte) 0x16, (byte) 0x35,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x19, (byte) 0x04,
@@ -133,7 +133,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 2- MPLS LABEL
      * mLDP P2MP LSP IPV4
      */
-    final static byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4_2 = {
+    static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV4_2 = {
         (byte) 0x80, (byte) 0x16, (byte) 0x3b,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x01, (byte) 0x04,
@@ -160,7 +160,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 2- MPLS LABEL
      * mLDP P2MP LSP IPV6
      */
-    final static byte[] M_LDP_P2MP_LSP_EXPECTED_IPV6 = {
+    static final byte[] M_LDP_P2MP_LSP_EXPECTED_IPV6 = {
         (byte) 0x80, (byte) 0x16, (byte) 0x41,
         (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x06, (byte) 0x00, (byte) 0x02, (byte) 0x10,
@@ -188,7 +188,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 3- MPLS LABEL
      * PIM-SSM Tree
      */
-    final static byte[] PIM_SSM_TREE_EXPECTED = {
+    static final byte[] PIM_SSM_TREE_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x03, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -199,7 +199,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 4- MPLS LABEL
      * PIM-SM Tree
      */
-    final static byte[] PIM_SM_TREE_EXPECTED = {
+    static final byte[] PIM_SM_TREE_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x04, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -210,7 +210,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 5- MPLS LABEL
      * BIDIR-PIM Tree
      */
-    final static byte[] BIDIR_PIM_EXPECTED = {
+    static final byte[] BIDIR_PIM_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x0d,
         (byte) 0x01, (byte) 0x05, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01,
@@ -221,7 +221,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 6- MPLS LABEL
      * Ingress Replication
      */
-    final static byte[] INGRESS_REPLICATION_EXPECTED = {
+    static final byte[] INGRESS_REPLICATION_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x09,
         (byte) 0x01, (byte) 0x06, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01
@@ -231,7 +231,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 7- MPLS LABEL
      * mLDP MP2MP LSP
      */
-    final static byte[] M_LDP_MP_2_MP_LSP_EXPECTED = {
+    static final byte[] M_LDP_MP_2_MP_LSP_EXPECTED = {
         (byte) 0x80, (byte) 0x16, (byte) 0x16,
         (byte) 0x01, (byte) 0x07, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0x01, (byte) 0x00, (byte) 0x0e, // Opaque Type - Length
@@ -246,7 +246,7 @@ final class PMSITunnelAttributeHandlerTestUtil {
      * PMSI FLAG - PMSI TYPE 7- MPLS LABEL
      * mLDP MP2MP LSP
      */
-    final static byte[] M_LDP_MP_2_MP_LSP_WRONG = {
+    static final byte[] M_LDP_MP_2_MP_LSP_WRONG = {
         (byte) 0x80, (byte) 0x16, (byte) 0x0b,
         (byte) 0x01, (byte) 0x07, (byte) 0x05, (byte) 0xdc, (byte) 0x10,
         (byte) 0xfc, (byte) 0x00, (byte) 0x03, // Opaque Type - Length

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
index ce77ff3eb6cc8b45f393dd62bec9d8e4d4dee3ac..7d38e7dd644f3c570383a8d41f7ea2be94e6842a 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
@@ -62,7 +62,7 @@ public class FlowspecIpv4RIBSupportTest extends AbstractRIBSupportTest {
 
     private static final DestinationPrefixCase DEST_PREFIX = new DestinationPrefixCaseBuilder().setDestinationPrefix(new Ipv4Prefix("10.0.1.0/32")).build();
     private static final List<Flowspec> FLOW_LIST = Collections.singletonList(new FlowspecBuilder().setFlowspecType(DEST_PREFIX).build());
-    private final static DestinationFlowspec DEST_FLOW = new DestinationFlowspecBuilder().setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
+    private static final DestinationFlowspec DEST_FLOW = new DestinationFlowspecBuilder().setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
     private static final DestinationFlowspecCase REACH_NLRI = new DestinationFlowspecCaseBuilder().setDestinationFlowspec(DEST_FLOW).build();
     private static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update
         .attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCase UNREACH_NLRI = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
index e02e959dfb4e3d6ca10c944a2c5dea0d444683c8..e4ad6f97bb30bbb9677558209fc587104ae4f44a 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
@@ -61,7 +61,7 @@ public class FlowspecIpv6RIBSupportTest extends AbstractRIBSupportTest {
 
     private static final DestinationIpv6PrefixCase DEST_PREFIX = new DestinationIpv6PrefixCaseBuilder().setDestinationPrefix(new Ipv6Prefix("2001:db8:1:2::/64")).build();
     private static final List<Flowspec> FLOW_LIST = Collections.singletonList(new FlowspecBuilder().setFlowspecType(DEST_PREFIX).build());
-    private final static DestinationFlowspec DEST_FLOW = new DestinationFlowspecBuilder().setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
+    private static final DestinationFlowspec DEST_FLOW = new DestinationFlowspecBuilder().setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
     private static final DestinationFlowspecIpv6Case REACH_NLRI = new DestinationFlowspecIpv6CaseBuilder().setDestinationFlowspec(DEST_FLOW).build();
     private static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update
         .attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case UNREACH_NLRI = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4RIBSupportTest.java
index ccaad54a00a6335bc2358e6578cdbdf3179f6cf2..70646436357874400c8c8daf0cc3e227fc4e9d4b 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4RIBSupportTest.java
@@ -63,7 +63,7 @@ public class FlowspecL3vpnIpv4RIBSupportTest extends AbstractRIBSupportTest {
     private static final DestinationPrefixCase DEST_PREFIX = new DestinationPrefixCaseBuilder()
         .setDestinationPrefix(new Ipv4Prefix("172.17.1.0/24")).build();
     private static final List<Flowspec> FLOW_LIST = Collections.singletonList(new FlowspecBuilder().setFlowspecType(DEST_PREFIX).build());
-    private final static DestinationFlowspecL3vpnIpv4 DEST_FLOW = new DestinationFlowspecL3vpnIpv4Builder().setRouteDistinguisher(RD)
+    private static final DestinationFlowspecL3vpnIpv4 DEST_FLOW = new DestinationFlowspecL3vpnIpv4Builder().setRouteDistinguisher(RD)
         .setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
     private static final DestinationFlowspecL3vpnIpv4Case REACH_NLRI = new DestinationFlowspecL3vpnIpv4CaseBuilder().setDestinationFlowspecL3vpnIpv4(DEST_FLOW).build();
     private static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6RIBSupportTest.java
index d978993a9bfdba66154d60cccfb76369e6b7b5b8..f7605259b295208c9cd7f151c1f2939b92f34bbd 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6RIBSupportTest.java
@@ -63,7 +63,7 @@ public class FlowspecL3vpnIpv6RIBSupportTest extends AbstractRIBSupportTest {
     private static final DestinationIpv6PrefixCase DEST_PREFIX = new DestinationIpv6PrefixCaseBuilder()
         .setDestinationPrefix(new Ipv6Prefix("2001:db8:1:2::/64")).build();
     private static final List<Flowspec> FLOW_LIST = Collections.singletonList(new FlowspecBuilder().setFlowspecType(DEST_PREFIX).build());
-    private final static DestinationFlowspecL3vpnIpv6 DEST_FLOW = new DestinationFlowspecL3vpnIpv6Builder().setRouteDistinguisher(RD)
+    private static final DestinationFlowspecL3vpnIpv6 DEST_FLOW = new DestinationFlowspecL3vpnIpv6Builder().setRouteDistinguisher(RD)
         .setFlowspec(FLOW_LIST).setPathId(PATH_ID).build();
     private static final DestinationFlowspecL3vpnIpv6Case REACH_NLRI = new DestinationFlowspecL3vpnIpv6CaseBuilder().setDestinationFlowspecL3vpnIpv6(DEST_FLOW).build();
     private static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.

diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
index 90032078c169457d80db8b46c8b116e3ae13fcab..352460d05e520344ec3026a01730fbc3db848522 100644 (file)
--- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
+++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
@@ -130,7 +130,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest {
     private final InstanceIdentifier<Bgp> bgpInstanceIdentifier = InstanceIdentifier.create(NetworkInstances.class)
         .child(NetworkInstance.class, new NetworkInstanceKey("global-bgp")).child(Protocols.class)
         .child(Protocol.class, new ProtocolKey(BGP.class, this.ribId)).augmentation(Protocol1.class).child(Bgp.class);
-    final static TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
+    static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
     private final AsNumber as = new AsNumber(72L);
     private final BgpId bgpId = new BgpId("127.0.0.1");
     private final IpAddress neighborAddress = new IpAddress(new Ipv4Address("127.0.0.2"));

diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/SimpleRouteEntryTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/SimpleRouteEntryTest.java
index eec2d48c7c42d67f7164bf5ff3d13948bc107a72..8a9892e2b8cd3b00a6c6ab25ea1c341aadaaef6f 100644 (file)
--- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/SimpleRouteEntryTest.java
+++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/SimpleRouteEntryTest.java
@@ -20,7 +20,7 @@ import org.opendaylight.protocol.bgp.mode.impl.AbstractRouteEntryTest;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public final class SimpleRouteEntryTest extends AbstractRouteEntryTest {
-    private final static long N_PATHS = 2;
+    private static final long N_PATHS = 2;
     private SimpleRouteEntry testBARE;
 
     @Before

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImplTest.java
index 6f30e0acdf1dddf8e9780346a56fbf786097b12c..11d9a1df5034906e150d1391cb5c932655b40f41 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImplTest.java
@@ -49,7 +49,7 @@ public class ExportPolicyPeerTrackerImplTest {
     private static final YangInstanceIdentifier YII_PEER4 = YangInstanceIdentifier.builder().node(BgpRib.QNAME).node(Peer.QNAME)
         .nodeWithKey(Peer.QNAME, PEER_ID_QNAME, PEER_ID4.getValue()).build();
     private static final PeerId PEER_ID5 = new PeerId("bgp://42.42.42.46");
-    private final static List<AutoCloseable> TABLE_REGISTRATION = new ArrayList<>();
+    private static final List<AutoCloseable> TABLE_REGISTRATION = new ArrayList<>();
 
     @Test
     public void testExportPolicyPeerTrackerImpl() throws Exception {

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImplTest.java
index efb32ed6d782f0c35187e340f8de6979cb8dcb41..8bf137fd62e9c2abb35dbf5013a798e4131367b5 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImplTest.java
@@ -32,7 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
 
 public class BGPRenderStatsImplTest {
-    private final static BgpId BGP_ID = new BgpId("127.0.0.1");
+    private static final BgpId BGP_ID = new BgpId("127.0.0.1");
     private static final RibId RIB_ID = new RibId("test-rib");
     private static final ClusterIdentifier CLUSTER_ID = new ClusterIdentifier("192.168.1.2");
     private static final AsNumber AS = new AsNumber(0x10L);

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
index c0d2fa9e44b80b83c09d8c673a7f954520ae6a98..c4e47eb3597a2174b64d8051eb52f8b27a3993c2 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
@@ -64,7 +64,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 public abstract class AbstractRIBSupportTest {
-    protected final static long PATH_ID = 1;
+    protected static final long PATH_ID = 1;
     protected static final Attributes ATTRIBUTES = new AttributesBuilder().build();
     private static final InstanceIdentifier<LocRib> RIB = InstanceIdentifier.builder(BgpRib.class).child(Rib.class, new RibKey(new RibId("rib"))).child(LocRib.class).build();
     private static final InstanceIdentifier<Attributes> ATTRIBUTES_IID = InstanceIdentifier.create(Update.class).child(Attributes.class);

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
index 3189c63ae98ce3132e03684ab811cf3938699765..7a1afa8d06493c4528dd48d43b37b91c9322cf57 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
@@ -76,8 +76,8 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableCo
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder;
 
 public class MultiPathAbstractRIBSupportTest {
-    private final static long PATH_ID = 0;
-    private final static String ROUTE_KEY = "prefix";
+    private static final long PATH_ID = 0;
+    private static final String ROUTE_KEY = "prefix";
     private static final String PREFIX = "1.2.3.4/32";
     private static final QName PATH_ID_QNAME = QName.create(Ipv4Route.QNAME, "path-id").intern();
     private static final QName PREFIX_QNAME = QName.create(Ipv4Route.QNAME, ROUTE_KEY).intern();

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java
index 07aa47e1ead16fac622262171643aaab291857b3..62b8ebed3e0f408ca0ae4396f2e61a1cf47f13ed 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java
@@ -29,8 +29,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 
 public class RibSupportUtilsTest {
-    private final static NodeIdentifierWithPredicates NII;
-    private final static NodeIdentifierWithPredicates NII_PATH;
+    private static final NodeIdentifierWithPredicates NII;
+    private static final NodeIdentifierWithPredicates NII_PATH;
     final Class<? extends AddressFamily> AFI = Ipv4AddressFamily.class;
     final Class<? extends SubsequentAddressFamily> SAFI = UnicastSubsequentAddressFamily.class;
     private static final TablesKey TABLE_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/bgp/inet/rev150305/ipv4/routes/ipv4/routes/MultiPathAbstractTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/bgp/inet/rev150305/ipv4/routes/ipv4/routes/MultiPathAbstractTest.java
index 1b8bfd9d1be8e2cb7aa7e01a79b5e2310dd2b27c..c41862e37fc8c769e506ecdfb5ba22302f42e941 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/bgp/inet/rev150305/ipv4/routes/ipv4/routes/MultiPathAbstractTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/bgp/inet/rev150305/ipv4/routes/ipv4/routes/MultiPathAbstractTest.java
@@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 
 public final class MultiPathAbstractTest extends MultiPathAbstractRIBSupport {
-    private final static String ROUTE_KEY = "prefix";
+    private static final String ROUTE_KEY = "prefix";
     private static final String PREFIX = "1.2.3.4/32";
 
     private static final NodeIdentifierWithPredicates PREFIX_NII = new NodeIdentifierWithPredicates(Ipv4Route.QNAME,

diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessorTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessorTest.java
index 712fc4701612b57682b8f92daa2cc11ef4b4cdec..42a1a710e0606ca4f77064f8573238b79578d411 100644 (file)
--- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessorTest.java
+++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/NetworkTopologyConfigFileProcessorTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class NetworkTopologyConfigFileProcessorTest extends AbstractConfigLoader {
-    private final static InstanceIdentifier<Topology> TOPOLOGY_IID = InstanceIdentifier.create(NetworkTopology.class).child(Topology.class);
+    private static final InstanceIdentifier<Topology> TOPOLOGY_IID = InstanceIdentifier.create(NetworkTopology.class).child(Topology.class);
     @Mock
     private BgpTopologyDeployer bgpDeployer;
     @Mock

diff --git a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java
index 62c15abe6cb20d66bb5ce24077abc9386599973c..2ae8da05018aa1be7f7c6ceaa09c91b19203e1dc 100644 (file)
--- a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java
+++ b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 public class TopologyDataChangeCounterDeployer implements DataTreeChangeListener<DataChangeCounterConfig>,
     AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(TopologyDataChangeCounterDeployer.class);
-    private final static InstanceIdentifier<DataChangeCounterConfig> DATA_CHANGE_COUNTER_IID =
+    private static final InstanceIdentifier<DataChangeCounterConfig> DATA_CHANGE_COUNTER_IID =
         InstanceIdentifier.builder(DataChangeCounterConfig.class).build();
     private final DataBroker dataBroker;
     @GuardedBy("this")

diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
index 4504683e3f74c7056895b449eeae450565214202..bb9f2cb94b8f1439fc1bb868f3ed7fcb5dc9bbbb 100644 (file)
--- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
+++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCEndPointIpv4ObjectParserTest.java
@@ -23,8 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class PCCEndPointIpv4ObjectParserTest {
 
-    private final static String IP1 = "1.2.3.4";
-    private final static String IP2 = "1.2.3.5";
+    private static final String IP1 = "1.2.3.4";
+    private static final String IP2 = "1.2.3.5";
 
     @Test(expected=PCEPDeserializerException.class)
     public void testParseEmptyObject() throws PCEPDeserializerException {