Fix openflow-protocol-impl deprecation warnings

Convert all use of widened types to proper uint types.

JIRA: OPNFLWPLUG-1099
Change-Id: Iabdcf752965851b29be0162c70f463206d07abaa
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
index 1196e416a386981d69871ea73922485e164e9eb2..aa9a6f9e3b7faedc4fd5bc14a5e48fe67248c625 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
@@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableModFailedCode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessageBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Translates Error messages.
@@ -80,10 +81,10 @@ public class ErrorMessageFactory implements OFDeserializer<ErrorMessage>,
 
     private static void decodeType(ErrorMessageBuilder builder, ErrorType type, int readValue) {
         if (type != null) {
-            builder.setType(type.getIntValue());
+            builder.setType(Uint16.valueOf(type.getIntValue()));
             builder.setTypeString(type.name());
         } else {
-            builder.setType(readValue);
+            builder.setType(Uint16.valueOf(readValue));
             builder.setTypeString(UNKNOWN_TYPE);
         }
     }
@@ -229,12 +230,12 @@ public class ErrorMessageFactory implements OFDeserializer<ErrorMessage>,
     }
 
     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
-        builder.setCode(readValue);
+        builder.setCode(Uint16.valueOf(readValue));
         builder.setCodeString(UNKNOWN_CODE);
     }
 
     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
-        builder.setCode(code);
+        builder.setCode(Uint16.valueOf(code));
         builder.setCodeString(codeString);
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
index 4b2b2b210aaf9de7d7a0534dfdda6b9012bcf716..2b71d00dd7a5c2d1dfa7d1d2bcf67f37b8b50d0e 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
@@ -39,12 +39,12 @@ public class ExperimenterMessageFactory implements OFDeserializer<ExperimenterMe
         Objects.requireNonNull(deserializerRegistry);
 
         final Uint32 xid = readUint32(message);
-        final long expId = message.readUnsignedInt();
-        final long expType = message.readUnsignedInt();
+        final Uint32 expId = readUint32(message);
+        final Uint32 expType = readUint32(message);
 
         OFDeserializer<ExperimenterDataOfChoice> deserializer = deserializerRegistry.getDeserializer(
                 ExperimenterDeserializerKeyFactory.createExperimenterMessageDeserializerKey(
-                        EncodeConstants.OF13_VERSION_ID, expId, expType));
+                        EncodeConstants.OF13_VERSION_ID, expId.toJava(), expType.toJava()));
         final ExperimenterDataOfChoice vendorData = deserializer.deserialize(message);
 
         ExperimenterMessageBuilder messageBld = new ExperimenterMessageBuilder()

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index 07718e1f77354be445b0400986eff411ee04e224..8917d3661fb1afc9ef315a5734bdc0044fe126f8 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -649,12 +649,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     }
 
     private MultipartReplyExperimenterCase setExperimenter(final ByteBuf input) {
-        final long expId = input.readUnsignedInt();
-        final long expType = input.readUnsignedInt();
+        final Uint32 expId = readUint32(input);
+        final Uint32 expType = readUint32(input);
 
         final OFDeserializer<ExperimenterDataOfChoice> deserializer = registry.getDeserializer(
                 ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
-                        EncodeConstants.OF13_VERSION_ID, expId, expType));
+                        EncodeConstants.OF13_VERSION_ID, expId.toJava(), expType.toJava()));
 
         final MultipartReplyExperimenterBuilder mpExperimenterBld = new MultipartReplyExperimenterBuilder()
                 .setExperimenter(new ExperimenterId(expId))

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
index ed2a4932a310fdc4de1dfcda9713b592156f4794..25d1cdb2760f77d660a1311adb22cb14ec1adc96 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
@@ -21,6 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.QueueOpFailedCodeV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessageBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Translates Error messages (OpenFlow v1.0).
@@ -52,10 +53,10 @@ public class OF10ErrorMessageFactory implements OFDeserializer<ErrorMessage> {
 
     private static void decodeType(ErrorMessageBuilder builder, ErrorTypeV10 type, int readValue) {
         if (type != null) {
-            builder.setType(type.getIntValue());
+            builder.setType(Uint16.valueOf(type.getIntValue()));
             builder.setTypeString(type.name());
         } else {
-            builder.setType(readValue);
+            builder.setType(Uint16.valueOf(readValue));
             builder.setTypeString(UNKNOWN_TYPE);
         }
     }
@@ -129,12 +130,12 @@ public class OF10ErrorMessageFactory implements OFDeserializer<ErrorMessage> {
     }
 
     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
-        builder.setCode(readValue);
+        builder.setCode(Uint16.valueOf(readValue));
         builder.setCodeString(UNKNOWN_CODE);
     }
 
     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
