Added missing extension registration methods + keys (deserialization part)

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

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
index f12985919e494177e84b8ee202bf09b1b2125a54..effe69230369d5a9dca61b77ca6e4efd1beb6fb2 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactory.java
@@ -1,47 +1,43 @@
-/* Copyright (C)2013 Pantheon Technologies, s.r.o. All rights reserved. */
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
-
-import io.netty.buffer.ByteBuf;
-
-import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessageBuilder;
-
-/**
- * Translates Experimenter messages
- * @author michal.polkorab, 
- * @author timotej.kubas
- */
-public class ExperimenterMessageFactory implements OFDeserializer<ExperimenterMessage>{
-
-    private static ExperimenterMessageFactory instance;
-    
-    private ExperimenterMessageFactory() {
-        //singleton
-    }
-    
-    
-    /**
-     * @return singleton factory
-     */
-    public static synchronized ExperimenterMessageFactory getInstance(){
-        if (instance == null){
-           instance = new ExperimenterMessageFactory(); 
-        }
-        return instance;
-    }
-
-    @Override
-    public ExperimenterMessage bufferToMessage(ByteBuf rawMessage, short version) {
-        ExperimenterMessageBuilder builder = new ExperimenterMessageBuilder();
-        builder.setVersion(version);
-        builder.setXid(rawMessage.readUnsignedInt());
-        builder.setExperimenter(rawMessage.readUnsignedInt());
-        builder.setExpType(rawMessage.readUnsignedInt());
-        int remainingBytes = rawMessage.readableBytes();
-        if (remainingBytes > 0) {
-            builder.setData(rawMessage.readBytes(remainingBytes).array());
-        }
-        return builder.build();
-    }
-}
+/*\r
+ * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved.\r
+ *\r
+ * This program and the accompanying materials are made available under the\r
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
+ * and is available at http://www.eclipse.org/legal/epl-v10.html\r
+ */\r
+\r
+package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;\r
+\r
+import io.netty.buffer.ByteBuf;\r
+\r
+import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;\r
+import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistryInjector;\r
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;\r
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
+import org.opendaylight.openflowjava.util.ExperimenterDeserializerKeyFactory;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage;\r
+\r
+/**\r
+ * @author michal.polkorab\r
+ *\r
+ */\r
+public class ExperimenterMessageFactory implements OFDeserializer<ExperimenterMessage>,\r
+        DeserializerRegistryInjector {\r
+\r
+    private static final byte EXPERIMENTER_ID_INDEX = 8;\r
+    private DeserializerRegistry deserializerRegistry;\r
+\r
+    @Override\r
+    public ExperimenterMessage deserialize(ByteBuf message) {\r
+        long expId = message.getUnsignedInt(message.readerIndex() + EXPERIMENTER_ID_INDEX);\r
+        OFDeserializer<ExperimenterMessage> deserializer = deserializerRegistry.getDeserializer(\r
+                ExperimenterDeserializerKeyFactory.createExperimenterMessageDeserializerKey(\r
+                        EncodeConstants.OF13_VERSION_ID, expId));\r
+        return deserializer.deserialize(message);\r
+    }\r
+\r
+    @Override\r
+    public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) {\r
+        this.deserializerRegistry = deserializerRegistry;\r
+    }\r
+}
\ No newline at end of file