Migrate EncodeConstants.OF13_VERSION_ID users

This is a search-and-replace for the correct constant.

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

diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/OnfExperimenterErrorFactory.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/OnfExperimenterErrorFactory.java
index 64c8ed474772b3b78251a7aaf3ffb57e5f712fa2..6e2f0007eb6bf295234a927d16d505dbe609c210 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/OnfExperimenterErrorFactory.java
+++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/deserializer/OnfExperimenterErrorFactory.java
@@ -31,7 +31,7 @@ public class OnfExperimenterErrorFactory implements OFDeserializer<ErrorMessage>
     @Override
     public ErrorMessage deserialize(ByteBuf message) {
         ErrorMessageBuilder builder = new ErrorMessageBuilder();
-        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+        builder.setVersion(EncodeConstants.OF_VERSION_1_3);
         builder.setXid(message.readUnsignedInt());
 
         int type = message.readUnsignedShort();

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/AsyncConfigMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/AsyncConfigMessageDeserializer.java
index f79d9b60a05e79cb067c1d90f35e39cee2646d09..7d301fdcf1b706de208dc8f3bac398c6dbeef1eb 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/AsyncConfigMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/AsyncConfigMessageDeserializer.java
@@ -24,7 +24,7 @@ public class AsyncConfigMessageDeserializer implements OFDeserializer<AsyncConfi
     @Override
     public AsyncConfigMessage deserialize(ByteBuf message) {
         return new AsyncConfigMessageBuilder()
-                .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
                 .setXid(message.readUnsignedInt())
                 .setPacketInMask(new PacketInMaskBuilder()
                         .setMasterMask(deserializePacketInMask(message))

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
index 8a6567c38f680ccef3e1a48704b83d9630f75019..a4608fcdc5e844a0cf3373203c14063daded7122 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
@@ -53,7 +53,7 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
     @SuppressWarnings("checkstyle:LineLength")
     public FlowMessage deserialize(ByteBuf message) {
         final FlowMessageBuilder builder = new FlowMessageBuilder()
-            .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+            .setVersion(EncodeConstants.OF_VERSION_1_3)
             .setXid(readUint32(message))
             .setCookie(new FlowCookie(BigInteger.valueOf(message.readLong())))
             .setCookieMask(new FlowCookie(BigInteger.valueOf(message.readLong())))

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java
index 2672e895a7c6113453d43e70fe5ba541a081dc66..813bf60aab1d2e65f05f579a9b22d83c4afb9b03 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializer.java
@@ -49,7 +49,7 @@ public class GroupMessageDeserializer implements OFDeserializer<GroupMessage>, D
     @Override
     public GroupMessage deserialize(final ByteBuf message) {
         final GroupMessageBuilder builder = new GroupMessageBuilder()
-            .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+            .setVersion(EncodeConstants.OF_VERSION_1_3)
             .setXid(message.readUnsignedInt())
             .setCommand(GroupModCommand.forValue(message.readUnsignedShort()));
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java
index 22ce7d96f26833a0f05bfe7dff44d7ef95a85a48..098bd2f30af7fcf438d992312d905ecf95a4b25e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/MeterMessageDeserializer.java
@@ -46,7 +46,7 @@ public class MeterMessageDeserializer implements OFDeserializer<MeterMessage>, D
     @Override
     public MeterMessage deserialize(ByteBuf message) {
         final MeterMessageBuilder builder = new MeterMessageBuilder()
-                .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
                 .setXid(message.readUnsignedInt())
                 .setCommand(MeterModCommand.forValue(message.readUnsignedShort()))
                 .setFlags(readMeterFlags(message))

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java
index dba93fda2416337a357ef3f2677e9758aed0e5db..c45ec9984c1c18ac0d80e12fdb22d3a82993fe0a 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializer.java
@@ -43,7 +43,7 @@ public class PacketInMessageDeserializer implements OFDeserializer<PacketInMessa
     @Override
     public PacketInMessage deserialize(final ByteBuf message) {
         final PacketInMessageBuilder packetInMessageBuilder = new PacketInMessageBuilder()
-                .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
                 .setXid(message.readUnsignedInt());
 
         // We are ignoring buffer id and total len as it is not specified in OpenFlowPlugin models

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializer.java
index f5f262ebabe846001d20c93036e2d73c9d4869c3..16ed5fdf30dc04f17b53ac90e2522c2e93d65eec 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializer.java
@@ -5,7 +5,6 @@
  * 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.openflowplugin.impl.protocol.deserialization.messages;
 
 import io.netty.buffer.ByteBuf;
@@ -28,7 +27,7 @@ public class PortMessageDeserializer implements OFDeserializer<PortMessage> {
     @Override
     public PortMessage deserialize(final ByteBuf message) {
         final PortMessageBuilder builder = new PortMessageBuilder()
-                .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
                 .setXid(message.readUnsignedInt())
                 .setPortNumber(new PortNumberUni(Uint32.valueOf(message.readUnsignedInt())));
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
index 945046df7c5fff6eeb449ae9be3d671d6d3b8bde..0a7d63d58c52c1d4c11f83d6b43469bcc11d88da 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
@@ -38,7 +38,7 @@ public class MultipartReplyMessageDeserializer implements OFDeserializer<Multipa
                         type, MultipartReplyBody.class));
 
         return new MultipartReplyBuilder()
-            .setVersion((short) EncodeConstants.OF13_VERSION_ID)
+            .setVersion(EncodeConstants.OF_VERSION_1_3)
             .setXid(xid)
             .setRequestMore(reqMore)
             .setMultipartReplyBody(deserializer.deserialize(message))