Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / VendorInputMessageFactory.java

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java
index fef8e5afa766cc5b8790a674a6bc859d935ef83f..b15ce2e5117325c8333f49ed49be1b8a4b654973 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/VendorInputMessageFactory.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.openflowjava.protocol.impl.serialization.factories;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -18,6 +17,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.util.ExperimenterSerializerKeyFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterOfMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Translates Vendor messages (OF-1.0 limited version - skipping experimenter type).
@@ -31,13 +31,13 @@ public class VendorInputMessageFactory implements OFSerializer<ExperimenterOfMes
 
     @Override
     @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull
-    public void serialize(ExperimenterOfMessage message, ByteBuf outBuffer) {
+    public void serialize(final ExperimenterOfMessage message, final ByteBuf outBuffer) {
         Objects.requireNonNull(registry);
 
-        long expId = message.getExperimenter().getValue().toJava();
+        Uint32 expId = message.getExperimenter().getValue();
         OFSerializer<ExperimenterDataOfChoice> serializer = registry.getSerializer(
                 ExperimenterSerializerKeyFactory.createExperimenterMessageSerializerKey(
-                        EncodeConstants.OF10_VERSION_ID, expId, message.getExpType().longValue()));
+                        EncodeConstants.OF_VERSION_1_0, expId, message.getExpType().longValue()));
 
         // write experimenterId
         outBuffer.writeInt(message.getExperimenter().getValue().intValue());
@@ -46,7 +46,7 @@ public class VendorInputMessageFactory implements OFSerializer<ExperimenterOfMes
     }
 
     @Override
-    public void injectSerializerRegistry(SerializerRegistry serializerRegistry) {
+    public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) {
         this.registry = serializerRegistry;
     }
 }