Fix checkstyle violations in openflowplugin - part 2 23/67823/5
authorTom Pantelis <tompantelis@gmail.com>
Thu, 1 Feb 2018 02:16:31 +0000 (21:16 -0500)
committerTom Pantelis <tompantelis@gmail.com>
Wed, 28 Feb 2018 16:43:36 +0000 (11:43 -0500)
Change-Id: I83c41416dd64eba991ff95c4afc9e8a2b11e3a31
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
47 files changed:
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfGroupActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfOutputActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopMplsActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopPbbActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPopVlanActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushMplsActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushPbbActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfPushVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetDlSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetFieldCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetFieldV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetMplsTtlActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTosActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTosActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetNwTtlActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetQueueActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpDstActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpDstActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpSrcActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetTpSrcActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanIdActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanIdActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanPcpActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfSetVlanPcpActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfStripVlanActionV10Case.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/cases/SalToOfVendorCodecCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/data/ActionConvertorData.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/data/ActionResponseConvertorData.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertReactor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertReactorConvertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/Convertor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertorCase.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertorKey.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ConvertorProcessor.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IPProtocols.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/OrderComparator.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/ResultInjector.java

index 6aed0ccf5916b1c5179ddc32023987362f481811..12e237c4ddb7084ebee4c1efeb79d416fa1d2428 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfGroupActionCase extends ConvertorCase<GroupActionCase, Actio
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final GroupActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final GroupActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         GroupAction groupAction = source.getGroupAction();
         GroupActionBuilder groupActionBuilder = new GroupActionBuilder();
 
index 469e82209e8d0024224a68971d29d58fac0ca51f..0c937f37019720c44268dccbc723fa9e3322cb30 100644 (file)
@@ -36,7 +36,8 @@ public class SalToOfOutputActionCase extends ConvertorCase<OutputActionCase, Act
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final OutputActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final OutputActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final OutputAction outputAction = source.getOutputAction();
         final OutputActionBuilder outputBuilder = new OutputActionBuilder();
 
index 9c11a412eae9fa7e04bdf7299fb4a3bbe5739b17..571079cb3d431c1d48c18016695330f4078597c7 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfPopMplsActionCase extends ConvertorCase<PopMplsActionCase, A
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PopMplsActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PopMplsActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         PopMplsCaseBuilder popMplsCaseBuilder = new PopMplsCaseBuilder();
         PopMplsActionBuilder popMplsBuilder = new PopMplsActionBuilder();
         popMplsBuilder.setEthertype(new EtherType(new EtherType(source.getPopMplsAction().getEthernetType())));
@@ -38,4 +39,4 @@ public class SalToOfPopMplsActionCase extends ConvertorCase<PopMplsActionCase, A
                 .setActionChoice(popMplsCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 8c3fc74989d4085778bf8a450bd515381e453d74..08d3c963355b765412b2fa9aad4a0a17b12e4456 100644 (file)
@@ -26,9 +26,10 @@ public class SalToOfPopPbbActionCase extends ConvertorCase<PopPbbActionCase, Act
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PopPbbActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PopPbbActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new PopPbbCaseBuilder().build())
                 .build());
     }
-}
\ No newline at end of file
+}
index ba6c4ba24ce4a231c232e8387b502a7b6037b22c..52fad526a0b840aa1567be5ca384c28d5b654520 100644 (file)
@@ -26,9 +26,10 @@ public class SalToOfPopVlanActionCase extends ConvertorCase<PopVlanActionCase, A
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new PopVlanCaseBuilder().build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 6b0fe7a24068faecd83f6f958a9acbfc5da85e90..1fe4d91d661a771a20b1b918c3466ce41456941b 100644 (file)
@@ -26,9 +26,10 @@ public class SalToOfPopVlanActionV10Case extends ConvertorCase<PopVlanActionCase
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PopVlanActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new StripVlanCaseBuilder().build())
                 .build());
     }
-}
\ No newline at end of file
+}
index d336ed0f6e01bc5e01db275c2f3337ac5391711c..5d2a17d948a42901f341a17abd0ef9c495101f7d 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfPushMplsActionCase extends ConvertorCase<PushMplsActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PushMplsActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PushMplsActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         PushMplsCaseBuilder pushMplsCaseBuilder = new PushMplsCaseBuilder();
         PushMplsActionBuilder pushMplsBuilder = new PushMplsActionBuilder();
         pushMplsBuilder.setEthertype(new EtherType(source.getPushMplsAction().getEthernetType()));
@@ -38,4 +39,4 @@ public class SalToOfPushMplsActionCase extends ConvertorCase<PushMplsActionCase,
                 .setActionChoice(pushMplsCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index a9044da966232796e8ab5164e904022a0f77e9de..45b7072880e31a7236d93a064144b6dfadcdf1f6 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfPushPbbActionCase extends ConvertorCase<PushPbbActionCase, A
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PushPbbActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PushPbbActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         PushPbbCaseBuilder pushPbbCaseBuilder = new PushPbbCaseBuilder();
         PushPbbActionBuilder pushPbbBuilder = new PushPbbActionBuilder();
         pushPbbBuilder.setEthertype(new EtherType(source.getPushPbbAction().getEthernetType()));
@@ -38,4 +39,4 @@ public class SalToOfPushPbbActionCase extends ConvertorCase<PushPbbActionCase, A
                 .setActionChoice(pushPbbCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index c56416589bd18b0bb95a14036958ea45beb2e3bc..df5a5d0239d3a81dbb1ab55a9ae238f5ec54b235 100644 (file)
@@ -29,7 +29,8 @@ public class SalToOfPushVlanActionCase extends ConvertorCase<PushVlanActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final PushVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final PushVlanActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         PushVlanAction pushVlanAction = source.getPushVlanAction();
 
         PushVlanCaseBuilder pushVlanCaseBuilder = new PushVlanCaseBuilder();
@@ -45,4 +46,4 @@ public class SalToOfPushVlanActionCase extends ConvertorCase<PushVlanActionCase,
                 .setActionChoice(pushVlanCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index ada4508dbe3a42be1b640aa463a317cabd42e13e..414f57e7c5669e03474b1ccba25fea25fe429f33 100644 (file)
@@ -36,12 +36,9 @@ public class SalToOfSetDlDstActionCase extends ConvertorCase<SetDlDstActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetDlDstAction setdldstaction = source.getSetDlDstAction();
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
-
-        List<MatchEntry> entries = new ArrayList<>();
 
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -52,8 +49,14 @@ public class SalToOfSetDlDstActionCase extends ConvertorCase<SetDlDstActionCase,
         matchBuilder.setHasMask(false);
         ethDstCaseBuilder.setEthDst(ethDstBuilder.build());
         matchBuilder.setMatchEntryValue(ethDstCaseBuilder.build());
+
+        List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
index 31e70c66b4f21880ffdc0120a0c85117a191c794..6b9c5c3a4ca3968ebc43c4f81cf10baed1204a38 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetDlDstActionV10Case extends ConvertorCase<SetDlDstActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetDlDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetDlDstAction setdldstaction = source.getSetDlDstAction();
         SetDlDstCaseBuilder setDlDstCaseBuilder = new SetDlDstCaseBuilder();
         SetDlDstActionBuilder setDlDstActionBuilder = new SetDlDstActionBuilder();
index 736c4b03a5e8e4937d5f88a9c4cf359d8ec2d5ec..018036b8eabc3888fb7ba557f4a414df09f8bf65 100644 (file)
@@ -36,12 +36,10 @@ public class SalToOfSetDlSrcActionCase extends ConvertorCase<SetDlSrcActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetDlSrcAction setdlsrcaction = source.getSetDlSrcAction();
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
 
-        List<MatchEntry> entries = new ArrayList<>();
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
         matchBuilder.setOxmMatchField(EthSrc.class);
@@ -51,8 +49,14 @@ public class SalToOfSetDlSrcActionCase extends ConvertorCase<SetDlSrcActionCase,
         matchBuilder.setHasMask(false);
         ethSrcCaseBuilder.setEthSrc(ethSrcBuilder.build());
         matchBuilder.setMatchEntryValue(ethSrcCaseBuilder.build());
+
+        List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
index f6da183b1888c2eadb9301c2c06584204e574fdd..bf7401fc6009cd149c094bd6e29ad7f90b26e106 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetDlSrcActionV10Case extends ConvertorCase<SetDlSrcActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetDlSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetDlSrcAction setdlsrcaction = source.getSetDlSrcAction();
         SetDlSrcCaseBuilder setDlSrcCaseBuilder = new SetDlSrcCaseBuilder();
         SetDlSrcActionBuilder setDlSrcActionBuilder = new SetDlSrcActionBuilder();
index 9145ae0c7d58a14e88ebb3baaa5196846574f7bb..07066163216b1888c976671e3a9b07ea3be5de98 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetFieldCase extends ConvertorCase<SetFieldCase, Action, Act
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final short version = data.getVersion();
         final SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
 
index 863e30193db115be527171df22fd73f43c984cec..d74ca2935912e35193dc3de64be3da0c9ebea325 100644 (file)
@@ -27,7 +27,8 @@ public class SalToOfSetFieldV10Case extends ConvertorCase<SetFieldCase, Action,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetFieldCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetVlanVidCaseBuilder setVlanVidCaseBuilder = new SetVlanVidCaseBuilder();
 
         if (source.getSetField().getVlanMatch() != null) {
index 957bf38459bb3a3d3c39e60b9e9649f6049d685b..b856213d4a486677569411cb30de69958e984ceb 100644 (file)
@@ -27,7 +27,8 @@ public class SalToOfSetMplsTtlActionCase extends ConvertorCase<SetMplsTtlActionC
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetMplsTtlActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetMplsTtlActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetMplsTtlActionBuilder setMplsTtlBuilder = new SetMplsTtlActionBuilder()
                 .setMplsTtl(source.getSetMplsTtlAction().getMplsTtl());
 
@@ -37,4 +38,4 @@ public class SalToOfSetMplsTtlActionCase extends ConvertorCase<SetMplsTtlActionC
                         .build())
                 .build());
     }
-}
\ No newline at end of file
+}
index d9d58185fc54e944fc2ec8c514f6d81236224422..ce89b0977b834d9159caa8e8fcd3c465161258a1 100644 (file)
@@ -47,14 +47,14 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase<SetNwDstActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwDstAction().getAddress();
 
         if (address instanceof Ipv4) {
             Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv4) address).getIpv4Address().getValue());
             Ipv4Address result = new Ipv4Address(addressParts.iterator().next());
