Use IpAddressBuilder instead of char[] constructor

This is a more efficient implementation of the same construct.

Change-Id: I2fa2b97c9311a191d6a734a8e6ef71544ff41dc3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java
index b86222c58d22362ed81e425de05c9298b99b6479..39d7dfa1a4f2b57badde03cd60ee2b12a80bc28d 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodec.java
@@ -17,7 +17,7 @@ import org.opendaylight.openflowjava.nx.api.NiciraActionDeserializerKey;
 import org.opendaylight.openflowjava.nx.api.NiciraActionSerializerKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.NxActionNatRangePresent;
@@ -221,11 +221,11 @@ public class ConntrackCodec extends AbstractActionCodec {
                 nxActionNatBuilder.setRangePresent(rangePresent);
                 if (0 != (rangePresent & NxActionNatRangePresent.NXNATRANGEIPV4MIN.getIntValue())) {
                     InetAddress address = InetAddresses.fromInteger((int)message.readUnsignedInt());
-                    nxActionNatBuilder.setIpAddressMin(new IpAddress(address.getHostAddress().toCharArray()));
+                    nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance(address.getHostAddress()));
                 }
                 if (0 != (rangePresent & NxActionNatRangePresent.NXNATRANGEIPV4MAX.getIntValue())) {
                     InetAddress address = InetAddresses.fromInteger((int)message.readUnsignedInt());
-                    nxActionNatBuilder.setIpAddressMax(new IpAddress(address.getHostAddress().toCharArray()));
+                    nxActionNatBuilder.setIpAddressMax(IpAddressBuilder.getDefaultInstance(address.getHostAddress()));
                 }
                 if (0 != (rangePresent & NxActionNatRangePresent.NXNATRANGEPROTOMIN.getIntValue())) {
                     nxActionNatBuilder.setPortMin(message.readUnsignedShort());

diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
index d883348c12d2cb47d90463d2852c4c17fae5badb..0f7c8bf2da588485f7dee6ef0fc4eedc40bbf72d 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
+++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/action/ConntrackCodecTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 import org.opendaylight.openflowjava.nx.api.NiciraConstants;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
@@ -178,8 +178,8 @@ public class ConntrackCodecTest {
         NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder();
         nxActionNatBuilder.setFlags(5);
         nxActionNatBuilder.setRangePresent(0x3F);
-        nxActionNatBuilder.setIpAddressMin(new IpAddress("192.168.0.0".toCharArray()));
-        nxActionNatBuilder.setIpAddressMax(new IpAddress("192.168.10.0".toCharArray()));
+        nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
+        nxActionNatBuilder.setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"));
         nxActionNatBuilder.setPortMin(3000);
         nxActionNatBuilder.setPortMax(4000);
         NxActionNatCaseBuilder nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
@@ -191,7 +191,7 @@ public class ConntrackCodecTest {
         nxActionNatBuilder = new NxActionNatBuilder();
         nxActionNatBuilder.setFlags(5);
         nxActionNatBuilder.setRangePresent(0x21);
-        nxActionNatBuilder.setIpAddressMin(new IpAddress("192.168.0.0".toCharArray()));
+        nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
         nxActionNatBuilder.setPortMax(4000);
         nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
         nxActionNatCaseBuilder.setNxActionNat(nxActionNatBuilder.build());
@@ -237,7 +237,7 @@ public class ConntrackCodecTest {
         return actionBuilder.build();
     }
 
-    private void createBuffer(ByteBuf message) {
+    private void createBuffer(final ByteBuf message) {
         message.writeShort(EncodeConstants.EXPERIMENTER_VALUE);
         message.writeShort(length + nxNatLengthAction1 + nxNatLengthAction2 + setFieldLength);
         message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue());
@@ -297,7 +297,7 @@ public class ConntrackCodecTest {
         message.writeZero(4);
     }
 
-    private void createBufferWIthoutCtAction(ByteBuf message) {
+    private void createBufferWIthoutCtAction(final ByteBuf message) {
         message.writeShort(EncodeConstants.EXPERIMENTER_VALUE);
         message.writeShort(length);
         message.writeInt(NiciraConstants.NX_VENDOR_ID.intValue());

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
index ab43d96fb071007cc6fe820c216f9530c993c26a..a6a80e03aee3b59d6d1526fb36ddba6428bc921b 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
@@ -14,7 +14,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack;
@@ -53,8 +53,8 @@ public class ConntrackConvertorTest {
         final NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder()
                 .setFlags(1)
                 .setRangePresent(2)
-                .setIpAddressMin(new IpAddress("192.168.0.0".toCharArray()))
-                .setIpAddressMin(new IpAddress("192.168.10.0".toCharArray()))
+                .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
+                .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
                 .setPortMin(3000)
                 .setPortMax(4000);
         final CtActionsBuilder ctActionsBuilder = new CtActionsBuilder().setOfpactActions(new NxActionNatCaseBuilder()
@@ -111,8 +111,8 @@ public class ConntrackConvertorTest {
             .NxActionNatBuilder()
             .setFlags(1)
             .setRangePresent(2)
-            .setIpAddressMin(new IpAddress("192.168.0.0".toCharArray()))
-            .setIpAddressMax(new IpAddress("192.168.10.0".toCharArray()))
+            .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
+            .setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
             .setPortMin(3000)
             .setPortMax(4000);
         org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping