Merge "Fix modifiers order to comply with Java coding guidelines" into stable/boron

diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java
index 9e12fc614b33ab344d147c2e20d2948d0734b1bf..4e62b5b955cc087414fe3570ac869f27576edc41 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java
+++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java
@@ -60,7 +60,6 @@ import org.opendaylight.openflowjava.nx.codec.match.EncapEthTypeCodec;
 import org.opendaylight.openflowjava.nx.codec.match.EncapEthSrcCodec;
 import org.opendaylight.openflowjava.nx.codec.match.EncapEthDstCodec;
 import org.opendaylight.openflowjava.nx.codec.match.NshMdtypeCodec;
-import org.opendaylight.openflowjava.nx.codec.match.NshNpCodec;
 import org.opendaylight.openflowjava.nx.codec.match.TunGpeNpCodec;
 import org.opendaylight.openflowjava.nx.codec.match.UdpSrcCodec;
 import org.opendaylight.openflowjava.nx.codec.match.UdpDstCodec;
@@ -274,47 +273,47 @@ public class NiciraExtensionProvider implements AutoCloseable {
     private ExtensionConverterRegistrator extensionConverterRegistrator;
     private Set<ObjectRegistration<?>> registrations;
 
-    private final static RegConvertor REG_CONVERTOR = new RegConvertor();
-    private final static TunIdConvertor TUN_ID_CONVERTOR = new TunIdConvertor();
-    private final static ArpOpConvertor ARP_OP_CONVERTOR = new ArpOpConvertor();
-    private final static ArpShaConvertor ARP_SHA_CONVERTOR = new ArpShaConvertor();
-    private final static ArpSpaConvertor ARP_SPA_CONVERTOR = new ArpSpaConvertor();
-    private final static ArpTpaConvertor ARP_TPA_CONVERTOR = new ArpTpaConvertor();
-    private final static ArpThaConvertor ARP_THA_CONVERTOR = new ArpThaConvertor();
-    private final static NxmInPortConvertor NXM_IN_PORT_CONVERTOR = new NxmInPortConvertor();
-    private final static EthDstConvertor ETH_DST_CONVERTOR = new EthDstConvertor();
-    private final static EthSrcConvertor ETH_SRC_CONVERTOR = new EthSrcConvertor();
-    private final static RegLoadConvertor REG_LOAD_CONVERTOR = new RegLoadConvertor();
-    private final static RegMoveConvertor REG_MOVE_CONVERTOR = new RegMoveConvertor();
-    private final static OutputRegConvertor OUTPUT_REG_CONVERTOR = new OutputRegConvertor();
-    private final static EthTypeConvertor ETH_TYPE_CONVERTOR = new EthTypeConvertor();
-    private final static ResubmitConvertor RESUBMIT_CONVERTOR = new ResubmitConvertor();
-    private final static FinTimeoutConvertor FIN_TIMEOUT_CONVERTOR = new FinTimeoutConvertor();
-    private final static MultipathConvertor MULTIPATH_CONVERTOR = new MultipathConvertor();
-    private final static PushNshConvertor PUSH_NSH_CONVERTOR = new PushNshConvertor();
-    private final static PopNshConvertor POP_NSH_CONVERTOR = new PopNshConvertor();
-    private final static NspConvertor NSP_CONVERTOR = new NspConvertor();
-    private final static NsiConvertor NSI_CONVERTOR = new NsiConvertor();
-    private final static Nshc1Convertor NSC1_CONVERTOR = new Nshc1Convertor();
-    private final static Nshc2Convertor NSC2_CONVERTOR = new Nshc2Convertor();
-    private final static Nshc3Convertor NSC3_CONVERTOR = new Nshc3Convertor();
-    private final static Nshc4Convertor NSC4_CONVERTOR = new Nshc4Convertor();
-    private final static TunIPv4SrcConvertor TUN_IPV4_SRC_CONVERTOR = new TunIPv4SrcConvertor();
-    private final static TunIPv4DstConvertor TUN_IPV4_DST_CONVERTOR = new TunIPv4DstConvertor();
-    private final static EncapEthTypeConvertor ENCAP_ETH_TYPE_CONVERTOR = new EncapEthTypeConvertor();
-    private final static EncapEthSrcConvertor ENCAP_ETH_SRC_CONVERTOR = new EncapEthSrcConvertor();
-    private final static EncapEthDstConvertor ENCAP_ETH_DST_CONVERTOR = new EncapEthDstConvertor();
-    private final static NshMdtypeConvertor NSH_MDTYPE_CONVERTOR = new NshMdtypeConvertor();
-    private final static NshNpConvertor NSH_NP_CONVERTOR = new NshNpConvertor();
-    private final static TunGpeNpConvertor TUN_GPE_NP_CONVERTOR = new TunGpeNpConvertor();
-    private final static TcpSrcConvertor TCP_SRC_CONVERTOR = new TcpSrcConvertor();
-    private final static TcpDstConvertor TCP_DST_CONVERTOR = new TcpDstConvertor();
-    private final static UdpSrcConvertor UDP_SRC_CONVERTOR = new UdpSrcConvertor();
-    private final static UdpDstConvertor UDP_DST_CONVERTOR = new UdpDstConvertor();
-    private final static ConntrackConvertor CONNTRACK_CONVERTOR = new ConntrackConvertor();
-    private final static LearnConvertor LEARN_CONVERTOR = new LearnConvertor();
-    private final static CtStateConvertor CT_STATE_CONVERTOR = new CtStateConvertor();
-    private final static CtZoneConvertor CT_ZONE_CONVERTOR = new CtZoneConvertor();
+    private static final RegConvertor REG_CONVERTOR = new RegConvertor();
+    private static final TunIdConvertor TUN_ID_CONVERTOR = new TunIdConvertor();
+    private static final ArpOpConvertor ARP_OP_CONVERTOR = new ArpOpConvertor();
+    private static final ArpShaConvertor ARP_SHA_CONVERTOR = new ArpShaConvertor();
+    private static final ArpSpaConvertor ARP_SPA_CONVERTOR = new ArpSpaConvertor();
+    private static final ArpTpaConvertor ARP_TPA_CONVERTOR = new ArpTpaConvertor();
+    private static final ArpThaConvertor ARP_THA_CONVERTOR = new ArpThaConvertor();
+    private static final NxmInPortConvertor NXM_IN_PORT_CONVERTOR = new NxmInPortConvertor();
+    private static final EthDstConvertor ETH_DST_CONVERTOR = new EthDstConvertor();
+    private static final EthSrcConvertor ETH_SRC_CONVERTOR = new EthSrcConvertor();
+    private static final RegLoadConvertor REG_LOAD_CONVERTOR = new RegLoadConvertor();
+    private static final RegMoveConvertor REG_MOVE_CONVERTOR = new RegMoveConvertor();
+    private static final OutputRegConvertor OUTPUT_REG_CONVERTOR = new OutputRegConvertor();
+    private static final EthTypeConvertor ETH_TYPE_CONVERTOR = new EthTypeConvertor();
+    private static final ResubmitConvertor RESUBMIT_CONVERTOR = new ResubmitConvertor();
+    private static final FinTimeoutConvertor FIN_TIMEOUT_CONVERTOR = new FinTimeoutConvertor();
+    private static final MultipathConvertor MULTIPATH_CONVERTOR = new MultipathConvertor();
+    private static final PushNshConvertor PUSH_NSH_CONVERTOR = new PushNshConvertor();
+    private static final PopNshConvertor POP_NSH_CONVERTOR = new PopNshConvertor();
+    private static final NspConvertor NSP_CONVERTOR = new NspConvertor();
+    private static final NsiConvertor NSI_CONVERTOR = new NsiConvertor();
+    private static final Nshc1Convertor NSC1_CONVERTOR = new Nshc1Convertor();
+    private static final Nshc2Convertor NSC2_CONVERTOR = new Nshc2Convertor();
+    private static final Nshc3Convertor NSC3_CONVERTOR = new Nshc3Convertor();
+    private static final Nshc4Convertor NSC4_CONVERTOR = new Nshc4Convertor();
+    private static final TunIPv4SrcConvertor TUN_IPV4_SRC_CONVERTOR = new TunIPv4SrcConvertor();
+    private static final TunIPv4DstConvertor TUN_IPV4_DST_CONVERTOR = new TunIPv4DstConvertor();
+    private static final EncapEthTypeConvertor ENCAP_ETH_TYPE_CONVERTOR = new EncapEthTypeConvertor();
+    private static final EncapEthSrcConvertor ENCAP_ETH_SRC_CONVERTOR = new EncapEthSrcConvertor();
+    private static final EncapEthDstConvertor ENCAP_ETH_DST_CONVERTOR = new EncapEthDstConvertor();
+    private static final NshMdtypeConvertor NSH_MDTYPE_CONVERTOR = new NshMdtypeConvertor();
+    private static final NshNpConvertor NSH_NP_CONVERTOR = new NshNpConvertor();
+    private static final TunGpeNpConvertor TUN_GPE_NP_CONVERTOR = new TunGpeNpConvertor();
+    private static final TcpSrcConvertor TCP_SRC_CONVERTOR = new TcpSrcConvertor();
+    private static final TcpDstConvertor TCP_DST_CONVERTOR = new TcpDstConvertor();
+    private static final UdpSrcConvertor UDP_SRC_CONVERTOR = new UdpSrcConvertor();
+    private static final UdpDstConvertor UDP_DST_CONVERTOR = new UdpDstConvertor();
+    private static final ConntrackConvertor CONNTRACK_CONVERTOR = new ConntrackConvertor();
+    private static final LearnConvertor LEARN_CONVERTOR = new LearnConvertor();
+    private static final CtStateConvertor CT_STATE_CONVERTOR = new CtStateConvertor();
+    private static final CtZoneConvertor CT_ZONE_CONVERTOR = new CtZoneConvertor();
 
     @Override
     public void close() {
@@ -666,5 +665,4 @@ public class NiciraExtensionProvider implements AutoCloseable {
         ActionSerializerKey<?> key = new ActionSerializerKey(EncodeConstants.OF13_VERSION_ID, actionCaseType, null);
         registrations.add(extensionConverterRegistrator.registerActionConvertor(key, actionConvertor));
     }
-
 }