Extensibility support (deserialization part)

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / BufferHelper.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
index 92777a8e9167ceb73119ed3c622b13f698d77c5b..8a40cf2a29403d3e4fb2d923f41646f93d5f28e0 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
@@ -15,7 +15,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import org.junit.Assert;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
@@ -125,29 +125,15 @@ public abstract class BufferHelper {
         Method m2 = builder.getClass().getMethod("setXid", Long.class);
         m2.invoke(builder, BufferHelper.DEFAULT_XID);
     }
-    
-    /**
-     * Use version 1.3 for decoding message
-     * @param decoder decoder instance
-     * @param bb data input buffer
-     * @return message decoded pojo
-     */
-    public static <E extends DataObject> E decodeV13(OFDeserializer<E> decoder, ByteBuf bb) {
-        return bufferToMessage(decoder, EncodeConstants.OF13_VERSION_ID, bb);
-    }
-    
+
     /**
-     * Use version 1.0 for decoding message
+     * Decode message
      * @param decoder decoder instance
      * @param bb data input buffer
      * @return message decoded pojo
      */
-    public static <E extends DataObject> E decodeV10(OFDeserializer<E> decoder, ByteBuf bb) {
-        return bufferToMessage(decoder, EncodeConstants.OF10_VERSION_ID, bb);
-    }
-    
-    private static <E extends DataObject> E bufferToMessage(OFDeserializer<E> decoder, short version, ByteBuf bb) {
-        return decoder.bufferToMessage(bb, version);
+    public static <E extends DataObject> E deserialize(OFDeserializer<E> decoder, ByteBuf bb) {
+        return decoder.deserialize(bb);
     }
 
 }