Fix checkstyle violations in openflowplugin - part 4 25/67825/5
authorTom Pantelis <tompantelis@gmail.com>
Thu, 1 Feb 2018 17:02:29 +0000 (12:02 -0500)
committerTom Pantelis <tompantelis@gmail.com>
Wed, 28 Feb 2018 16:43:38 +0000 (11:43 -0500)
Change-Id: Ib9e941db9d2f48b34f713a5618368aff68089e42
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
52 files changed:
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpOpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpShaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpSpaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpThaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalArpTpaCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalEthTypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalExperimenterIdCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv4CodeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv4TypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv6CodeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIcmpv6TypeCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalInPhyPortCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalInPortCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpDscpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpEcnCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpProtoCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv4DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv4SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6ExthdrCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6FlabelCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdSllCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdTargetCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6NdTllCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalIpv6SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMetadataCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsBosCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsLabelCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalMplsTcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalPbbIsidCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalSctpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalSctpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTcpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTcpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIdCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIpv4DstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalTunnelIpv4SrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalUdpDstCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalUdpSrcCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalVlanPcpCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/OfToSalVlanVidCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfArpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchArbitraryBitMaskCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchArbitraryBitMaskCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfSctpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfTcpMatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfTunnelIpv4MatchCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfUdpMatchCase.java

index e777edf56cd4968335c6874cbc1c761f4f3ac6f3..39003dba26bb9004a3f3445ddc2f999db0fbf2d4 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalArpOpCase extends ConvertorCase<ArpOpCase, MatchBuilder, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpOpCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ArpOpCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
 
index ca42239d5d0095177b9621ac64f2520f20707beb..920463257273748e9239634d9d865bd0b1bce33a 100644 (file)
@@ -28,7 +28,8 @@ public class OfToSalArpShaCase extends ConvertorCase<ArpShaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpShaCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ArpShaCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
 
index 04eda9d2c4ee2baa8fadd5efbdb0d6a58aa8945a..4b5e63ed86ec3c366b3bf1305c291bcb81b09b0a 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalArpSpaCase extends ConvertorCase<ArpSpaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpSpaCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ArpSpaCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
 
index 67c06a48a19e0a22ecb24be6e4adf01da97a6b72..49c7bc01d3ef9489950108fd603c68add69e8de9 100644 (file)
@@ -28,7 +28,8 @@ public class OfToSalArpThaCase extends ConvertorCase<ArpThaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpThaCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ArpThaCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
 
index e79eb3e0bd8a44f45796d940cb5a2a0d04f33d35..6d330737d69ca7e4fa36576031c2c782353a50bd 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalArpTpaCase extends ConvertorCase<ArpTpaCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ArpTpaCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ArpTpaCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ArpMatchBuilder arpMatchBuilder = data.getArpMatchBuilder();
 
index 2653eac5b5c33e8f3265012ce2fb101ecd22f792..42fcece6364ae837511a6105508c6a1e7537dfbf 100644 (file)
@@ -29,7 +29,8 @@ public class OfToSalEthDstCase extends ConvertorCase<EthDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull EthDstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull EthDstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthernetMatchBuilder ethMatchBuilder = data.getEthernetMatchBuilder();
 
index f4c12d96dd309e783e4e423588625358e10320cf..99a914cc3e6ab46750e3d594e137f137ee7a07d9 100644 (file)
@@ -29,7 +29,8 @@ public class OfToSalEthSrcCase extends ConvertorCase<EthSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull EthSrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull EthSrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthernetMatchBuilder ethMatchBuilder = data.getEthernetMatchBuilder();
 
index 7a6e532e0dccb2b3f44bb261459409b81ce01d98..6cf44ae00e624c507a334c0608668dfdd37e34cd 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalEthTypeCase extends ConvertorCase<EthTypeCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull EthTypeCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull EthTypeCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final EthernetMatchBuilder ethMatchBuilder = data.getEthernetMatchBuilder();
 
index 22bc6f01941347faadeb2d4754d78d89f0d50798..60a87ebe3312733c5f3ecb7243bbd7eadf1543d9 100644 (file)
@@ -17,17 +17,19 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.data
 import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TcpFlagsMatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlagsContainer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.approved.extensions.rev160802.TcpFlags;
 