-            List<MatchEntry> matchEntriesList = new ArrayList<>();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
@@ -68,6 +68,8 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase<SetNwDstActionCase,
 
             matchEntryBuilder.setHasMask(false);
             matchEntryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
+
+            List<MatchEntry> matchEntriesList = new ArrayList<>();
             matchEntriesList.add(matchEntryBuilder.build());
 
             SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
@@ -78,7 +80,6 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase<SetNwDstActionCase,
         } else if (address instanceof Ipv6) {
             Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv6) address).getIpv6Address().getValue());
             Ipv6Address result = new Ipv6Address(addressParts.iterator().next());
-            List<MatchEntry> matchEntriesList = new ArrayList<>();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv6Dst.class);
@@ -92,6 +93,8 @@ public class SalToOfSetNwDstActionCase extends ConvertorCase<SetNwDstActionCase,
 
             matchEntryBuilder.setHasMask(false);
             matchEntryBuilder.setMatchEntryValue(ipv6DstCaseBuilder.build());
+
+            List<MatchEntry> matchEntriesList = new ArrayList<>();
             matchEntriesList.add(matchEntryBuilder.build());
 
             SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
index d55fd78a2dd7b9dafefdf2c498e0b2ed0e51fa06..2c683150c08d7a8de467d434d224de2bb49fd236 100644 (file)
@@ -30,7 +30,8 @@ public class SalToOfSetNwDstActionV10Case extends ConvertorCase<SetNwDstActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwDstAction().getAddress();
 
index 2fb9f94923cbc240c81049d62a8f0a349e1f8039..165b891bb6c9f1641f4e58525797af61ab3f2cfd 100644 (file)
@@ -47,7 +47,8 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase<SetNwSrcActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwSrcAction().getAddress();
 
@@ -55,9 +56,6 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase<SetNwSrcActionCase,
             Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv4) address).getIpv4Address().getValue());
             Ipv4Address result = new Ipv4Address(addressParts.iterator().next());
 
-            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
-            List<MatchEntry> entries = new ArrayList<>();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
@@ -71,15 +69,20 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase<SetNwSrcActionCase,
 
             matchEntryBuilder.setHasMask(false);
             matchEntryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
+
+            List<MatchEntry> entries = new ArrayList<>();
             entries.add(matchEntryBuilder.build());
+
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
             setFieldBuilder.setMatchEntry(entries);
+
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
             setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
             builder.setActionChoice(setFieldCaseBuilder.build());
         } else if (address instanceof Ipv6) {
             Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv6) address).getIpv6Address().getValue());
             Ipv6Address result = new Ipv6Address(addressParts.iterator().next());
 
-            List<MatchEntry> matchEntriesList = new ArrayList<>();
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv6Src.class);
@@ -93,6 +96,8 @@ public class SalToOfSetNwSrcActionCase extends ConvertorCase<SetNwSrcActionCase,
 
             matchEntryBuilder.setHasMask(false);
             matchEntryBuilder.setMatchEntryValue(ipv6SrcCaseBuilder.build());
+
+            List<MatchEntry> matchEntriesList = new ArrayList<>();
             matchEntriesList.add(matchEntryBuilder.build());
 
             SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
index 006a5cd01d998fba64096d92fa067bc857cb2932..2a4a16e542542b21e44db696467ef7a2512e08af 100644 (file)
@@ -30,7 +30,8 @@ public class SalToOfSetNwSrcActionV10Case extends ConvertorCase<SetNwSrcActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         final ActionBuilder builder = new ActionBuilder();
         final Address address = source.getSetNwSrcAction().getAddress();
 
index 3ffdd008389dee25b3810faceb1291c2db46fd40..0f43d4c303c046594fb78a0b09604d6b8b504769 100644 (file)
@@ -34,7 +34,8 @@ public class SalToOfSetNwTosActionCase extends ConvertorCase<SetNwTosActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetNwTosAction setnwtosaction = source.getSetNwTosAction();
         SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
@@ -50,4 +51,4 @@ public class SalToOfSetNwTosActionCase extends ConvertorCase<SetNwTosActionCase,
                 .setActionChoice(setFieldCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 80e67fcd4e73cd4e35ff12c4892b2888f37af6e6..65431feed5176f361147160c85323718f270238f 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetNwTosActionV10Case extends ConvertorCase<SetNwTosActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwTosActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetNwTosAction setnwtosaction = source.getSetNwTosAction();
         SetNwTosActionBuilder setNwTosActionBuilder = new SetNwTosActionBuilder();
         SetNwTosCaseBuilder setNwTosCaseBuilder = new SetNwTosCaseBuilder();
@@ -39,4 +40,4 @@ public class SalToOfSetNwTosActionV10Case extends ConvertorCase<SetNwTosActionCa
                 .setActionChoice(setNwTosCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 1d5d5610a1e356da337162b7ccaf2d77ef03fd2f..f4b153486dc81c3331965247d56c3acd20a16535 100644 (file)
@@ -27,7 +27,8 @@ public class SalToOfSetNwTtlActionCase extends ConvertorCase<SetNwTtlActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetNwTtlActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetNwTtlActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetNwTtlCaseBuilder nwTtlCaseBuilder = new SetNwTtlCaseBuilder();
         SetNwTtlActionBuilder nwTtlBuilder = new SetNwTtlActionBuilder();
         nwTtlBuilder.setNwTtl(source.getSetNwTtlAction().getNwTtl());
@@ -37,4 +38,4 @@ public class SalToOfSetNwTtlActionCase extends ConvertorCase<SetNwTtlActionCase,
                 .setActionChoice(nwTtlCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index b433bc844110705714fe2efd34e3e055d2e74e62..9080b43cd2d39f563bd8b281ab30111bbd9f2a31 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetQueueActionCase extends ConvertorCase<SetQueueActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetQueueActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetQueueActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetQueueAction setQueueAction = source.getSetQueueAction();
         SetQueueCaseBuilder setQueueCaseBuilder = new SetQueueCaseBuilder();
         SetQueueActionBuilder setQueueBuilder = new SetQueueActionBuilder();
@@ -39,4 +40,4 @@ public class SalToOfSetQueueActionCase extends ConvertorCase<SetQueueActionCase,
                 .setActionChoice(setQueueCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 81027bfb20c4821af0dcecdb56ea82894ed85648..d02b94b89ee09db3d0bc8c835261cc4d12dc8e4a 100644 (file)
@@ -50,7 +50,8 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         IPProtocols protocol = null;
 
         if (data.getIpProtocol() != null) {
@@ -58,8 +59,6 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
         }
 
         SetTpDstAction settpdstaction = source.getSetTpDstAction();
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
 
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -89,7 +88,8 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
                     matchBuilder.setOxmMatchField(TcpDst.class);
                     TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
                     TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
-                    tcpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber(port));
+                    tcpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
+                            .rev130715.PortNumber(port));
                     tcpDstCaseBuilder.setTcpDst(tcpDstBuilder.build());
                     matchBuilder.setMatchEntryValue(tcpDstCaseBuilder.build());
                     break;
@@ -97,7 +97,8 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
                     matchBuilder.setOxmMatchField(UdpDst.class);
                     UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
                     UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
-                    udpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber(port));
+                    udpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
+                            .rev130715.PortNumber(port));
                     udpDstCaseBuilder.setUdpDst(udpDstBuilder.build());
                     matchBuilder.setMatchEntryValue(udpDstCaseBuilder.build());
                     break;
