X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=extension%2Fopenflowjava-extension-nicira%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fnx%2Fcodec%2Fmatch%2FCtTpDstCodec.java;h=333201735ba070d8c4bb821ca72ef13f3177a2ee;hb=refs%2Fchanges%2F45%2F101745%2F10;hp=5fc6b16ece3d4a63587f1c77434dbca1f7088ade;hpb=2ae65118e868a83e01190262d84310f3ecb98eee;p=openflowplugin.git

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java
index 5fc6b16ece..333201735b 100644
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/CtTpDstCodec.java
@@ -5,9 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowjava.nx.codec.match;
 
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint16;
+
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
@@ -17,37 +18,34 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.CtTpDstCaseValueBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.ct.tp.dst.grouping.CtTpDstValuesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.CtTpDstCaseValueBuilder;
 
 public class CtTpDstCodec extends AbstractMatchCodec {
 
     private static final int VALUE_LENGTH = 2;
     private static final int NXM_FIELD_CODE = 125;
     public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtTpDst> SERIALIZER_KEY =
-            new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxCtTpDst.class);
+            new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpDst.VALUE);
     public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
-            EncodeConstants.OF13_VERSION_ID, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
+            EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
 
     @Override
-    public void serialize(MatchEntry input, ByteBuf outBuffer) {
+    public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
         serializeHeader(input, outBuffer);
         CtTpDstCaseValue ctTpSrcCase = (CtTpDstCaseValue)input.getMatchEntryValue();
-        outBuffer.writeShort(ctTpSrcCase.getCtTpDstValues().getCtTpDst());
+        outBuffer.writeShort(ctTpSrcCase.getCtTpDstValues().getCtTpDst().toJava());
     }
 
     @Override
-    public MatchEntry deserialize(ByteBuf message) {
-        final MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message);
-        CtTpDstCaseValueBuilder ctTpSrcCaseValueBuilder = new CtTpDstCaseValueBuilder();
-        CtTpDstValuesBuilder ctTpSrcValuesBuilder = new CtTpDstValuesBuilder();
-        ctTpSrcValuesBuilder.setCtTpDst(message.readUnsignedShort());
-        ctTpSrcCaseValueBuilder.setCtTpDstValues(ctTpSrcValuesBuilder.build());
-        matchEntryBuilder.setMatchEntryValue(ctTpSrcCaseValueBuilder.build());
-        return matchEntryBuilder.build();
+    public MatchEntry deserialize(final ByteBuf message) {
+        return deserializeHeaderToBuilder(message)
+                .setMatchEntryValue(new CtTpDstCaseValueBuilder()
+                    .setCtTpDstValues(new CtTpDstValuesBuilder().setCtTpDst(readUint16(message)).build())
+                    .build())
+                .build();
     }
 
     @Override
@@ -66,12 +64,12 @@ public class CtTpDstCodec extends AbstractMatchCodec {
     }
 
     @Override
-    public Class<? extends MatchField> getNxmField() {
-        return NxmNxCtTpDst.class;
+    public MatchField getNxmField() {
+        return NxmNxCtTpDst.VALUE;
     }
 
     @Override
-    public Class<? extends OxmClassBase> getOxmClass() {
-        return Nxm1Class.class;
+    public OxmClassBase getOxmClass() {
+        return Nxm1Class.VALUE;
     }
 }