Merge "Refactoring of 'extractIpv4Mask' method"

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
index 352aa6cc0c94a805de2cf338feac7dc6442f943f..a6240b35ef97c8d4a6d5c8c6e441e44b81320e16 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
@@ -391,7 +391,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4SrcBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4SrcBuilder.setMask(mask);
                         hasMask = true;
@@ -414,7 +414,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4DstBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4DstBuilder.setMask(mask);
                         hasMask = true;
@@ -440,7 +440,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4SrcBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4SrcBuilder.setMask(mask);
                         hasMask = true;
@@ -463,7 +463,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     ipv4DstBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         ipv4DstBuilder.setMask(mask);
                         hasMask = true;
@@ -492,7 +492,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     arpSpaBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         arpSpaBuilder.setMask(mask);
                         hasMask = true;
@@ -516,7 +516,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
                     Ipv4Address ipv4Address = new Ipv4Address(addressParts.next());
                     arpTpaBuilder.setIpv4Address(ipv4Address);
                     boolean hasMask = false;
-                    byte[] mask = extractIpv4Mask(hasMask, addressParts);
+                    byte[] mask = extractIpv4Mask(addressParts);
                     if (null != mask) {
                         arpTpaBuilder.setMask(mask);
                         hasMask = true;
@@ -889,7 +889,7 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
     }
 
 
-    private static byte[] extractIpv4Mask(boolean hasMask, final Iterator<String> addressParts) {
+    private static byte[] extractIpv4Mask(final Iterator<String> addressParts) {
         final int prefix;
         if (addressParts.hasNext()) {
             int potentionalPrefix = Integer.parseInt(addressParts.next());
@@ -902,7 +902,6 @@ public class MatchConvertorImpl implements MatchConvertor<List<MatchEntry>> {
             int mask = 0xffffffff << (32 - prefix);
             byte[] maskBytes = new byte[]{(byte) (mask >>> 24), (byte) (mask >>> 16), (byte) (mask >>> 8),
                     (byte) mask};
-            hasMask = true;
             return maskBytes;
         }
         return null;