@@ -111,11 +112,15 @@ public class SalToOfSetTpDstActionCase extends ConvertorCase<SetTpDstActionCase,
 
         List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
                 .setActionChoice(setFieldCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index d870f1ea1bccd2c46cf3cb4aa74e444200187010..70b80bfec39d293b13eb19b700096e2cc8bf4884 100644 (file)
@@ -29,7 +29,8 @@ public class SalToOfSetTpDstActionV10Case extends ConvertorCase<SetTpDstActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetTpDstActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetTpDstAction settpdstaction = source.getSetTpDstAction();
         SetTpDstCaseBuilder setTpDstCaseBuilder = new SetTpDstCaseBuilder();
         SetTpDstActionBuilder setTpDstActionBuilder = new SetTpDstActionBuilder();
@@ -40,4 +41,4 @@ public class SalToOfSetTpDstActionV10Case extends ConvertorCase<SetTpDstActionCa
                 .setActionChoice(setTpDstCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 3844dd0cf0856a515b4639027c6d5d7b45d9bdfe..b2ee69f2475d5df393ad9521b91c1019edc3eceb 100644 (file)
@@ -50,7 +50,8 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         IPProtocols protocol = null;
 
         if (data.getIpProtocol() != null) {
@@ -58,8 +59,6 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
         }
 
         SetTpSrcAction settpsrcaction = source.getSetTpSrcAction();
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
 
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
@@ -90,7 +89,8 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
                     matchBuilder.setOxmMatchField(TcpSrc.class);
                     TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
                     TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
-                    tcpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber(port));
+                    tcpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet
+                            .types.rev130715.PortNumber(port));
                     tcpSrcCaseBuilder.setTcpSrc(tcpSrcBuilder.build());
                     matchBuilder.setMatchEntryValue(tcpSrcCaseBuilder.build());
                     break;
@@ -98,7 +98,8 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
                     matchBuilder.setOxmMatchField(UdpSrc.class);
                     UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
                     UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
-                    udpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber(port));
+                    udpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet
+                            .types.rev130715.PortNumber(port));
                     udpSrcCaseBuilder.setUdpSrc(udpSrcBuilder.build());
                     matchBuilder.setMatchEntryValue(udpSrcCaseBuilder.build());
                     break;
@@ -112,11 +113,15 @@ public class SalToOfSetTpSrcActionCase extends ConvertorCase<SetTpSrcActionCase,
 
         List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
                 .setActionChoice(setFieldCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index c60cfccc372226abe4158d1715cac6ef610f3459..59b49311b28813231d0dd8a5a4b826213c41220a 100644 (file)
@@ -33,7 +33,8 @@ public class SalToOfSetTpSrcActionV10Case extends ConvertorCase<SetTpSrcActionCa
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetTpSrcActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetTpSrcAction settpsrcaction = source.getSetTpSrcAction();
         SetTpSrcCaseBuilder setTpSrcCaseBuilder = new SetTpSrcCaseBuilder();
         SetTpSrcActionBuilder setTpSrcActionBuilder = new SetTpSrcActionBuilder();
@@ -46,4 +47,4 @@ public class SalToOfSetTpSrcActionV10Case extends ConvertorCase<SetTpSrcActionCa
                 .setActionChoice(setTpSrcCaseBuilder.build())
                 .build());
     }
-}
\ No newline at end of file
+}
index 9bd386ca897e4fb71327ed819f1b8da3673cb053..dffd3d89f4ecee6b9c8665066dfa8c6c0ae1b9eb 100644 (file)
@@ -36,11 +36,8 @@ public class SalToOfSetVlanIdActionCase extends ConvertorCase<SetVlanIdActionCas
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
-        SetVlanIdAction setvlanidaction = source.getSetVlanIdAction();
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
-        List<MatchEntry> entries = new ArrayList<>();
+    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
         matchBuilder.setOxmMatchField(VlanVid.class);
@@ -48,11 +45,18 @@ public class SalToOfSetVlanIdActionCase extends ConvertorCase<SetVlanIdActionCas
         VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
         VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
         vlanVidBuilder.setCfiBit(true);
+        SetVlanIdAction setvlanidaction = source.getSetVlanIdAction();
         vlanVidBuilder.setVlanVid(setvlanidaction.getVlanId().getValue());
         vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
         matchBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
+
+        List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
index 2ace31627eb1fb47f61eb31df8ee8b2b518826d2..9e674e3de14a5166db1e8d93ea83e3bbbe0aa45d 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetVlanIdActionV10Case extends ConvertorCase<SetVlanIdAction
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetVlanIdActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetVlanIdAction setvlanidaction = source.getSetVlanIdAction();
         SetVlanVidActionBuilder vlanidActionBuilder = new SetVlanVidActionBuilder();
         SetVlanVidCaseBuilder setVlanVidCaseBuilder = new SetVlanVidCaseBuilder();
index 7ef7221f803da5b1aa7f18e2c83097f02ea9bf33..337b15961062b940854afd2926e9465f27538b8a 100644 (file)
@@ -32,7 +32,8 @@ public class SalToOfSetVlanPcpActionCase extends ConvertorCase<SetVlanPcpActionC
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetVlanPcpAction setvlanpcpaction = source.getSetVlanPcpAction();
         SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
index f6f436cb88010a5c4faa193d04a7307ed1a7aea5..8f2fc39422a87bc0424928f021c3b378cdf86541 100644 (file)
@@ -28,7 +28,8 @@ public class SalToOfSetVlanPcpActionV10Case extends ConvertorCase<SetVlanPcpActi
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final SetVlanPcpActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         SetVlanPcpAction setvlanpcpaction = source.getSetVlanPcpAction();
         SetVlanPcpActionBuilder setVlanPcpActionBuilder = new SetVlanPcpActionBuilder();
         SetVlanPcpCaseBuilder setVlanPcpCaseBuilder = new SetVlanPcpCaseBuilder();
index 8b595adc5bb150d802a278cc30e834e9fae5109d..664f5e4f1e17630c5b1e66fc190920327dda0277 100644 (file)
@@ -35,10 +35,8 @@ public class SalToOfStripVlanActionCase extends ConvertorCase<StripVlanActionCas
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
-        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
-        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
-        List<MatchEntry> entries = new ArrayList<>();
+    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
         matchBuilder.setOxmClass(OpenflowBasicClass.class);
         matchBuilder.setOxmMatchField(VlanVid.class);
@@ -50,8 +48,14 @@ public class SalToOfStripVlanActionCase extends ConvertorCase<StripVlanActionCas
         vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
         matchBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
         matchBuilder.setHasMask(false);
+
+        List<MatchEntry> entries = new ArrayList<>();
         entries.add(matchBuilder.build());
+
+        SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
         setFieldBuilder.setMatchEntry(entries);