-        builder.setCode(code);
+        builder.setCode(Uint16.valueOf(code));
         builder.setCodeString(codeString);
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
index 091f2fbc462d75f8e381fff62b31269b0ed030e4..91c99f37d90991d42c09c73947c7f12a1c2d65bb 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
@@ -66,6 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table._case.MultipartReplyTableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table._case.multipart.reply.table.TableStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table._case.multipart.reply.table.TableStatsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Translates StatsReply messages (OpenFlow v1.0).
@@ -270,10 +271,10 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
     }
 
     private MultipartReplyExperimenterCase setExperimenter(ByteBuf input) {
-        final long expId = input.readUnsignedInt();
+        final Uint32 expId = readUint32(input);
         final OFDeserializer<ExperimenterDataOfChoice> deserializer = registry.getDeserializer(
                 ExperimenterDeserializerKeyFactory.createMultipartReplyVendorMessageDeserializerKey(
-                EncodeConstants.OF10_VERSION_ID, expId));
+                EncodeConstants.OF10_VERSION_ID, expId.toJava()));
 
         final MultipartReplyExperimenterBuilder mpExperimenterBld = new MultipartReplyExperimenterBuilder()
                 .setExperimenter(new ExperimenterId(expId))

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/VendorMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/VendorMessageFactory.java
index 2170a87c7e51cb79d5bb45adfa26b151e08c7974..c911f7ad1f8dde37a107b9439c79ed183087e42c 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/VendorMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/VendorMessageFactory.java
@@ -39,10 +39,10 @@ public class VendorMessageFactory implements OFDeserializer<ExperimenterMessage>
         Objects.requireNonNull(deserializerRegistry);
 
         final Uint32 xid = readUint32(message);
-        final long expId = message.readUnsignedInt();
+        final Uint32 expId = readUint32(message);
         OFDeserializer<ExperimenterDataOfChoice> deserializer = deserializerRegistry.getDeserializer(
                 ExperimenterDeserializerKeyFactory.createVendorMessageDeserializerKey(
-                        EncodeConstants.OF10_VERSION_ID, expId));
+                        EncodeConstants.OF10_VERSION_ID, expId.toJava()));
         final ExperimenterDataOfChoice vendorData = deserializer.deserialize(message);
 
         final ExperimenterMessageBuilder messageBld = new ExperimenterMessageBuilder()

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java
index f0ca8dae5d344ad2d2108f277205c721a275abf3..135b636eb2ff6df9fbae57f0d43dfa5d50e4125f 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializer.java
@@ -13,6 +13,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.PbbI
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.PbbIsidCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.pbb.isid._case.PbbIsidBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Translates OxmPbbIsid messages.
@@ -26,9 +27,9 @@ public class OxmPbbIsidDeserializer extends AbstractOxmMatchEntryDeserializer {
 
     @Override
     protected void deserialize(final ByteBuf input, final MatchEntryBuilder builder) {
-        final Integer isid = input.readUnsignedMedium();
+        final int isid = input.readUnsignedMedium();
         final PbbIsidBuilder isidBuilder = new PbbIsidBuilder()
-                .setIsid(isid.longValue());
+                .setIsid(Uint32.valueOf(isid));
         if (builder.isHasMask()) {
             isidBuilder.setMask(OxmDeserializerHelper.convertMask(input, EncodeConstants.SIZE_OF_3_BYTES));
         }

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
index 3ee709722aebcca95c35b3c8b18a50710b1f366e..2351160969175593785e739434a9af4c12ded9c2 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
@@ -7,9 +7,11 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.util;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Helper class for deserializer registration.
@@ -19,6 +21,7 @@ import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 public class SimpleDeserializerRegistryHelper {
 
     private final short version;
+    private final @NonNull Uint8 uintVersion;
     private final DeserializerRegistry registry;
 
     /**
@@ -30,6 +33,7 @@ public class SimpleDeserializerRegistryHelper {
     public SimpleDeserializerRegistryHelper(final short version, final DeserializerRegistry deserializerRegistry) {
         this.version = version;
         this.registry = deserializerRegistry;
+        this.uintVersion = Uint8.valueOf(version);
     }
 
     /**
@@ -43,7 +47,7 @@ public class SimpleDeserializerRegistryHelper {
         registry.registerDeserializer(new MessageCodeKey(version, code, deserializedObjectClass), deserializer);
 
         if (deserializer instanceof VersionAssignableFactory) {
-            ((VersionAssignableFactory) deserializer).assignVersion(version);
+            ((VersionAssignableFactory<?>) deserializer).assignVersion(uintVersion);
         }
     }
 }

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/VersionAssignableFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/VersionAssignableFactory.java
index e339c63180609f4feb478a97eb42350ab6ff4471..a72e29642c89f6b7445ad8cf3509039e7e0eec2a 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/VersionAssignableFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/VersionAssignableFactory.java
@@ -10,30 +10,30 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Abstract factory class to support OF protocol version assigning and reading.
  */
 public abstract class VersionAssignableFactory<T extends DataContainer> implements OFDeserializer<T> {
-    private Short version;
+    private Uint8 version;
 
     /**
      * Assigns the version.
      *
      * @param newVersion OpenFlow protocol version
      */
-    public void assignVersion(@NonNull final Short newVersion) {
-        if (this.version == null) {
-            this.version = newVersion;
-        } else {
-            throw new IllegalStateException("Version already assigned: " + this.version);
+    public void assignVersion(final @NonNull Uint8 newVersion) {
+        if (version != null) {
+            throw new IllegalStateException("Version already assigned: " + version);
         }
+        version = newVersion;
     }
 
     /**
      * Returns the OpenFlow protocol version.
      */
-    protected Short getVersion() {
+    protected final Uint8 getVersion() {
         return this.version;
     }
 }