Bug 2756 - Action model update

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / deserialization / factories / RoleReplyMessageFactory.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactory.java
index 9f9fec9a02fb88c6e2b41884713e57e0fbf2db1c..f42bd84d7bff169fd5f375f2e96d9763805c167d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactory.java
@@ -12,7 +12,8 @@ import io.netty.buffer.ByteBuf;
 
 import java.math.BigInteger;
 
-import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ControllerRole;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestOutputBuilder;
@@ -23,34 +24,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab
  */
 public class RoleReplyMessageFactory implements OFDeserializer<RoleRequestOutput>{
-    private static RoleReplyMessageFactory instance;
+
     private static final byte PADDING_IN_ROLE_REPLY_HEADER = 4;
-    
-    private RoleReplyMessageFactory() {
-        // singleton
-    }
-    
-    /**
-     * 
-     * @return singleton factory
-     */
-    public static synchronized RoleReplyMessageFactory getInstance(){
-        if(instance == null){
-            instance = new RoleReplyMessageFactory();
-        }
-        return instance;
-    }
 
     @Override
-    public RoleRequestOutput bufferToMessage(ByteBuf rawMessage, short version) {
+    public RoleRequestOutput deserialize(ByteBuf rawMessage) {
         RoleRequestOutputBuilder builder = new RoleRequestOutputBuilder();
-        builder.setVersion(version);
+        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setRole(ControllerRole.forValue((int) rawMessage.readUnsignedInt()));
         rawMessage.skipBytes(PADDING_IN_ROLE_REPLY_HEADER);
         byte[] generationID = new byte[8];
         rawMessage.readBytes(generationID);
-        builder.setGenerationId(new BigInteger(generationID));
+        builder.setGenerationId(new BigInteger(1, generationID));
         return builder.build();
     }
 }