+
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
         setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
 
         return Optional.of(new ActionBuilder()
index aff535a02e650e2befc18d49b7d617e057997754..b5da2bc823b29bb84f82685bf2255e92d1ba08bc 100644 (file)
@@ -26,7 +26,8 @@ public class SalToOfStripVlanActionV10Case extends ConvertorCase<StripVlanAction
 
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final StripVlanActionCase source, final ActionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         return Optional.of(new ActionBuilder()
                 .setActionChoice(new StripVlanCaseBuilder().build())
                 .build());
index 25e450e992cc52fd6e4405bf4ec82a0898d221c9..e0e869575b76cde57de6d9733db9b3098ea3af1f 100644 (file)
@@ -22,21 +22,25 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SalToOfVendorCodecCase extends ConvertorCase<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, Action, ActionConvertorData> {
+public class SalToOfVendorCodecCase extends ConvertorCase<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types
+        .rev131112.action.Action, Action, ActionConvertorData> {
     private static final Logger LOG = LoggerFactory.getLogger(SalToOfVendorCodecCase.class);
 
     public SalToOfVendorCodecCase() {
-        super(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action.class, true, OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
+        super(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action.class, true,
+                OFConstants.OFP_VERSION_1_0, OFConstants.OFP_VERSION_1_3);
     }
 
     @SuppressWarnings("unchecked")
     @Nonnull
     @Override
-    public Optional<Action> process(@Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
+    public Optional<Action> process(@Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
+            .action.Action source, final ActionConvertorData data, ConvertorExecutor convertorExecutor) {
         final short version = data.getVersion();
         final TypeVersionKey<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> key =
                 new TypeVersionKey<>(
-                        (Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action>) source.getImplementedInterface(),
+                        (Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
+                                .action.Action>) source.getImplementedInterface(),
                         version);
 
         ExtensionConverterProvider extensionConverterProvider = OFSessionUtil.getExtensionConvertorProvider();
@@ -45,10 +49,10 @@ public class SalToOfVendorCodecCase extends ConvertorCase<org.opendaylight.yang.
             return Optional.empty();
         }
 
-        final ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, Action> convertor =
-                extensionConverterProvider.getConverter(key);
+        final ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112
+            .action.Action, Action> convertor = extensionConverterProvider.getConverter(key);
 
         LOG.trace("OFP Extension action, key:{}, converter:{}", key, convertor);
         return convertor != null ? Optional.of(convertor.convert(source)) : Optional.empty();
     }
-}
\ No newline at end of file
+}
index 493bd2c61cee6b3871759be161b6e822cfb95e1c..9ed4c2a671dc72c3550bd0fa577347000a30a162 100644 (file)
@@ -12,7 +12,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.Versi
 
 /**
  * Convertor data used in {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionConvertor}
- * containing Openflow version, datapath ID and IP protocol from flow
+ * containing Openflow version, datapath ID and IP protocol from flow.
  */
 public class ActionConvertorData extends VersionDatapathIdConvertorData {
     private Short ipProtocol;
index 4782ee908cc967eb1ea74c765869cb7f9288fda0..6be8264bc6b712803180a7a555bbffc21e48f55d 100644 (file)
@@ -12,8 +12,9 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData;
 
 /**
- * Convertor data used in {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionResponseConvertor}
- * containing Openflow version and {@link org.opendaylight.openflowplugin.extension.api.path.ActionPath}
+ * Convertor data used in
+ * {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionResponseConvertor}
+ * containing Openflow version and {@link org.opendaylight.openflowplugin.extension.api.path.ActionPath}.
  */
 public class ActionResponseConvertorData extends ConvertorData {
     private ActionPath actionPath;
index ede61108a35f3c9357360ded213e6a6afc9c0695..6730943ced084b82ed5a4a6556a342fdbd4df2f1 100644 (file)
@@ -14,15 +14,16 @@ import java.util.Map;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 
 /**
- * @param <FROM> source type for conversion
+ * Base class for a conversion reactor.
  *
+ * @param <F> source type for conversion
  */
-public abstract class ConvertReactor<FROM> {
+public abstract class ConvertReactor<F> {
     private final Map<ConvertorKey, ResultInjector<?, ?>> injectionMapping;
-    private final Map<Short, ConvertReactorConvertor<FROM, ?>> conversionMapping;
+    private final Map<Short, ConvertReactorConvertor<F, ?>> conversionMapping;
 
     protected ConvertReactor() {
-        final Map<Short, ConvertReactorConvertor<FROM, ?>> conversions = new HashMap<>();
+        final Map<Short, ConvertReactorConvertor<F, ?>> conversions = new HashMap<>();
         final Map<ConvertorKey, ResultInjector<?, ?>> injections = new HashMap<>();
         initMappings(conversions, injections);
 
@@ -32,41 +33,47 @@ public abstract class ConvertReactor<FROM> {
     }
 
     /**
-     * fill conversion and injection mappings
+     * Fill conversion and injection mappings.
+     *
      * @param conversions convert from
      * @param injections injection
      */
-    protected abstract void initMappings(Map<Short, ConvertReactorConvertor<FROM, ?>> conversions,
+    protected abstract void initMappings(Map<Short, ConvertReactorConvertor<F, ?>> conversions,
             Map<ConvertorKey, ResultInjector<?, ?>> injections);
 
     /**
-     * @param <RESULT> result
-     * @param <TARGET> target
+     * Converts a source to a target.
+     *
+     * @param <R> result
+     * @param <T> target
      * @param source convert from
      * @param version openflow version
      * @param target convert to
-     * @param convertorExecutor
+     * @param convertorExecutor the convertor executor
      */
     @SuppressWarnings("unchecked")
-    public <RESULT, TARGET> void convert(final FROM source, final short version, final TARGET target, final ConvertorExecutor convertorExecutor) {
+    public <R, T> void convert(final F source, final short version, final T target,
+            final ConvertorExecutor convertorExecutor) {
 
         //lookup converter
-        ConvertReactorConvertor<FROM, RESULT> convertor = (ConvertReactorConvertor<FROM, RESULT>) conversionMapping.get(version);
+        ConvertReactorConvertor<F, R> convertor = (ConvertReactorConvertor<F, R>) conversionMapping.get(version);
         if (convertor == null) {
-            throw new IllegalArgumentException("convertor for given version ["+version+"] not found");
+            throw new IllegalArgumentException("convertor for given version [" + version + "] not found");
         }
-        RESULT convertedItem = convertor.convert(source, convertorExecutor);
+        R convertedItem = convertor.convert(source, convertorExecutor);
 
         //lookup injection
         ConvertorKey key = buildInjectionKey(version, convertedItem, target);
-        ResultInjector<RESULT, TARGET> injection = (ResultInjector<RESULT, TARGET>) injectionMapping.get(key);
+        ResultInjector<R, T> injection = (ResultInjector<R, T>) injectionMapping.get(key);
         if (injection == null) {
-            throw new IllegalArgumentException("injector for given version and target ["+key+"] not found");
+            throw new IllegalArgumentException("injector for given version and target [" + key + "] not found");
         }
         injection.inject(convertedItem, target);
     }
 
     /**
+     * Builds an injection key.
+     *
      * @param version openflow version
      * @param convertedItem to be injected
      * @param target object
index 938f9756be84e445e42c96175f32716d29e5a4f3..b9986c759ca8bac4e95f1f084869224fca63f227 100644 (file)
@@ -11,17 +11,18 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 
 /**
- * Converts OpenflowJava to MDSal model and vice versa
+ * Converts OpenflowJava to MDSal model and vice versa.
  *
  * @param <FROM> type of source
  * @param <TO>   type of result
  */
 public interface ConvertReactorConvertor<FROM, TO> {
+
     /**
-     * Converts source to result
+     * Converts source to result.
      *
      * @param source source
-     * @param convertorExecutor
+     * @param convertorExecutor the convertor executor
      * @return converted source
      */
     TO convert(FROM source, ConvertorExecutor convertorExecutor);
index 2afc64e087ed19e2f2de587cb3967aeb37a966bc..1abf095abd7e10ad34f0d1ae74695f99ac97432b 100644 (file)
@@ -12,13 +12,13 @@ import java.util.Collection;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 
 /**
- * Converts OpenflowJava to MDSal model and vice versa
+ * Converts OpenflowJava to MDSal model and vice versa.
  *
- * @param <FROM> type of source
- * @param <TO>   type of result
- * @param <DATA> the type parameter
+ * @param <F> type of source
+ * @param <T>   type of result
+ * @param <D> the type parameter
  */
-public abstract class Convertor<FROM, TO, DATA extends ConvertorData> {
+public abstract class Convertor<F, T, D extends ConvertorData> {
     private ConvertorExecutor convertorExecutor;
 
     /**
@@ -48,11 +48,11 @@ public abstract class Convertor<FROM, TO, DATA extends ConvertorData> {
     public abstract Collection<Class<?>> getTypes();
 
     /**
-     * Converts source to result
+     * Converts source to result.
      *
      * @param source source
      * @param data   convertor data
      * @return converted source
      */
-    public abstract TO convert(FROM source, DATA data);
+    public abstract T convert(F source, D data);
 }
index c1639d0bb514745850dd765d0915798a4c656e8d..3b690bc7a833dbf2b79859467108f429a5dc5a3e 100644 (file)
@@ -16,15 +16,16 @@ import javax.annotation.Nonnull;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 
 /**
- * The Convertor case used in {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorProcessor}.
+ * The Convertor case used in
+ * {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorProcessor}.
  *
- * @param <FROM> the source type
- * @param <TO>   the result type
- * @param <DATA> the data type
+ * @param <F> the source type
+ * @param <T>   the result type
+ * @param <D> the data type
  */
-public abstract class ConvertorCase<FROM, TO, DATA extends ConvertorData> {
+public abstract class ConvertorCase<F, T, D extends ConvertorData> {
     private final List<Short> supportedVersions;
-    private final Class<FROM> type;
+    private final Class<F> type;
     private final boolean errorOnEmpty;
 
     /**
@@ -34,22 +35,22 @@ public abstract class ConvertorCase<FROM, TO, DATA extends ConvertorData> {
      * @param errorOnEmpty      the error on empty
      * @param supportedVersions the supported versions
      */
-    protected ConvertorCase(Class<FROM> type, boolean errorOnEmpty, Short... supportedVersions) {
+    protected ConvertorCase(Class<F> type, boolean errorOnEmpty, Short... supportedVersions) {
         this.type = type;
         this.errorOnEmpty = errorOnEmpty;
         this.supportedVersions = Arrays.asList(Preconditions.checkNotNull(supportedVersions));
     }
 
     /**
-     * Process source and return result, what can be empty
-     *
+     * Process source and return result, what can be empty.
      *
      * @param source the source
      * @param data   the data
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    public abstract Optional<TO> process(@Nonnull final FROM source, final DATA data, final ConvertorExecutor convertorExecutor);
+    public abstract Optional<T> process(@Nonnull final F source, final D data,
+            final ConvertorExecutor convertorExecutor);
 
     /**
      * Should {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorProcessor}
@@ -70,7 +71,7 @@ public abstract class ConvertorCase<FROM, TO, DATA extends ConvertorData> {
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    Optional<TO> processRaw(@Nonnull final Object source, final DATA data, final ConvertorExecutor convertorExecutor) {
+    Optional<T> processRaw(@Nonnull final Object source, final D data, final ConvertorExecutor convertorExecutor) {
         return process(getType().cast(source), data, convertorExecutor);
     }
 
@@ -79,7 +80,7 @@ public abstract class ConvertorCase<FROM, TO, DATA extends ConvertorData> {
      *
      * @return the type
      */
-    Class<FROM> getType() {
+    Class<F> getType() {
         return type;
     }
 
index c25b5a677d77db804c226749567251190d8af15f..94d929d522c61463b9591e3150fe54d6a23e885e 100644 (file)
@@ -14,7 +14,7 @@ import com.google.common.base.Preconditions;
 
 
 /**
- * injection lookup key based on version and target object
+ * Injection lookup key based on version and target object.
  */
 public class ConvertorKey {
 
@@ -22,6 +22,8 @@ public class ConvertorKey {
     private final Class<?> targetClazz;
 
     /**
+     * Constructor.
+     *
      * @param version openflow version
      * @param targetClazz target class
      */
index c06629a225f509135607b579e7876ce33c45ae25..a06eafc3f17fa3652efce624786ca60b73ea319c 100644 (file)
@@ -20,16 +20,16 @@ import org.slf4j.LoggerFactory;
 /**
  * Processes source and return result based on convertor cases added to this processor.
  *
- * @param <FROM> the source type
- * @param <TO>   the result type
- * @param <DATA> the type of convertor data
+ * @param <F> the source type
+ * @param <T>   the result type
+ * @param <D> the type of convertor data
  */
-public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends ConvertorData> {
+public class ConvertorProcessor<F extends DataContainer, T, D extends ConvertorData> {
     private static final short OFP_VERSION_ALL = 0x00;
     private static final Logger LOG = LoggerFactory.getLogger(ConvertorProcessor.class);
 
-    private final Map<Short, Map<Class<?>, ConvertorCase<?, TO, DATA>>> conversions = new ConcurrentHashMap<>();
-    private ConvertorCase<?, TO, DATA> defaultCase;
+    private final Map<Short, Map<Class<?>, ConvertorCase<?, T, D>>> conversions = new ConcurrentHashMap<>();
+    private ConvertorCase<?, T, D> defaultCase;
 
     /**
      * Add convertor processor case.
@@ -37,7 +37,7 @@ public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends Con
      * @param processorCase the processor case
      * @return the convertor processor
      */
-    public ConvertorProcessor<FROM, TO, DATA> addCase(final ConvertorCase<?, TO, DATA> processorCase) {
+    public ConvertorProcessor<F, T, D> addCase(final ConvertorCase<?, T, D> processorCase) {
         if (processorCase.getSupportedVersions().isEmpty()) {
             getCasesForVersion(OFP_VERSION_ALL).putIfAbsent(processorCase.getType(), processorCase);
         } else {
@@ -56,7 +56,7 @@ public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends Con
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    public Optional<TO> process(final FROM source, final ConvertorExecutor convertorExecutor) {
+    public Optional<T> process(final F source, final ConvertorExecutor convertorExecutor) {
         return process(source, null, convertorExecutor);
     }
 
@@ -68,8 +68,8 @@ public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends Con
      * @param convertorExecutor convertor executor
      * @return the optional
      */
-    public Optional<TO> process(final FROM source, final DATA data, final ConvertorExecutor convertorExecutor) {
-        Optional<TO> result = Optional.empty();
+    public Optional<T> process(final F source, final D data, final ConvertorExecutor convertorExecutor) {
+        Optional<T> result = Optional.empty();
         final short version = data != null ? data.getVersion() : OFP_VERSION_ALL;
 
         if (Objects.isNull(source)) {
@@ -78,10 +78,10 @@ public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends Con
         }
 
         final Class<?> clazz = source.getImplementedInterface();
-        final Optional<ConvertorCase<?, TO, DATA>> caseOptional = Optional
+        final Optional<ConvertorCase<?, T, D>> caseOptional = Optional
                 .ofNullable(getCasesForVersion(version).get(clazz));
 
-        final ConvertorCase<?, TO, DATA> processorCase = caseOptional.orElse(defaultCase);
+        final ConvertorCase<?, T, D> processorCase = caseOptional.orElse(defaultCase);
 
         if (Objects.nonNull(processorCase)) {
             result = processorCase.processRaw(source, data, convertorExecutor);
@@ -102,13 +102,13 @@ public class ConvertorProcessor<FROM extends DataContainer, TO, DATA extends Con
      * @param defaultCase the default case
      * @return the default case
      */
-    public ConvertorProcessor<FROM, TO, DATA> setDefaultCase(final ConvertorCase<?, TO, DATA> defaultCase) {
+    public ConvertorProcessor<F, T, D> setDefaultCase(final ConvertorCase<?, T, D> defaultCase) {
         this.defaultCase = defaultCase;
         return this;
     }
 
-    private Map<Class<?>, ConvertorCase<?, TO, DATA>> getCasesForVersion(final short version) {
-        final Map<Class<?>, ConvertorCase<?, TO, DATA>> casesForVersion =
+    private Map<Class<?>, ConvertorCase<?, T, D>> getCasesForVersion(final short version) {
+        final Map<Class<?>, ConvertorCase<?, T, D>> casesForVersion =
                 conversions.getOrDefault(version, new ConcurrentHashMap<>());
 
         conversions.putIfAbsent(version, casesForVersion);
index caec87b676742533c44f1394c143abda29c58b68..7aa0eb37d97bf0e4c0c29552e3c995e0e9e1f688 100644 (file)
@@ -13,28 +13,28 @@ import com.google.common.collect.ImmutableMap.Builder;
 import java.util.Map;
 
 /**
+ * Enumerates IP protocols.
  * @author tkubas
- *
  */
-//TODO make a model in YANG for protocols 
+// TODO make a model in YANG for protocols
 public enum IPProtocols {
-    ICMP((short) 1), 
-    TCP((short) 6), 
-    UDP((short) 17), 
+    ICMP((short) 1),
+    TCP((short) 6),
+    UDP((short) 17),
     ICMPV6((short) 58);
 
     private short protocol;
-    
+
     private static final Map<Short, IPProtocols> VALUE_MAP;
     static {
         Builder<Short, IPProtocols> builder = ImmutableMap.builder();
-        for(IPProtocols protocols : IPProtocols.values()) {
+        for (IPProtocols protocols : IPProtocols.values()) {
             builder.put(protocols.protocol, protocols);
         }
         VALUE_MAP = builder.build();
     }
-    
-    private IPProtocols(short value) {
+
+    IPProtocols(short value) {
         this.protocol = value;
     }
 
index f5b8c44d5a5461def93e1c974564e9904bec45bf..88ccb1ab0afb6fcd8f311a5ac1e97d048a3e56c0 100644 (file)
@@ -53,6 +53,7 @@ public final class IpConversionUtil {
      * the table is contiguous and save some space.
      */
     private static final byte[] PREFIX_BYTEARRAYS;
+
     static {
         final byte[] a = new byte[(INADDR6SZ * Byte.SIZE + 1) * INADDR6SZ];
 
@@ -101,11 +102,11 @@ public final class IpConversionUtil {
      *   that happens, it will be a simple fix here without chasing it across the whole plugin.
     */
 
-    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address){
+    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address) {
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address);
     }
 
-    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final String mask){
+    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final String mask) {
         /*
          * Ipv4Address has already validated the address part of the prefix,
          * It is mandated to comply to the same regexp as the address
@@ -119,11 +120,11 @@ public final class IpConversionUtil {
         }
     }
 
-    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final int intmask){
+    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final int intmask) {
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address, intmask);
     }
 
-    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final byte [] bytemask){
+    public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final byte [] bytemask) {
         if (bytemask == null) {
             return createPrefix(ipv4Address);
         }
@@ -131,39 +132,11 @@ public final class IpConversionUtil {
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address, countBits(bytemask));
     }
 
-    public static DottedQuad createArbitraryBitMask(final byte [] bitmask)  {
-        DottedQuad dottedQuad = null;
-        if (bitmask == null ) {
-            dottedQuad = new DottedQuad(DEFAULT_ARBITRARY_BIT_MASK);
-        } else {
-            try {
-                dottedQuad = new DottedQuad(InetAddress.getByAddress(bitmask).getHostAddress());
-            } catch (UnknownHostException e) {
-                LOG.error("Failed to create the dottedQuad notation for the given mask ", e);
-            }
-        }
-        return dottedQuad;
-    }
-
-    public static Ipv6ArbitraryMask createIpv6ArbitraryBitMask(final byte [] bitmask) {
-        Ipv6ArbitraryMask ipv6ArbitraryMask = null;
-        if (bitmask == null ) {
-            ipv6ArbitraryMask = new Ipv6ArbitraryMask(DEFAULT_IPV6_ARBITRARY_BITMASK);
-        } else {
-            try {
-                ipv6ArbitraryMask = new Ipv6ArbitraryMask(InetAddress.getByAddress(bitmask).getHostAddress());
-            } catch (UnknownHostException e) {
-                LOG.error("Failed to create the Ipv6ArbitraryMask notation for the given mask ", e);
-            }
-        }
-        return ipv6ArbitraryMask;
-    }
-
-    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address){
+    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address) {
         return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address);
     }
 
-    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final String mask){
+    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final String mask) {
         /*
          * Ipv6Address has already validated the address part of the prefix,
          * It is mandated to comply to the same regexp as the address
@@ -177,11 +150,11 @@ public final class IpConversionUtil {
         }
     }
 
-    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final int intmask){
+    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final int intmask) {
         return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address, intmask);
     }
 
-    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final byte [] bytemask){
+    public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final byte [] bytemask) {
         if (bytemask == null) {
             return createPrefix(ipv6Address);
         }
@@ -189,6 +162,34 @@ public final class IpConversionUtil {
         return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address, countBits(bytemask));
     }
 
+    public static DottedQuad createArbitraryBitMask(final byte [] bitmask)  {
+        DottedQuad dottedQuad = null;
+        if (bitmask == null) {
+            dottedQuad = new DottedQuad(DEFAULT_ARBITRARY_BIT_MASK);
+        } else {
+            try {
+                dottedQuad = new DottedQuad(InetAddress.getByAddress(bitmask).getHostAddress());
+            } catch (UnknownHostException e) {
+                LOG.error("Failed to create the dottedQuad notation for the given mask ", e);
+            }
+        }
+        return dottedQuad;
+    }
+
+    public static Ipv6ArbitraryMask createIpv6ArbitraryBitMask(final byte [] bitmask) {
+        Ipv6ArbitraryMask ipv6ArbitraryMask = null;
+        if (bitmask == null) {
+            ipv6ArbitraryMask = new Ipv6ArbitraryMask(DEFAULT_IPV6_ARBITRARY_BITMASK);
+        } else {
+            try {
+                ipv6ArbitraryMask = new Ipv6ArbitraryMask(InetAddress.getByAddress(bitmask).getHostAddress());
+            } catch (UnknownHostException e) {
+                LOG.error("Failed to create the Ipv6ArbitraryMask notation for the given mask ", e);
+            }
+        }
+        return ipv6ArbitraryMask;
+    }
+
     public static Integer extractPrefix(final Ipv4Prefix ipv4Prefix) {
         return IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix).getValue();
     }
@@ -230,7 +231,7 @@ public final class IpConversionUtil {
 
 
      /**
-     * Convert Ipv6Address object to a valid Canonical v6 address in byte format
+     * Convert Ipv6Address object to a valid Canonical v6 address in byte format.
      *
      * @param ipv6Address - v6 Address object
      * @return - byte array of size 16. Last byte contains netmask
@@ -247,7 +248,7 @@ public final class IpConversionUtil {
 
 
     private static byte[] canonicalBinaryV6AddressFromString(final String ipv6Address) {
-       Iterable<String> splittedV6Address = Splitter.on("%")
+        Iterable<String> splittedV6Address = Splitter.on("%")
                 .trimResults()
                 .omitEmptyStrings()
                 .split(ipv6Address);
@@ -255,20 +256,17 @@ public final class IpConversionUtil {
 
         int colonp;
         char ch;
-        boolean saw_xdigit;
+        boolean sawXdigit;
 
         /* Isn't it fun - the above variable names are the same in BSD and Sun sources */
 
-        int val;
-
         char[] src = partsV6Address.get(0).toCharArray();
 
         byte[] dst = new byte[INADDR6SZ];
 
-        int src_length = src.length;
-
         colonp = -1;
-        int i = 0, j = 0;
+        int index1 = 0;
+        int index2 = 0;
 
         /* Leading :: requires some special handling. */
 
@@ -277,17 +275,17 @@ public final class IpConversionUtil {
          * in original Clingon. So does Dilbert.
          */
 
-        if (src[i] == ':') {
-            Preconditions.checkArgument(src[++i] == ':', "Invalid v6 address");
+        if (src[index1] == ':') {
+            Preconditions.checkArgument(src[++index1] == ':', "Invalid v6 address");
         }
 
-        int curtok = i;
-        saw_xdigit = false;
+        int curtok = index1;
+        sawXdigit = false;
 
-
-        val = 0;
-        while (i < src_length) {
-            ch = src[i++];
+        int srcLength = src.length;
+        int val = 0;
+        while (index1 < srcLength) {
+            ch = src[index1++];
             int chval = Character.digit(ch, 16);
 
             /* Business as usual - ipv6 address digit.
@@ -299,32 +297,32 @@ public final class IpConversionUtil {
             if (chval != -1) {
                 val <<= 4;
                 val |= chval;
-                saw_xdigit = true;
+                sawXdigit = true;
                 continue;
             }
 
             /* v6 separator */
 
             if (ch == ':') {
-                curtok = i;
-                if (!saw_xdigit) {
+                curtok = index1;
+                if (!sawXdigit) {
                     /* no need to check separator position validity - regexp does that */
-                    colonp = j;
+                    colonp = index2;
                     continue;
                 }
 
                 /* removed overrun check - the regexp checks for valid data */
 
-                dst[j++] = (byte) ((val >>> 8) & 0xff);
-                dst[j++] = (byte) (val & 0xff);
-                saw_xdigit = false;
+                dst[index2++] = (byte) (val >>> 8 & 0xff);
+                dst[index2++] = (byte) (val & 0xff);
+                sawXdigit = false;
                 val = 0;
                 continue;
             }
 
             /* frankenstein - v4 attached to v6, mixed notation */
 
-            if (ch == '.' && ((j + INADDR4SZ) <= INADDR6SZ)) {
+            if (ch == '.' && index2 + INADDR4SZ <= INADDR6SZ) {
 
                 /* this has passed the regexp so it is fairly safe to parse it
                  * straight away. As v4 addresses do not suffer from the same
@@ -332,46 +330,46 @@ public final class IpConversionUtil {
                  * straight away and be done with it
                  */
 
-                Preconditions.checkArgument(j != (INADDR6SZ - INADDR4SZ - 1), "Invalid v4 in v6 mapping");
+                Preconditions.checkArgument(index2 != INADDR6SZ - INADDR4SZ - 1, "Invalid v4 in v6 mapping");
 
-                InetAddress _inet_form = InetAddresses.forString(partsV6Address.get(0).substring(curtok, src_length));
+                InetAddress inetForm = InetAddresses.forString(partsV6Address.get(0).substring(curtok, srcLength));
 
-                Preconditions.checkArgument(_inet_form instanceof Inet4Address);
-                System.arraycopy(_inet_form.getAddress(), 0, dst, j, INADDR4SZ);
-                j += INADDR4SZ;
+                Preconditions.checkArgument(inetForm instanceof Inet4Address);
+                System.arraycopy(inetForm.getAddress(), 0, dst, index2, INADDR4SZ);
+                index2 += INADDR4SZ;
 
-                saw_xdigit = false;
+                sawXdigit = false;
                 break;
             }
             /* removed parser exit on invalid char - no need to do it, regexp checks it */
         }
-        if (saw_xdigit) {
-            Preconditions.checkArgument(j + INT16SZ <= INADDR6SZ, "Overrun in v6 parsing, should not occur");
-            dst[j++] = (byte) ((val >> 8) & 0xff);
-            dst[j++] = (byte) (val & 0xff);
+        if (sawXdigit) {
+            Preconditions.checkArgument(index2 + INT16SZ <= INADDR6SZ, "Overrun in v6 parsing, should not occur");
+            dst[index2++] = (byte) (val >> 8 & 0xff);
+            dst[index2++] = (byte) (val & 0xff);
         }
 
         if (colonp != -1) {
-            int n = j - colonp;
+            int to = index2 - colonp;
 
-            Preconditions.checkArgument(j != INADDR6SZ, "Overrun in v6 parsing, should not occur");
-            for (i = 1; i <= n; i++) {
-                dst[INADDR6SZ - i] = dst[colonp + n - i];
-                dst[colonp + n - i] = 0;
+            Preconditions.checkArgument(index2 != INADDR6SZ, "Overrun in v6 parsing, should not occur");
+            for (index1 = 1; index1 <= to; index1++) {
+                dst[INADDR6SZ - index1] = dst[colonp + to - index1];
+                dst[colonp + to - index1] = 0;
             }
-            j = INADDR6SZ;
+            index2 = INADDR6SZ;
         }
 
-        Preconditions.checkArgument(j == INADDR6SZ, "Overrun in v6 parsing, should not occur");
+        Preconditions.checkArgument(index2 == INADDR6SZ, "Overrun in v6 parsing, should not occur");
 
         return dst;
     }
 
-    public static String byteArrayV6AddressToString (final byte [] _binary_form) throws UnknownHostException {
+    public static String byteArrayV6AddressToString(final byte [] binaryForm) throws UnknownHostException {
         /* DO NOT DIY!!! - InetAddresses will actually print correct canonical
          * zero compressed form.
          */
-        return InetAddresses.toAddrString(InetAddress.getByAddress(_binary_form));
+        return InetAddresses.toAddrString(InetAddress.getByAddress(binaryForm));
     }
 
     private static int nextNibble(final int mask) {
@@ -381,11 +379,11 @@ public final class IpConversionUtil {
         if (mask > 8) {
             return 0xff;
         }
-        return 0xff << (8 - mask);
+        return 0xff << 8 - mask;
     }
 
     /**
-     * Convert Ipv6Prefix object to a valid Canonical v6 prefix in byte format
+     * Convert Ipv6Prefix object to a valid Canonical v6 prefix in byte format.
      *
      * @param ipv6Prefix - v6 prefix object
      * @return - byte array of size 16 + 1. Last byte contains netmask
@@ -397,7 +395,7 @@ public final class IpConversionUtil {
          * the input is validated via regexps in Ipv6Prefix()
          */
 
-        int mask = 128;
+        int initialMask = 128;
 
         Iterable<String> splittedV6Prefix = Splitter.on("/")
                 .trimResults()
@@ -408,8 +406,8 @@ public final class IpConversionUtil {
         boolean valid = true;
 
         try {
-            mask = Integer.parseInt(partsV6Prefix.get(1));
-            if (mask > 128) {
+            initialMask = Integer.parseInt(partsV6Prefix.get(1));
+            if (initialMask > 128) {
                 valid = false;
             }
         } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
@@ -421,22 +419,19 @@ public final class IpConversionUtil {
 
         int colonp;
         char ch;
-        boolean saw_xdigit;
+        boolean sawXdigit;
 
         /* Isn't it fun - the above variable names are the same in BSD and Sun sources */
 
-        int val;
-
         char[] src = partsV6Prefix.get(0).toCharArray();
 
         byte[] dst = new byte[INADDR6SZ + 1];
 
-        int m = mask;
-
-        int src_length = src.length;
+        int mask = initialMask;
 
         colonp = -1;
-        int i = 0, j = 0;
+        int index1 = 0;
+        int index2 = 0;
 
         /* Leading :: requires some special handling. */
 
@@ -445,17 +440,17 @@ public final class IpConversionUtil {
          * in original Clingon. So does Dilbert.
          */
 
-        if (src[i] == ':') {
-            Preconditions.checkArgument(src[++i] == ':', "Invalid v6 address");
+        if (src[index1] == ':') {
+            Preconditions.checkArgument(src[++index1] == ':', "Invalid v6 address");
         }
 
-        int curtok = i;
-        saw_xdigit = false;
-
+        int curtok = index1;
+        sawXdigit = false;
 
-        val = 0;
-        while (i < src_length) {
-            ch = src[i++];
+        int srcLength = src.length;
+        int val = 0;
+        while (index1 < srcLength) {
+            ch = src[index1++];
             int chval = Character.digit(ch, 16);
 
             /* Business as usual - ipv6 address digit.
@@ -467,37 +462,41 @@ public final class IpConversionUtil {
             if (chval != -1) {
                 val <<= 4;
                 val |= chval;
-                saw_xdigit = true;
+                sawXdigit = true;
                 continue;
             }
 
             /* v6 separator */
 
             if (ch == ':') {
-                curtok = i;
-                if (!saw_xdigit) {
+                curtok = index1;
+                if (!sawXdigit) {
                     /* no need to check separator position validity - regexp does that */
-                    colonp = j;
+                    colonp = index2;
                     continue;
                 }
 
                 /* removed overrun check - the regexp checks for valid data */
 
-                saw_xdigit = false;
+                sawXdigit = false;
 
-                if (m < 0) {
+                if (mask < 0) {
                     /* stop parsing if we are past the mask */
                     break;
                 }
 
-                dst[j] = (byte) ((val >> 8) & nextNibble(m)); j++; m = m - 8;
+                dst[index2] = (byte) (val >> 8 & nextNibble(mask));
+                index2++;
+                mask = mask - 8;
 
-                if (m < 0) {
+                if (mask < 0) {
                     /* stop parsing if we are past the mask */
                     break;
                 }
 
-                dst[j] = (byte) (val & nextNibble(m)); j++; m = m - 8;
+                dst[index2] = (byte) (val & nextNibble(mask));
+                index2++;
+                mask = mask - 8;
 
                 val = 0;
                 continue;
@@ -505,7 +504,7 @@ public final class IpConversionUtil {
 
             /* frankenstein - v4 attached to v6, mixed notation */
 
-            if (ch == '.' && ((j + INADDR4SZ) <= INADDR6SZ)) {
+            if (ch == '.' && index2 + INADDR4SZ <= INADDR6SZ) {
 
                 /* this has passed the regexp so it is fairly safe to parse it
                  * straight away. As v4 addresses do not suffer from the same
@@ -513,56 +512,61 @@ public final class IpConversionUtil {
                  * straight away and be done with it
                  */
 
-                Preconditions.checkArgument(j != (INADDR6SZ - INADDR4SZ - 1), "Invalid v4 in v6 mapping");
+                Preconditions.checkArgument(index2 != INADDR6SZ - INADDR4SZ - 1, "Invalid v4 in v6 mapping");
 
-                InetAddress _inet_form = InetAddresses.forString(partsV6Prefix.get(0).substring(curtok, src_length));
+                InetAddress inetForm = InetAddresses.forString(partsV6Prefix.get(0).substring(curtok, srcLength));
 
-                Preconditions.checkArgument(_inet_form instanceof Inet4Address);
-                System.arraycopy(_inet_form.getAddress(), 0, dst, j, INADDR4SZ);
-                j +=  INADDR4SZ;
+                Preconditions.checkArgument(inetForm instanceof Inet4Address);
+                System.arraycopy(inetForm.getAddress(), 0, dst, index2, INADDR4SZ);
+                index2 +=  INADDR4SZ;
 
-                saw_xdigit = false;
+                sawXdigit = false;
                 break;
             }
             /* removed parser exit on ivalid char - no need to do it, regexp checks it */
         }
-        if (saw_xdigit) {
-            Preconditions.checkArgument(j + INT16SZ <= INADDR6SZ, "Overrun in v6 parsing, should not occur");
-            dst[j] = (byte) ((val >> 8) & nextNibble(m)) ; j++; m = m - 8;
-            dst[j] = (byte) (val & nextNibble(m)); j++; m = m - 8;
+        if (sawXdigit) {
+            Preconditions.checkArgument(index2 + INT16SZ <= INADDR6SZ, "Overrun in v6 parsing, should not occur");
+            dst[index2] = (byte) (val >> 8 & nextNibble(mask));
+            index2++;
+            mask = mask - 8;
+            dst[index2] = (byte) (val & nextNibble(mask));
+            index2++;
+            mask = mask - 8;
         }
 
-        if ((j < INADDR6SZ) && (m < 0)) {
+        if (index2 < INADDR6SZ && mask < 0) {
             /* past the mask */
-            for (i = j; i < INADDR6SZ; i++) {
-                dst[i] = 0;
+            for (index1 = index2; index1 < INADDR6SZ; index1++) {
+                dst[index1] = 0;
             }
         } else {
             /* normal parsing */
             if (colonp != -1) {
-                int n = j - colonp;
+                int to = index2 - colonp;
 
-                Preconditions.checkArgument(j != INADDR6SZ, "Overrun in v6 parsing, should not occur");
-                for (i = 1; i <= n; i++) {
-                    dst[INADDR6SZ - i] = dst[colonp + n - i];
-                    dst[colonp + n - i] = 0;
+                Preconditions.checkArgument(index2 != INADDR6SZ, "Overrun in v6 parsing, should not occur");
+                for (index1 = 1; index1 <= to; index1++) {
+                    dst[INADDR6SZ - index1] = dst[colonp + to - index1];
+                    dst[colonp + to - index1] = 0;
                 }
-                j = INADDR6SZ;
+                index2 = INADDR6SZ;
             }
-            Preconditions.checkArgument(j == INADDR6SZ, "Overrun in v6 parsing, should not occur");
+            Preconditions.checkArgument(index2 == INADDR6SZ, "Overrun in v6 parsing, should not occur");
         }
 
-        dst[INADDR6SZ] = (byte) mask;
+        dst[INADDR6SZ] = (byte) initialMask;
         return dst;
     }
 
     /**
-     * Print a v6 prefix in byte array + 1 notation
-     * @param _binary_form - prefix, in byte [] form, last byte is netmask
+     * Print a v6 prefix in byte array + 1 notation.
+     *
+     * @param binaryForm - prefix, in byte [] form, last byte is netmask
      * @return string of v6 prefix
      * @throws UnknownHostException unknown host exception
      */
-    public static String byteArrayV6PrefixToString(final byte [] _binary_form) throws UnknownHostException {
+    public static String byteArrayV6PrefixToString(final byte [] binaryForm) throws UnknownHostException {
         /* NO DIY!!! - InetAddresses will actually print correct canonical
          * zero compressed form
          */
@@ -573,17 +577,17 @@ public final class IpConversionUtil {
         sb.append(
             InetAddresses.toAddrString(
                 InetAddress.getByAddress(
-                    Arrays.copyOf(_binary_form, INADDR6SZ)
+                    Arrays.copyOf(binaryForm, INADDR6SZ)
                 )
             )
         );
         sb.append('/');
-        sb.append(_binary_form[INADDR6SZ] & 0xff);
+        sb.append(binaryForm[INADDR6SZ] & 0xff);
         return sb.toString();
     }
 
     /**
-     * Check if the supplied IPv6Address has any prefix
+     * Check if the supplied IPv6Address has any prefix.
      *
      * @param ipv6Prefix Ipv6 prefix
      * @return prefix if there is one, else null
@@ -607,7 +611,7 @@ public final class IpConversionUtil {
     }
 
     /**
-     * Canonicalize a v6 prefix while in binary form
+     * Canonicalize a v6 prefix while in binary form.
      *
      * @param prefix - prefix, in byte [] form
      * @param mask - mask - number of bits
@@ -638,13 +642,14 @@ public final class IpConversionUtil {
     public static DottedQuad extractIpv4AddressMask(final Ipv4Prefix ipv4Prefix) {
         Iterator<String> addressParts = PREFIX_SPLITTER.split(ipv4Prefix.getValue()).iterator();
         addressParts.next();
-        Integer cidrMask =0;
+        Integer cidrMask = 0;
         if (addressParts.hasNext()) {
             cidrMask = Integer.parseInt(addressParts.next());
         }
         long maskBits = 0;
         maskBits = 0xffffffff << IPV4_ADDRESS_LENGTH - cidrMask;
-        String mask = String.format("%d.%d.%d.%d", (maskBits & 0x0000000000ff000000L) >> 24, (maskBits & 0x0000000000ff0000) >> 16, (maskBits & 0x0000000000ff00) >> 8, maskBits & 0xff);
+        String mask = String.format("%d.%d.%d.%d", (maskBits & 0x0000000000ff000000L) >> 24,
+                (maskBits & 0x0000000000ff0000) >> 16, (maskBits & 0x0000000000ff00) >> 8, maskBits & 0xff);
         DottedQuad netMask = new DottedQuad(mask);
         return netMask;
     }
@@ -658,7 +663,7 @@ public final class IpConversionUtil {
         }
         BitSet ipmask = new BitSet(128);
         ipmask.set(0,maskLength,true);
-        ipmask.set(maskLength+1,128,false);
+        ipmask.set(maskLength + 1,128,false);
         byte[] finalmask = new byte[16];
         System.arraycopy(ipmask.toByteArray(),0,finalmask,0,ipmask.toByteArray().length);
         InetAddress inetAddress = null;
@@ -682,10 +687,10 @@ public final class IpConversionUtil {
         return netmask;
     }
 
-    public static final byte[] convertArbitraryMaskToByteArray(DottedQuad mask) {
+    public static byte[] convertArbitraryMaskToByteArray(DottedQuad mask) {
         String maskValue;
         if (mask != null && mask.getValue() != null) {
-           maskValue  = mask.getValue();
+            maskValue  = mask.getValue();
         } else {
             maskValue = DEFAULT_ARBITRARY_BIT_MASK;
         }
@@ -693,7 +698,7 @@ public final class IpConversionUtil {
         try {
             maskInIpFormat = InetAddress.getByName(maskValue);
         } catch (UnknownHostException e) {
-            LOG.error ("Failed to resolve the ip address of the mask ",e);
+            LOG.error("Failed to resolve the ip address of the mask ", e);
         }
         byte[] bytes = maskInIpFormat.getAddress();
         return bytes;
@@ -703,11 +708,11 @@ public final class IpConversionUtil {
         if (byteMask == null) {
             return false;
         } else {
-            ArrayList<Integer> integerMaskArrayList = new ArrayList<Integer>();
+            ArrayList<Integer> integerMaskArrayList = new ArrayList<>();
             String maskInBits;
             // converting byte array to bits
             maskInBits = new BigInteger(1, byteMask).toString(2);
-            ArrayList<String> stringMaskArrayList = new ArrayList<String>(Arrays.asList(maskInBits.split("(?!^)")));
+            ArrayList<String> stringMaskArrayList = new ArrayList<>(Arrays.asList(maskInBits.split("(?!^)")));
             for (String string:stringMaskArrayList) {
                 integerMaskArrayList.add(Integer.parseInt(string));
             }
@@ -717,12 +722,12 @@ public final class IpConversionUtil {
 
     private static boolean checkArbitraryBitMask(ArrayList<Integer> arrayList) {
         // checks 0*1* case - Leading zeros in arrayList are truncated
-        if (arrayList.size()>0 && arrayList.size()<IPV4_ADDRESS_LENGTH) {
+        if (arrayList.size() > 0 && arrayList.size() < IPV4_ADDRESS_LENGTH) {
             return true;
         } else {
-            //checks 1*0*1 case
-            for (int i=0; i<arrayList.size()-1;i++) {
-                if (arrayList.get(i) ==0 && arrayList.get(i+1) == 1) {
+            // checks 1*0*1 case
+            for (int i = 0; i < arrayList.size() - 1; i++) {
+                if (arrayList.get(i) == 0 && arrayList.get(i + 1) == 1) {
                     return true;
                 }
             }
@@ -730,7 +735,7 @@ public final class IpConversionUtil {
         return false;
     }
 
-    public static final byte[] convertIpv6ArbitraryMaskToByteArray(final Ipv6ArbitraryMask mask) {
+    public static byte[] convertIpv6ArbitraryMaskToByteArray(final Ipv6ArbitraryMask mask) {
         String maskValue;
         if (mask != null && mask.getValue() != null) {
             maskValue  = mask.getValue();
@@ -741,7 +746,7 @@ public final class IpConversionUtil {
         try {
             maskInIpFormat = InetAddress.getByName(maskValue);
         } catch (UnknownHostException e) {
-            LOG.error ("Failed to convert mask string to ipv6 format mask ",e);
+            LOG.error("Failed to convert mask string to ipv6 format mask ",e);
         }
         return maskInIpFormat.getAddress();
     }
@@ -750,11 +755,11 @@ public final class IpConversionUtil {
         if (byteMask == null) {
             return false;
         } else {
-            ArrayList<Integer> integerMaskArrayList = new ArrayList<Integer>();
+            ArrayList<Integer> integerMaskArrayList = new ArrayList<>();
             String maskInBits;
             // converting byte array to bits
             maskInBits = new BigInteger(1, byteMask).toString(2);
-            ArrayList<String> stringMaskArrayList = new ArrayList<String>(Arrays.asList(maskInBits.split("(?!^)")));
+            ArrayList<String> stringMaskArrayList = new ArrayList<>(Arrays.asList(maskInBits.split("(?!^)")));
             for (String string:stringMaskArrayList) {
                 integerMaskArrayList.add(Integer.parseInt(string));
             }
@@ -768,8 +773,8 @@ public final class IpConversionUtil {
             return true;
         } else {
             //checks 1*0*1 case
-            for (int i=0; i<arrayList.size()-1;i++) {
-                if (arrayList.get(i) ==0 && arrayList.get(i+1) == 1) {
+            for (int i = 0; i < arrayList.size() - 1; i++) {
+                if (arrayList.get(i) == 0 && arrayList.get(i + 1) == 1) {
                     return true;
                 }
             }
index cb2cb1edf1e18eab06855d8fb7b6bdd4fd7755a9..92d42ab2b5256883e498bc0e4ab911621c6590b2 100644 (file)
@@ -8,8 +8,8 @@
 
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Ordered;
 import java.util.Comparator;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Ordered;
 
 /**
  * Comparator for comparing objects which extend Ordered.
@@ -28,7 +28,7 @@ public class OrderComparator<T extends Ordered> implements Comparator<T> {
 
     @Override
     public int compare(T obj1, T obj2) {
-        if(obj1 ==null || obj2==null ) {
+        if (obj1 == null || obj2 == null) {
             throw new NullPointerException("Cannot compare null Actions");
         } else if (obj1.getOrder() == null) {
             throw new NullPointerException(errorMsg(obj1));
index 43988815623b3d1eb3f217068d476422d8b5ab79..c02076807f1246b1eda04f4a2e405699773aa556 100644 (file)
@@ -9,17 +9,18 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common;
 
 /**
- * Injecting match object into chosen target
- * 
- * @param <R> result to inject (e.g.: OF-API match) 
+ * Injecting match object into chosen target.
+ *
+ * @param <R> result to inject (e.g.: OF-API match)
  * @param <T> target of injection
  */
 public interface ResultInjector<R, T> {
 
     /**
+     * Inject result into target.
+     *
      * @param result result
      * @param target target
      */
     void inject(R result, T target);
-    
 }