Further warning removal

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / match / cases / SalToOfIpv4MatchCase.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java
index 1c7a907a3c09e4f933dfe026e8ca33ed00cfdba4..3fddd2419d2e8345cf21c642272c1ffffba3e5b6 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv4MatchCase.java
@@ -12,7 +12,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorCase;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IpConversionUtil;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
@@ -36,7 +37,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
     }
 
     @Override
-    public Optional<List<MatchEntry>> process(@Nonnull Ipv4Match source, VersionConvertorData data) {
+    public Optional<List<MatchEntry>> process(@NonNull Ipv4Match source, VersionConvertorData data,
+            ConvertorExecutor convertorExecutor) {
         List<MatchEntry> result = new ArrayList<>();
 
         if (source.getIpv4Source() != null) {
@@ -45,7 +47,6 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
 
-            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -60,6 +61,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
             ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
             result.add(matchEntryBuilder.build());
@@ -71,7 +74,6 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
             matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
 
-            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
 
             Iterator<String> addressParts = IpConversionUtil.splitToParts(ipv4Prefix);
@@ -86,6 +88,8 @@ public class SalToOfIpv4MatchCase extends ConvertorCase<Ipv4Match, List<MatchEnt
             }
 
             matchEntryBuilder.setHasMask(hasMask);
+
+            Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
             ipv4DstCaseBuilder.setIpv4Dst(ipv4DstBuilder.build());
             matchEntryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
             result.add(matchEntryBuilder.build());