X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FOF10EchoRequestMessageFactory.java;h=a63c255d3c42a470bb77e8652d0c6ef86c2442fb;hb=62ce17ffcb5733ff7299fb13221921f870e11c3a;hp=e41ffd7a4107a2b7b4381c6c3f6c99e9bad398e5;hpb=7d9b6038060779d819e17d5add8556dcc097fcea;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactory.java
index e41ffd7a..a63c255d 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactory.java
@@ -1,40 +1,33 @@
-/* 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.EchoRequestMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoRequestMessageBuilder;
-
-/**
- * Translates EchoRequest messages (OpenFlow v1.0)
- * @author michal.polkorab
- */
-public class OF10EchoRequestMessageFactory implements OFDeserializer<EchoRequestMessage> {
-
-    private static OF10EchoRequestMessageFactory instance;
-
-    private OF10EchoRequestMessageFactory() {
-        // do nothing, just singleton
-    }
-    
-    /**
-     * @return singleton factory
-     */
-    public static synchronized OF10EchoRequestMessageFactory getInstance() {
-        if (instance == null) {
-            instance = new OF10EchoRequestMessageFactory();
-        }
-        return instance;
-    }
-
-    @Override
-    public EchoRequestMessage bufferToMessage(ByteBuf rawMessage, short version) {
-        EchoRequestMessageBuilder builder = new EchoRequestMessageBuilder();
-        builder.setVersion(version);
-        builder.setXid(rawMessage.readUnsignedInt());
-        builder.setData(rawMessage.readBytes(rawMessage.readableBytes()).array());
-        return builder.build();
-    }
-}
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.deserialization.factories;
+
+import io.netty.buffer.ByteBuf;
+
+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.protocol.rev130731.EchoRequestMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoRequestMessageBuilder;
+
+/**
+ * Translates EchoRequest messages (both OpenFlow v1.0 and OpenFlow v1.3)
+ * @author michal.polkorab
+ * @author timotej.kubas
+ */
+public class OF10EchoRequestMessageFactory implements OFDeserializer<EchoRequestMessage>{
+
+    @Override
+    public EchoRequestMessage deserialize(ByteBuf rawMessage) {
+        EchoRequestMessageBuilder builder = new EchoRequestMessageBuilder();
+        builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
+        builder.setXid(rawMessage.readUnsignedInt());
+        builder.setData(rawMessage.readBytes(rawMessage.readableBytes()).array());
+        return builder.build();
+    }
+}