Use readUint16(ByteBuf)

We have open-coded ByteBuf.readUnsignedShort(), ditch that in favor
of readUint16().

Change-Id: I0fcaa221c9a84323b39dae0a69cf712b98740c7b
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/LearnCodecUtil.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java
index 2e9e10f14533957850cbfc169caaf2ef88730827..2bf40a700b4a5d53ad5ac7c86f85b6c6b8e0bf3a 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/LearnCodecUtil.java
@@ -256,9 +256,9 @@ public final class LearnCodecUtil {
     private FlowMods readFlowModAddMatchFromField(final ByteBuf message, final short numBits) {
         final var builder = new FlowModAddMatchFromFieldBuilder()
             .setSrcField(readUint32(message))
-            .setSrcOfs((int) message.readShort())
+            .setSrcOfs(readUint16(message))
             .setDstField(readUint32(message))
-            .setDstOfs((int) message.readShort())
+            .setDstOfs(readUint16(message))
             .setFlowModNumBits((int) numBits);
         length -= FROM_FIELD_LENGTH - Short.BYTES;
 
@@ -273,7 +273,7 @@ public final class LearnCodecUtil {
         final var builder = new FlowModAddMatchFromValueBuilder()
             .setValue(readUint16(message))
             .setSrcField(readUint32(message))
-            .setSrcOfs((int) message.readShort())
+            .setSrcOfs(readUint16(message))
             .setFlowModNumBits((int) numBits);
         length -= FROM_VALUE_LENGTH - Short.BYTES;
 
@@ -287,9 +287,9 @@ public final class LearnCodecUtil {
     private FlowMods readFlowModCopyFromField(final ByteBuf message, final short numBits) {
         final var builder = new FlowModCopyFieldIntoFieldBuilder()
             .setSrcField(readUint32(message))
-            .setSrcOfs((int) message.readShort())
+            .setSrcOfs(readUint16(message))
             .setDstField(readUint32(message))
-            .setDstOfs((int) message.readShort())
+            .setDstOfs(readUint16(message))
             .setFlowModNumBits((int) numBits);
         length -= FROM_FIELD_LENGTH - Short.BYTES;
 
@@ -304,7 +304,7 @@ public final class LearnCodecUtil {
         final var builder = new FlowModCopyValueIntoFieldBuilder()
             .setValue(readUint16(message))
             .setDstField(readUint32(message))
-            .setDstOfs((int) message.readShort())
+            .setDstOfs(readUint16(message))
             .setFlowModNumBits((int) numBits);
         length -= FROM_VALUE_LENGTH - Short.BYTES;
 
@@ -318,7 +318,7 @@ public final class LearnCodecUtil {
     private FlowMods readFlowToPort(final ByteBuf message, final short numBits) {
         final var builder = new FlowModOutputToPortBuilder()
             .setSrcField(readUint32(message))
-            .setSrcOfs((int) message.readShort())
+            .setSrcOfs(readUint16(message))
             .setFlowModNumBits((int) numBits);
         length -= TO_PORT_LENGTH - Short.BYTES;