Bump upstreams

[openflowplugin.git] / extension / openflowjava-extension-nicira / src / main / java / org / opendaylight / openflowjava / nx / codec / action / ConntrackCodec.java

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 50a9c216a839e9bff94b4230e5ccd31f8bd74c7d..a44a4c865493fb8d56d075dc4c02e7a4099098c9 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
@@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrack;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionConntrackBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrackBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.NxActionConntrackBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActionsBuilder;
@@ -58,9 +58,9 @@ public class ConntrackCodec extends AbstractActionCodec {
     public static final byte NXAST_CONNTRACK_SUBTYPE = 35;
     public static final byte NXAST_NAT_SUBTYPE = 36;
     public static final NiciraActionSerializerKey SERIALIZER_KEY =
-            new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionConntrack.class);
+            new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionConntrack.class);
     public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
-            new NiciraActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, NXAST_CONNTRACK_SUBTYPE);
+            new NiciraActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, NXAST_CONNTRACK_SUBTYPE);
 
     @Override
     public void serialize(final Action input, final ByteBuf outBuffer) {
@@ -173,22 +173,22 @@ public class ConntrackCodec extends AbstractActionCodec {
     @Override
     public Action deserialize(final ByteBuf message) {
         final short length = deserializeCtHeader(message);
-        NxActionConntrackBuilder nxActionConntrackBuilder = new NxActionConntrackBuilder();
-        nxActionConntrackBuilder.setFlags(readUint16(message));
-        nxActionConntrackBuilder.setZoneSrc(readUint32(message));
-        nxActionConntrackBuilder.setConntrackZone(readUint16(message));
-        nxActionConntrackBuilder.setRecircTable(readUint8(message));
+        final var nxActionConntrackBuilder = new NxActionConntrackBuilder()
+            .setFlags(readUint16(message))
+            .setZoneSrc(readUint32(message))
+            .setConntrackZone(readUint16(message))
+            .setRecircTable(readUint8(message));
         message.skipBytes(5);
 
-        if  (length > CT_LENGTH) {
-            deserializeCtAction(message,nxActionConntrackBuilder, length - CT_LENGTH);
+        if (length > CT_LENGTH) {
+            deserializeCtAction(message, nxActionConntrackBuilder, length - CT_LENGTH);
         }
-        ActionBuilder actionBuilder = new ActionBuilder();
-        actionBuilder.setExperimenterId(getExperimenterId());
-        ActionConntrackBuilder actionConntrackBuilder = new ActionConntrackBuilder();
-        actionConntrackBuilder.setNxActionConntrack(nxActionConntrackBuilder.build());
-        actionBuilder.setActionChoice(actionConntrackBuilder.build());
-        return actionBuilder.build();
+        return new ActionBuilder()
+            .setExperimenterId(getExperimenterId())
+            .setActionChoice(new ActionConntrackBuilder()
+                .setNxActionConntrack(nxActionConntrackBuilder.build())
+                .build())
+            .build();
     }
 
     private static void deserializeCtAction(final ByteBuf message,
@@ -261,12 +261,12 @@ public class ConntrackCodec extends AbstractActionCodec {
     }
 
     private static IpAddress readIpv4Address(final ByteBuf message) {
-        return new IpAddress(IetfInetUtil.INSTANCE.ipv4AddressFor(message.readInt()));
+        return new IpAddress(IetfInetUtil.ipv4AddressFor(message.readInt()));
     }
 
     private static void writeIpv4Address(final ByteBuf outBuffer, final IpAddress ipAddress) {
         if (ipAddress != null) {
-            outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(ipAddress.getIpv4Address()));
+            outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(ipAddress.getIpv4Address()));
         }
     }