Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / util / CodeKeyMakerFactory.java

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java
index 4bad43db8d4f1e7b5fed30f853de8440c4ab4fdd..651f2385e0a6e0da64d5a340cd83d398fcf8efef 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CodeKeyMakerFactory.java
@@ -16,6 +16,8 @@ import org.opendaylight.openflowjava.protocol.api.keys.InstructionDeserializerKe
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Factory for creating CodeKeyMaker instances.
@@ -28,19 +30,17 @@ public final class CodeKeyMakerFactory {
         //not called
     }
 
-    public static CodeKeyMaker createMatchEntriesKeyMaker(short version) {
+    public static CodeKeyMaker createMatchEntriesKeyMaker(final Uint8 version) {
         return new AbstractCodeKeyMaker(version) {
             @Override
-            public MessageCodeKey make(ByteBuf input) {
+            public MessageCodeKey make(final ByteBuf input) {
                 int oxmClass = input.getUnsignedShort(input.readerIndex());
-                int oxmField = input.getUnsignedByte(input.readerIndex()
-                        + EncodeConstants.SIZE_OF_SHORT_IN_BYTES) >>> 1;
+                int oxmField = input.getUnsignedByte(input.readerIndex() + Short.BYTES) >>> 1;
                 MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(getVersion(),
                         oxmClass, oxmField);
                 if (oxmClass == EncodeConstants.EXPERIMENTER_VALUE) {
-                    long expId = input.getUnsignedInt(input.readerIndex() + EncodeConstants.SIZE_OF_SHORT_IN_BYTES
-                            + 2 * EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
-                    key.setExperimenterId(expId);
+                    long expId = input.getUnsignedInt(input.readerIndex() + Short.BYTES + 2 * Byte.BYTES);
+                    key.setExperimenterId(Uint32.valueOf(expId));
                     return key;
                 }
                 key.setExperimenterId(null);
@@ -49,14 +49,13 @@ public final class CodeKeyMakerFactory {
         };
     }
 
-    public static CodeKeyMaker createActionsKeyMaker(short version) {
+    public static CodeKeyMaker createActionsKeyMaker(final Uint8 version) {
         return new AbstractCodeKeyMaker(version) {
             @Override
-            public MessageCodeKey make(ByteBuf input) {
+            public MessageCodeKey make(final ByteBuf input) {
                 int type = input.getUnsignedShort(input.readerIndex());
                 if (type == EncodeConstants.EXPERIMENTER_VALUE) {
-                    Long expId = input.getUnsignedInt(input.readerIndex()
-                            + 2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+                    Long expId = input.getUnsignedInt(input.readerIndex() + 2 * Short.BYTES);
                     return new ExperimenterActionDeserializerKey(getVersion(), expId);
                 }
                 ActionDeserializerKey actionDeserializerKey = new ActionDeserializerKey(getVersion(), type, null);
@@ -65,14 +64,13 @@ public final class CodeKeyMakerFactory {
         };
     }
 
-    public static CodeKeyMaker createInstructionsKeyMaker(short version) {
+    public static CodeKeyMaker createInstructionsKeyMaker(final Uint8 version) {
         return new AbstractCodeKeyMaker(version) {
             @Override
-            public MessageCodeKey make(ByteBuf input) {
+            public MessageCodeKey make(final ByteBuf input) {
                 int type = input.getUnsignedShort(input.readerIndex());
                 if (type == EncodeConstants.EXPERIMENTER_VALUE) {
-                    Long expId = input.getUnsignedInt(input.readerIndex()
-                            + 2 * EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
+                    Long expId = input.getUnsignedInt(input.readerIndex() + 2 * Short.BYTES);
                     return new ExperimenterInstructionDeserializerKey(getVersion(), expId);
                 }
                 return new InstructionDeserializerKey(getVersion(), type, null);