-public class OfToSalExperimenterIdCase extends ConvertorCase<ExperimenterIdCase, MatchBuilder, MatchResponseConvertorData> {
+public class OfToSalExperimenterIdCase extends ConvertorCase<ExperimenterIdCase, MatchBuilder,
+        MatchResponseConvertorData> {
     public OfToSalExperimenterIdCase() {
         super(ExperimenterIdCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull ExperimenterIdCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull ExperimenterIdCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
 
         if (data.getOxmMatchField().equals(TcpFlags.class)) {
@@ -35,9 +37,9 @@ public class OfToSalExperimenterIdCase extends ConvertorCase<ExperimenterIdCase,
             final TcpFlagsContainer tcpFlagsContainer = source.getAugmentation(TcpFlagsContainer.class);
 
             if (tcpFlagsContainer != null) {
-                org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.
-                        approved.extensions.rev160802.oxm.container.match.entry.
-                        value.experimenter.id._case.TcpFlags tcpFlags = tcpFlagsContainer.getTcpFlags();
+                org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
+                        .approved.extensions.rev160802.oxm.container.match.entry
+                        .value.experimenter.id._case.TcpFlags tcpFlags = tcpFlagsContainer.getTcpFlags();
 
                 tcpFlagsMatchBuilder.setTcpFlags(tcpFlags.getFlags());
                 byte[] mask = tcpFlags.getMask();
index d5fa2c7e4765c7ac2eceda9811be24cd6a8945c8..06bdc43ea42252a28ac38261c9ef9910c121195a 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIcmpv4CodeCase extends ConvertorCase<Icmpv4CodeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Icmpv4CodeCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Icmpv4CodeCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv4MatchBuilder icmpv4MatchBuilder = data.getIcmpv4MatchBuilder();
 
index 749bde8b6a70951fe7b56645f6692cf09e4bed99..6692679e71930aeb899922eef198a1328c386230 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIcmpv4TypeCase extends ConvertorCase<Icmpv4TypeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Icmpv4TypeCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Icmpv4TypeCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv4MatchBuilder icmpv4MatchBuilder = data.getIcmpv4MatchBuilder();
 
index 268e8255bb497306e4e8e3741c2d13089450ca6e..cf0b34957777e107bc654487c5b096f68636a635 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIcmpv6CodeCase extends ConvertorCase<Icmpv6CodeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Icmpv6CodeCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Icmpv6CodeCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv6MatchBuilder icmpv6MatchBuilder = data.getIcmpv6MatchBuilder();
 
index 384e0e45152c3fa65cea3b0f4581e7fd18a5ef81..38cc52e483fcc5ff5b6fbfb79a75b515df1d5640 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIcmpv6TypeCase extends ConvertorCase<Icmpv6TypeCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Icmpv6TypeCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Icmpv6TypeCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Icmpv6MatchBuilder icmpv6MatchBuilder = data.getIcmpv6MatchBuilder();
 
index 106682bf9f9dbe3f90ad31644d4e7652d9dd8e8a..7b5dcc76d841fc24a30e6b35aac6351e682f9798 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalInPhyPortCase extends ConvertorCase<InPhyPortCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull InPhyPortCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull InPhyPortCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final OpenflowVersion ofVersion = OpenflowVersion.get(data.getVersion());
         final BigInteger datapathId = data.getDatapathId();
@@ -35,7 +36,8 @@ public class OfToSalInPhyPortCase extends ConvertorCase<InPhyPortCase, MatchBuil
         final PortNumber portNumber = source.getInPhyPort().getPortNumber();
 
         if (portNumber != null) {
-            matchBuilder.setInPhyPort(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId, portNumber.getValue(), ofVersion));
+            matchBuilder.setInPhyPort(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(
+                    datapathId, portNumber.getValue(), ofVersion));
         }
 
         return Optional.of(matchBuilder);
index 9df2b5f744d5b9539dcec8edf3690c0263a13225..6947d509d34b66ac70bafe3b6e42dd3b7e9c0bb8 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalInPortCase extends ConvertorCase<InPortCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull InPortCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull InPortCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final OpenflowVersion ofVersion = OpenflowVersion.get(data.getVersion());
         final BigInteger datapathId = data.getDatapathId();
@@ -35,7 +36,8 @@ public class OfToSalInPortCase extends ConvertorCase<InPortCase, MatchBuilder, M
         final PortNumber portNumber = source.getInPort().getPortNumber();
 
         if (portNumber != null) {
-            matchBuilder.setInPort(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId, portNumber.getValue(), ofVersion));
+            matchBuilder.setInPort(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(
+                    datapathId, portNumber.getValue(), ofVersion));
         }
 
         return Optional.of(matchBuilder);
index 4111e275aa7e534e65e8daf02ee4fe6067cbf830..55a83b9875653fa54c016c42f12175f82f0ab802 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalIpDscpCase extends ConvertorCase<IpDscpCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull IpDscpCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull IpDscpCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
 
index c87e62362cd8c55e1a65647fb567a32190d0b9f9..d369ef1b4093ce029ef1795bfed4c75aafe9a857 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIpEcnCase extends ConvertorCase<IpEcnCase, MatchBuilder, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull IpEcnCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull IpEcnCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
 
index 6a9cd6b4790b4bb440cc1fc3579d16fa9e96895a..f7f909e569e60683ac1bc1dccf8dee4cd8e97e2c 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIpProtoCase extends ConvertorCase<IpProtoCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull IpProtoCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull IpProtoCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final IpMatchBuilder ipMatchBuilder = data.getIpMatchBuilder();
 
index ba55abe4c1d067faed29d846ef12a0a37c496da1..9a5005dd8532f56816c6c50d019dfd493096135a 100644 (file)
@@ -29,7 +29,8 @@ public class OfToSalIpv4DstCase extends ConvertorCase<Ipv4DstCase, MatchBuilder,
         super(Ipv4DstCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    private static void setIpv4MatchBuilderFields(final Ipv4MatchBuilder ipv4MatchBuilder, final byte[] mask, final String ipv4PrefixStr) {
+    private static void setIpv4MatchBuilderFields(final Ipv4MatchBuilder ipv4MatchBuilder, final byte[] mask,
+            final String ipv4PrefixStr) {
         final Ipv4Prefix ipv4Prefix;
         if (mask != null) {
             ipv4Prefix = IpConversionUtil.createPrefix(new Ipv4Address(ipv4PrefixStr), mask);
@@ -65,10 +66,12 @@ public class OfToSalIpv4DstCase extends ConvertorCase<Ipv4DstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4DstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv4DstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
-        final Ipv4MatchArbitraryBitMaskBuilder ipv4MatchArbitraryBitMaskBuilder = data.getIpv4MatchArbitraryBitMaskBuilder();
+        final Ipv4MatchArbitraryBitMaskBuilder ipv4MatchArbitraryBitMaskBuilder =
+                data.getIpv4MatchArbitraryBitMaskBuilder();
 
         Ipv4Dst ipv4Address = source.getIpv4Dst();
 
index 3fc8de65a6d23be3c544c2b6d6df96948b3d6528..246605dbde578678f6f2686cd515f31b81158226 100644 (file)
@@ -29,7 +29,8 @@ public class OfToSalIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBuilder,
         super(Ipv4SrcCase.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
-    private static void setIpv4MatchBuilderFields(final Ipv4MatchBuilder ipv4MatchBuilder, final byte[] mask, final String ipv4PrefixStr) {
+    private static void setIpv4MatchBuilderFields(final Ipv4MatchBuilder ipv4MatchBuilder, final byte[] mask,
+            final String ipv4PrefixStr) {
         final Ipv4Prefix ipv4Prefix;
         if (mask != null) {
             ipv4Prefix = IpConversionUtil.createPrefix(new Ipv4Address(ipv4PrefixStr), mask);
@@ -65,10 +66,12 @@ public class OfToSalIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
-        final Ipv4MatchArbitraryBitMaskBuilder ipv4MatchArbitraryBitMaskBuilder = data.getIpv4MatchArbitraryBitMaskBuilder();
+        final Ipv4MatchArbitraryBitMaskBuilder ipv4MatchArbitraryBitMaskBuilder =
+                data.getIpv4MatchArbitraryBitMaskBuilder();
 
         Ipv4Src ipv4Address = source.getIpv4Src();
 
@@ -81,7 +84,8 @@ public class OfToSalIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBuilder,
                 if (ipv4MatchBuilder.getIpv4Destination() != null) {
                     Ipv4Prefix ipv4PrefixDestinationAddress = ipv4MatchBuilder.getIpv4Destination();
                     Ipv4Address ipv4DstAddress = IpConversionUtil.extractIpv4Address(ipv4PrefixDestinationAddress);
-                    DottedQuad dstDottedQuadMask = IpConversionUtil.extractIpv4AddressMask(ipv4PrefixDestinationAddress);
+                    DottedQuad dstDottedQuadMask =
+                            IpConversionUtil.extractIpv4AddressMask(ipv4PrefixDestinationAddress);
 
                     setDstIpv4MatchArbitraryBitMaskBuilderFields(
                             ipv4MatchArbitraryBitMaskBuilder,
index edd0175c9a28150d221c799073f97cef9c9e1db0..eac66c0cb185a1e0412c383a701856b5f9c244e6 100644 (file)
@@ -30,10 +30,12 @@ public class OfToSalIpv6DstCase extends ConvertorCase<Ipv6DstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6DstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6DstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
-        final Ipv6MatchArbitraryBitMaskBuilder ipv6MatchArbitraryBitMaskBuilder = data.getIpv6MatchArbitraryBitMaskBuilder();
+        final Ipv6MatchArbitraryBitMaskBuilder ipv6MatchArbitraryBitMaskBuilder =
+                data.getIpv6MatchArbitraryBitMaskBuilder();
 
         Ipv6Dst ipv6Dst = source.getIpv6Dst();
 
@@ -53,7 +55,8 @@ public class OfToSalIpv6DstCase extends ConvertorCase<Ipv6DstCase, MatchBuilder,
                 }
                 Ipv6ArbitraryMask dstIpv6ArbitraryMask = IpConversionUtil.compressedIpv6MaskFormat(
                         IpConversionUtil.createIpv6ArbitraryBitMask(mask));
-                Ipv6Address stringIpv6DstAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
+                Ipv6Address stringIpv6DstAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
                 setDstIpv6MatchArbitraryBitMaskBuilderFields(ipv6MatchArbitraryBitMaskBuilder,
                         dstIpv6ArbitraryMask, stringIpv6DstAddress);
                 matchBuilder.setLayer3Match(ipv6MatchArbitraryBitMaskBuilder.build());
@@ -75,12 +78,14 @@ public class OfToSalIpv6DstCase extends ConvertorCase<Ipv6DstCase, MatchBuilder,
                         */
                 Ipv6ArbitraryMask dstIpv6ArbitraryMask = IpConversionUtil.compressedIpv6MaskFormat(
                         IpConversionUtil.createIpv6ArbitraryBitMask(mask));
-                Ipv6Address stringIpv6DstAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
+                Ipv6Address stringIpv6DstAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
                 setDstIpv6MatchArbitraryBitMaskBuilderFields(ipv6MatchArbitraryBitMaskBuilder,
                         dstIpv6ArbitraryMask, stringIpv6DstAddress);
                 matchBuilder.setLayer3Match(ipv6MatchArbitraryBitMaskBuilder.build());
             } else {
-                Ipv6Address stringIpv6DstAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
+                Ipv6Address stringIpv6DstAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Dst.getIpv6Address());
                 setIpv6MatchBuilderFields(ipv6MatchBuilder, mask, stringIpv6DstAddress);
                 matchBuilder.setLayer3Match(ipv6MatchBuilder.build());
             }
@@ -89,7 +94,8 @@ public class OfToSalIpv6DstCase extends ConvertorCase<Ipv6DstCase, MatchBuilder,
         return Optional.of(matchBuilder);
     }
 
-    private static void setIpv6MatchBuilderFields(final Ipv6MatchBuilder builder, final byte[] mask, final Ipv6Address prefix) {
+    private static void setIpv6MatchBuilderFields(final Ipv6MatchBuilder builder, final byte[] mask,
+            final Ipv6Address prefix) {
         Ipv6Prefix ipv6Prefix;
         if (mask != null) {
             ipv6Prefix = IpConversionUtil.createPrefix(prefix, mask);
index ee65a3834afcba48fa6b6c53919426d9c26d7dbe..e3f148929d4b0e9fe69eeb49a30ff7f5af7a8ed8 100644 (file)
@@ -29,7 +29,8 @@ public class OfToSalIpv6ExthdrCase extends ConvertorCase<Ipv6ExthdrCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6ExthdrCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6ExthdrCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
 
@@ -37,8 +38,8 @@ public class OfToSalIpv6ExthdrCase extends ConvertorCase<Ipv6ExthdrCase, MatchBu
 
         if (ipv6Exthdr != null) {
             Ipv6ExtHeaderBuilder ipv6ExtHeaderBuilder = new Ipv6ExtHeaderBuilder();
-            Ipv6ExthdrFlags pField = ipv6Exthdr.getPseudoField();
-            Integer bitmap = MatchConvertorUtil.ipv6ExthdrFlagsToInt(pField);
+            Ipv6ExthdrFlags headerFlags = ipv6Exthdr.getPseudoField();
+            Integer bitmap = MatchConvertorUtil.ipv6ExthdrFlagsToInt(headerFlags);
             ipv6ExtHeaderBuilder.setIpv6Exthdr(bitmap);
             byte[] mask = ipv6Exthdr.getMask();
 
index 97679320d43812481632a4499bf7e7bff424f22a..aed67ffe9db182d4cc3e36270e317995c45e090f 100644 (file)
@@ -28,7 +28,8 @@ public class OfToSalIpv6FlabelCase extends ConvertorCase<Ipv6FlabelCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6FlabelCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6FlabelCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
 
index 15d83ce0569bf944a8ecc0e1f7868279b9af3c8c..cb47757a7c1dd98daa941f7da00b70957b84d14f 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIpv6NdSllCase extends ConvertorCase<Ipv6NdSllCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdSllCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6NdSllCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
 
index 667a5e6c674e1a5f2383cea0b5ebf4c214e1b520..a82710e76a7722511052f9740169313f031ed0a6 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIpv6NdTargetCase extends ConvertorCase<Ipv6NdTargetCase, Mat
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTargetCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTargetCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
 
index 7f8418705adaacdd4839a09dd41b39845a2fde43..505727bb4816d808fc90fd2e20786c4ff5ab31e7 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalIpv6NdTllCase extends ConvertorCase<Ipv6NdTllCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTllCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6NdTllCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
 
index 49e3e5eeaebd25fe2d8907b453c87a9c8d6819af..6dffae09948b745c4981d441075da09d6f1c6b30 100644 (file)
@@ -30,10 +30,12 @@ public class OfToSalIpv6SrcCase extends ConvertorCase<Ipv6SrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv6SrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv6SrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv6MatchBuilder ipv6MatchBuilder = data.getIpv6MatchBuilder();
-        final Ipv6MatchArbitraryBitMaskBuilder ipv6MatchArbitraryBitMaskBuilder = data.getIpv6MatchArbitraryBitMaskBuilder();
+        final Ipv6MatchArbitraryBitMaskBuilder ipv6MatchArbitraryBitMaskBuilder =
+                data.getIpv6MatchArbitraryBitMaskBuilder();
 
         Ipv6Src ipv6Src = source.getIpv6Src();
 
@@ -53,7 +55,8 @@ public class OfToSalIpv6SrcCase extends ConvertorCase<Ipv6SrcCase, MatchBuilder,
                 }
                 Ipv6ArbitraryMask srcIpv6ArbitraryMask = IpConversionUtil.compressedIpv6MaskFormat(
                         IpConversionUtil.createIpv6ArbitraryBitMask(mask));
-                Ipv6Address stringIpv6SrcAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
+                Ipv6Address stringIpv6SrcAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
                 setSrcIpv6MatchArbitraryBitMaskBuilderFields(ipv6MatchArbitraryBitMaskBuilder,
                         srcIpv6ArbitraryMask, stringIpv6SrcAddress);
                 matchBuilder.setLayer3Match(ipv6MatchArbitraryBitMaskBuilder.build());
@@ -75,12 +78,14 @@ public class OfToSalIpv6SrcCase extends ConvertorCase<Ipv6SrcCase, MatchBuilder,
                         */
                 Ipv6ArbitraryMask srcIpv6ArbitraryMask = IpConversionUtil.compressedIpv6MaskFormat(
                         IpConversionUtil.createIpv6ArbitraryBitMask(mask));
-                Ipv6Address stringIpv6SrcAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
+                Ipv6Address stringIpv6SrcAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
                 setSrcIpv6MatchArbitraryBitMaskBuilderFields(ipv6MatchArbitraryBitMaskBuilder,
                         srcIpv6ArbitraryMask, stringIpv6SrcAddress);
                 matchBuilder.setLayer3Match(ipv6MatchArbitraryBitMaskBuilder.build());
             } else {
-                Ipv6Address stringIpv6SrcAddress = IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
+                Ipv6Address stringIpv6SrcAddress =
+                        IpConversionUtil.compressedIpv6AddressFormat(ipv6Src.getIpv6Address());
                 setIpv6MatchBuilderFields(ipv6MatchBuilder, mask, stringIpv6SrcAddress);
                 matchBuilder.setLayer3Match(ipv6MatchBuilder.build());
             }
@@ -89,7 +94,8 @@ public class OfToSalIpv6SrcCase extends ConvertorCase<Ipv6SrcCase, MatchBuilder,
         return Optional.of(matchBuilder);
     }
 
-    private static void setIpv6MatchBuilderFields(final Ipv6MatchBuilder builder, final byte[] mask, final Ipv6Address prefix) {
+    private static void setIpv6MatchBuilderFields(final Ipv6MatchBuilder builder, final byte[] mask,
+            final Ipv6Address prefix) {
         Ipv6Prefix ipv6Prefix;
         if (mask != null) {
             ipv6Prefix = IpConversionUtil.createPrefix(prefix, mask);
index 9f924940b98d7291962c3e0dbed3ebd9d43e3cc7..5b7a88c7f92a62e3423a6aa51143a35c498177ff 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalMetadataCase extends ConvertorCase<MetadataCase, MatchBuilde
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MetadataCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull MetadataCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final MetadataBuilder metadataBuilder = new MetadataBuilder();
         final Metadata metadata = source.getMetadata();
index 38ae6c2371e034f86ea8c8a6cd3e01c792dccaa7..58dc37f42e8f92d599d330d9262b58b58cd11689 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalMplsBosCase extends ConvertorCase<MplsBosCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsBosCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull MplsBosCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
 
index cf53c8bfce0912cc19dd31d4896c164d9428e7da..6d6ccf5d07415d55ffdec7b3b787cf9e13d70eb1 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalMplsLabelCase extends ConvertorCase<MplsLabelCase, MatchBuil
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsLabelCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull MplsLabelCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
 
index 6fcc8d7e5d54a5ba47d01af52d6bb5ea8b0c9c30..2af8a7cefc32da9d0cc6ac5bd3ec885a88ea1c2e 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalMplsTcCase extends ConvertorCase<MplsTcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull MplsTcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull MplsTcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
 
index 57b876c66e815f1b3c1fb020b1f9bd391b52d807..4022f6364306b7e3d41bfde880499cdea49c1750 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalPbbIsidCase extends ConvertorCase<PbbIsidCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull PbbIsidCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull PbbIsidCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder = data.getProtocolMatchFieldsBuilder();
 
index 7046a9b5ffd68cefafbd223aef5628f0f2a32d57..e41e03ff7980037d459dcfa6ffa61322597d5814 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalSctpDstCase extends ConvertorCase<SctpDstCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull SctpDstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull SctpDstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final SctpMatchBuilder sctpMatchBuilder = data.getSctpMatchBuilder();
 
index d9549a886c35814558eef37499bd248347de145d..f896fb7dc5622962738eb66e5016c9f7d71e9357 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalSctpSrcCase extends ConvertorCase<SctpSrcCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull SctpSrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull SctpSrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final SctpMatchBuilder sctpMatchBuilder = data.getSctpMatchBuilder();
 
index 6dcee21beb1d3e6472e1d75237b9e8189c445622..e9e553ec3771882389eedd9a90c017e6691c8854 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalTcpDstCase extends ConvertorCase<TcpDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TcpDstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull TcpDstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final TcpMatchBuilder tcpMatchBuilder = data.getTcpMatchBuilder();
 
index 503cabef94f50468a8181ab6c750f19753bab974..e62f108c3c3bbbce8d1fad3cacabf41c57c49cc6 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalTcpSrcCase extends ConvertorCase<TcpSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TcpSrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull TcpSrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final TcpMatchBuilder tcpMatchBuilder = data.getTcpMatchBuilder();
 
index dab5b3cad7a8973dec7cadb4cd1103e3cfbed465..b9a02a2370c1570775744a5406f2ad636517ea62 100644 (file)
@@ -26,7 +26,8 @@ public class OfToSalTunnelIdCase extends ConvertorCase<TunnelIdCase, MatchBuilde
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull TunnelIdCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull TunnelIdCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
 
         TunnelId tunnelId = source.getTunnelId();
index e5e5bab5f33fe54297842646c892be3f434e7ee4..8ae1e1886ba80c0518c65c3b06eac45bb936dc8d 100644 (file)
@@ -30,7 +30,8 @@ public class OfToSalTunnelIpv4DstCase extends ConvertorCase<Ipv4DstCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4DstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv4DstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
         final TunnelIpv4MatchBuilder tunnelIpv4MatchBuilder = data.getTunnelIpv4MatchBuilder();
index c84d9420c0c1097bb0412ed8fdf9b95dda515e06..7a092aa195d7c0417b9b8e1d04e702e081c25792 100644 (file)
@@ -30,7 +30,8 @@ public class OfToSalTunnelIpv4SrcCase extends ConvertorCase<Ipv4SrcCase, MatchBu
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull Ipv4SrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final Ipv4MatchBuilder ipv4MatchBuilder = data.getIpv4MatchBuilder();
         final TunnelIpv4MatchBuilder tunnelIpv4MatchBuilder = data.getTunnelIpv4MatchBuilder();
index c3cacffcd07d6b9f6d4b89f0bc0f49c6e13dbcec..970d8bbee630503bb45365530d1525deb6346dc6 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalUdpDstCase extends ConvertorCase<UdpDstCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull UdpDstCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull UdpDstCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final UdpMatchBuilder udpMatchBuilder = data.getUdpMatchBuilder();
 
index 0dcf7f290aa6928dacd91073818d13a98034cb9d..6ee348c9bb5960a2d22a933f9f85d602ba5bf911 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalUdpSrcCase extends ConvertorCase<UdpSrcCase, MatchBuilder, M
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull UdpSrcCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull UdpSrcCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final UdpMatchBuilder udpMatchBuilder = data.getUdpMatchBuilder();
 
index b862a46178974a3ab34c6bddaf61e239bd145b93..574a99c50203299c80fb9eff13da5b758ed7f4e7 100644 (file)
@@ -25,7 +25,8 @@ public class OfToSalVlanPcpCase extends ConvertorCase<VlanPcpCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull VlanPcpCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull VlanPcpCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final VlanMatchBuilder vlanMatchBuilder = data.getVlanMatchBuilder();
 
index edff8c63ad83214a43f5d95c3b7a4544ab891c5a..144ac4467a53a2b8c8c92610ba9e37352e1e7e0b 100644 (file)
@@ -27,7 +27,8 @@ public class OfToSalVlanVidCase extends ConvertorCase<VlanVidCase, MatchBuilder,
     }
 
     @Override
-    public Optional<MatchBuilder> process(@Nonnull VlanVidCase source, MatchResponseConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<MatchBuilder> process(@Nonnull VlanVidCase source, MatchResponseConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final MatchBuilder matchBuilder = data.getMatchBuilder();
         final VlanMatchBuilder vlanMatchBuilder = data.getVlanMatchBuilder();
 
index 6ba10bdc1505a0320eeacff9bb0968a388bc1f98..b17425b3a1860c91a8b27fa5471be4b7181a99cd 100644 (file)
@@ -49,7 +49,8 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull ArpMatch source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull ArpMatch source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getArpOp() != null) {
@@ -71,7 +72,6 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(ArpSpa.class);
 
-            ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
             ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -84,6 +84,8 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
                 hasMask = true;
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
             arpSpaCaseBuilder.setArpSpa(arpSpaBuilder.build());
             matchEntryBuilder.setMatchEntryValue(arpSpaCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -95,7 +97,6 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(ArpTpa.class);
 
-            ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
             ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -108,6 +109,8 @@ public class SalToOfArpMatchCase extends ConvertorCase<ArpMatch, List<MatchEntry
                 hasMask = true;
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
             arpTpaCaseBuilder.setArpTpa(arpTpaBuilder.build());
             matchEntryBuilder.setMatchEntryValue(arpTpaCaseBuilder.build());
             result.add(matchEntryBuilder.build());
index b8cca513e6acfe569edbae95b57407f84faea5ea..dbca089e8b08445e629a55daa773469cd4000cb9 100644 (file)
@@ -28,13 +28,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv4.dst._case.Ipv4DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv4.src._case.Ipv4SrcBuilder;
 
-public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4MatchArbitraryBitMask, List<MatchEntry>, VersionConvertorData> {
+public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4MatchArbitraryBitMask,
+        List<MatchEntry>, VersionConvertorData> {
     public SalToOfIpv4MatchArbitraryBitMaskCase() {
         super(Ipv4MatchArbitraryBitMask.class, true);
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv4MatchArbitraryBitMask source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull Ipv4MatchArbitraryBitMask source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getIpv4SourceAddressNoMask() != null) {
@@ -42,7 +44,6 @@ public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4Matc
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
 
-            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
 
             ipv4SrcBuilder.setIpv4Address(source.getIpv4SourceAddressNoMask());
@@ -57,6 +58,8 @@ public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4Matc
                 }
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -67,7 +70,6 @@ public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4Matc
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
 
-            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
 
             ipv4DstBuilder.setIpv4Address(source.getIpv4DestinationAddressNoMask());
@@ -82,6 +84,8 @@ public class SalToOfIpv4MatchArbitraryBitMaskCase extends ConvertorCase<Ipv4Matc
                 }
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             ipv4DstCaseBuilder.setIpv4Dst(ipv4DstBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
             result.add(matchEntryBuilder.build());
index 490575cf67841a9bc782c1dc96e2b61a42299748..d68d88454d51279857dc7240d8556a137b0bc88c 100644 (file)
@@ -37,7 +37,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv4Match source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull Ipv4Match source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getIpv4Source() != null) {
@@ -46,7 +47,6 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
 
-            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -61,6 +61,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -72,7 +74,6 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
 
-            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -87,6 +88,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             ipv4DstCaseBuilder.setIpv4Dst(ipv4DstBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
             result.add(matchEntryBuilder.build());
index 0f1056cc61debf4ba0bf11f968af3ebd1413e39a..48a7f1e5d3517bb5912755e0bddab7d1ebcdcbb8 100644 (file)
@@ -28,13 +28,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.dst._case.Ipv6DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.src._case.Ipv6SrcBuilder;
 
-public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6MatchArbitraryBitMask, List<MatchEntry>, VersionConvertorData> {
+public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6MatchArbitraryBitMask,
+        List<MatchEntry>, VersionConvertorData> {
     public SalToOfIpv6MatchArbitraryBitMaskCase() {
         super(Ipv6MatchArbitraryBitMask.class, true);
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv6MatchArbitraryBitMask source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull Ipv6MatchArbitraryBitMask source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getIpv6SourceAddressNoMask() != null) {
@@ -42,7 +44,6 @@ public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6Matc
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv6Src.class);
 
-            Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
             Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
             ipv6SrcBuilder.setIpv6Address(source.getIpv6SourceAddressNoMask());
             Ipv6ArbitraryMask sourceArbitrarySubNetMask = source.getIpv6SourceArbitraryBitmask();
@@ -55,6 +56,8 @@ public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6Matc
                 }
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
             ipv6SrcCaseBuilder.setIpv6Src(ipv6SrcBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv6SrcCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -65,7 +68,6 @@ public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6Matc
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv6Dst.class);
 
-            Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
             Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
 
             ipv6DstBuilder.setIpv6Address(source.getIpv6DestinationAddressNoMask());
@@ -73,13 +75,16 @@ public class SalToOfIpv6MatchArbitraryBitMaskCase extends ConvertorCase<Ipv6Matc
 
             boolean hasMask = false;
             if (destinationArbitrarySubNetMask != null) {
-                byte[] maskByteArray = IpConversionUtil.convertIpv6ArbitraryMaskToByteArray(destinationArbitrarySubNetMask);
+                byte[] maskByteArray = IpConversionUtil.convertIpv6ArbitraryMaskToByteArray(
+                        destinationArbitrarySubNetMask);
                 if (maskByteArray != null) {
                     ipv6DstBuilder.setMask(maskByteArray);
                     hasMask = true;
                 }
             }
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
             ipv6DstCaseBuilder.setIpv6Dst(ipv6DstBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv6DstCaseBuilder.build());
             result.add(matchEntryBuilder.build());
index ed9f8eb41ea56ebd56fcacb45c1ecba2f1cabed5..d86d2e227d26afb811ab65743ca4c2ded77784ae 100644 (file)
@@ -52,7 +52,8 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv6Match source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull Ipv6Match source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getIpv6Source() != null) {
@@ -108,7 +109,8 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
 
             if (source.getIpv6Label().getFlabelMask() != null) {
                 hasmask = true;
-                ipv6FlabelBuilder.setMask(ByteUtil.unsignedIntToBytes(source.getIpv6Label().getFlabelMask().getValue()));
+                ipv6FlabelBuilder.setMask(ByteUtil.unsignedIntToBytes(
+                        source.getIpv6Label().getFlabelMask().getValue()));
             }
 
             ipv6FlabelCaseBuilder.setIpv6Flabel(ipv6FlabelBuilder.build());
@@ -170,18 +172,8 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
             Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
             Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
 
-            Integer bitmap = source.getIpv6ExtHeader().getIpv6Exthdr();
-            final Boolean NONEXT = ((bitmap) & (1)) != 0;
-            final Boolean ESP = ((bitmap) & (1 << 1)) != 0;
-            final Boolean AUTH = ((bitmap) & (1 << 2)) != 0;
-            final Boolean DEST = ((bitmap) & (1 << 3)) != 0;
-            final Boolean FRAG = ((bitmap) & (1 << 4)) != 0;
-            final Boolean ROUTER = ((bitmap) & (1 << 5)) != 0;
-            final Boolean HOP = ((bitmap) & (1 << 6)) != 0;
-            final Boolean UNREP = ((bitmap) & (1 << 7)) != 0;
-            final Boolean UNSEQ = ((bitmap) & (1 << 8)) != 0;
-
-            ipv6ExthdrBuilder.setPseudoField(new Ipv6ExthdrFlags(AUTH, DEST, ESP, FRAG, HOP, NONEXT, ROUTER, UNREP, UNSEQ));
+            int bitmap = source.getIpv6ExtHeader().getIpv6Exthdr();
+            ipv6ExthdrBuilder.setPseudoField(makeIpv6ExthdrFlags(bitmap));
 
             if (source.getIpv6ExtHeader().getIpv6ExthdrMask() != null) {
                 hasmask = true;
@@ -196,4 +188,19 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
 
         return Optional.of(result);
     }
+
+    @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+    private Ipv6ExthdrFlags makeIpv6ExthdrFlags(int bitmap) {
+        final Boolean NONEXT = (bitmap & 1) != 0;
+        final Boolean ESP = (bitmap & 1 << 1) != 0;
+        final Boolean AUTH = (bitmap & 1 << 2) != 0;
+        final Boolean DEST = (bitmap & 1 << 3) != 0;
+        final Boolean FRAG = (bitmap & 1 << 4) != 0;
+        final Boolean ROUTER = (bitmap & 1 << 5) != 0;
+        final Boolean HOP = (bitmap & 1 << 6) != 0;
+        final Boolean UNREP = (bitmap & 1 << 7) != 0;
+        final Boolean UNSEQ = (bitmap & 1 << 8) != 0;
+
+        return new Ipv6ExthdrFlags(AUTH, DEST, ESP, FRAG, HOP, NONEXT, ROUTER, UNREP, UNSEQ);
+    }
 }
index e8197316e45621d707f8622192cd4b834eb2b886..5d89bd93597c51d524bfd9017b0470a7b00e7bdd 100644 (file)
@@ -32,7 +32,8 @@ public class SalToOfSctpMatchCase extends ConvertorCase<SctpMatch, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull SctpMatch source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull SctpMatch source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getSctpSourcePort() != null) {
index 61c5800c2e1fba0ff98bbfa944dd7f193324b067..e2113ddf92217d13d0edd43815083acc9d3ab758 100644 (file)
@@ -32,7 +32,8 @@ public class SalToOfTcpMatchCase extends ConvertorCase<TcpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull TcpMatch source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull TcpMatch source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getTcpSourcePort() != null) {
index 6b85e17f6d165673fc8a9511fbc23b5b6c0548b6..6b4a85381d194e6eb51bcb89d96e49ee8b78c073 100644 (file)
@@ -37,7 +37,8 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull TunnelIpv4Match source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull TunnelIpv4Match source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getTunnelIpv4Source() != null) {
@@ -46,7 +47,6 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
 
-            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -61,6 +61,8 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -72,7 +74,6 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
 
-            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -87,6 +88,8 @@ public class SalToOfTunnelIpv4MatchCase extends ConvertorCase<TunnelIpv4Match, L
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             ipv4DstCaseBuilder.setIpv4Dst(ipv4DstBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
             result.add(matchEntryBuilder.build());
index 3979863d85f79068ff90a07de16a0e4bb17f8a04..cb57ccc1740e15b33ce046ef89a028b0ba95f705 100644 (file)
@@ -32,7 +32,8 @@ public class SalToOfUdpMatchCase extends ConvertorCase<UdpMatch, List<MatchEntry
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull UdpMatch source, VersionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<List<MatchEntry>> process(@Nonnull UdpMatch source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getUdpSourcePort() != null) {