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%2FAbstractExperimenterMatchCodec.java;h=0b6164ba04ff1a8bf6d95c36c74c0ec2023c34ec;hb=refs%2Fchanges%2F45%2F101745%2F10;hp=05d16c234f5272665e654f2de9e6de83d00d11a3;hpb=810e4557ca7ff87c966332cd99646ec75e0ab7cf;p=openflowplugin.git

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java
index 05d16c234f..0b6164ba04 100644
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/AbstractExperimenterMatchCodec.java
@@ -5,18 +5,16 @@
  * 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 io.netty.buffer.ByteBuf;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.experimenter.id._case.ExperimenterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.ExperimenterIdCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.experimenter.id.match.entry.experimenter.id._case.ExperimenterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ExperimenterId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
@@ -25,21 +23,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 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.OfjAugNxExpMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.OfjAugNxExpMatchBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.experimenter.id._case.NxExpMatchEntryValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.exp.match.NxExpMatchEntryValue;
 import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec {
 
     protected static <F extends MatchField> MatchEntrySerializerKey<ExperimenterClass, F> createSerializerKey(
-            short version, Uint32 expId, Class<F> oxmField) {
+            final Uint8 version, final Uint32 expId, final F oxmField) {
         MatchEntrySerializerKey<ExperimenterClass, F> key = new MatchEntrySerializerKey<>(
-                version, ExperimenterClass.class, oxmField);
+                version, ExperimenterClass.VALUE, oxmField);
         key.setExperimenterId(expId);
         return key;
     }
 
     protected static MatchEntryDeserializerKey createDeserializerKey(
-            short version, Uint32 expId, int fieldCode) {
+            final Uint8 version, final Uint32 expId, final int fieldCode) {
         MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(
                 version, OxmMatchConstants.EXPERIMENTER_CLASS, fieldCode);
         key.setExperimenterId(expId);
@@ -47,7 +46,7 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec
     }
 
     @Override
-    public void serialize(MatchEntry input, ByteBuf outBuffer) {
+    public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
         // serializes standard header + experimenterId
         serializeHeader(input, outBuffer);
 
@@ -55,33 +54,33 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec
         OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class);
         NxExpMatchEntryValue nxExpMatchEntryValue = ofjAugNxExpMatch.getNxExpMatchEntryValue();
 
-        serializeValue(nxExpMatchEntryValue, input.isHasMask(), outBuffer);
+        serializeValue(nxExpMatchEntryValue, input.getHasMask(), outBuffer);
     }
 
     protected abstract void serializeValue(NxExpMatchEntryValue value, boolean hasMask, ByteBuf outBuffer);
 
     @Override
-    public MatchEntry deserialize(ByteBuf message) {
+    public MatchEntry deserialize(final ByteBuf message) {
         final MatchEntryBuilder matchEntryBuilder = deserializeHeaderToBuilder(message);
 
         // skip experimenter Id
-        message.skipBytes(EncodeConstants.SIZE_OF_INT_IN_BYTES);
+        message.skipBytes(Integer.BYTES);
 
         ExperimenterIdCaseBuilder expCaseBuilder = new ExperimenterIdCaseBuilder();
         ExperimenterBuilder expBuilder = new ExperimenterBuilder();
         expBuilder.setExperimenter(new ExperimenterId(getExperimenterId()));
         expCaseBuilder.setExperimenter(expBuilder.build());
 
-        final NxExpMatchEntryValue value = deserializeValue(message, matchEntryBuilder.isHasMask());
+        final NxExpMatchEntryValue value = deserializeValue(message, matchEntryBuilder.getHasMask());
 
         return buildMatchEntry(matchEntryBuilder, expCaseBuilder, value);
     }
 
     protected abstract NxExpMatchEntryValue deserializeValue(ByteBuf message, boolean hasMask);
 
-    private static MatchEntry buildMatchEntry(MatchEntryBuilder matchEntryBuilder,
-                                                ExperimenterIdCaseBuilder experimenterIdCaseBuilder,
-                                                NxExpMatchEntryValue nxExpMatchEntryValue) {
+    private static MatchEntry buildMatchEntry(final MatchEntryBuilder matchEntryBuilder,
+                                              final ExperimenterIdCaseBuilder experimenterIdCaseBuilder,
+                                              final NxExpMatchEntryValue nxExpMatchEntryValue) {
         return matchEntryBuilder
                 .setMatchEntryValue(experimenterIdCaseBuilder.addAugmentation(new OfjAugNxExpMatchBuilder()
                     .setNxExpMatchEntryValue(nxExpMatchEntryValue)
@@ -91,22 +90,22 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec
     }
 
     @Override
-    public void serializeHeader(NxmHeader input, ByteBuf outBuffer) {
+    public void serializeHeader(final NxmHeader input, final ByteBuf outBuffer) {
         outBuffer.writeLong(input.toLong());
     }
 
     @Override
-    protected NxmHeader buildHeader(boolean hasMask) {
+    protected NxmHeader buildHeader(final boolean hasMask) {
         return new NxmHeader(
                 getNxmFieldCode(),
                 hasMask,
-                EncodeConstants.SIZE_OF_INT_IN_BYTES + (hasMask ? getValueLength() * 2 : getValueLength()),
+                Integer.BYTES + (hasMask ? getValueLength() * 2 : getValueLength()),
                 getExperimenterId().longValue());
     }
 
     @Override
-    public Class<? extends OxmClassBase> getOxmClass() {
-        return ExperimenterClass.class;
+    public OxmClassBase getOxmClass() {
+        return ExperimenterClass.VALUE;
     }
 
     @Override
@@ -115,5 +114,4 @@ public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec
     }
 
     protected abstract @NonNull Uint32 getExperimenterId();
-
 }