Extensibility refactoring

[openflowjava.git] / openflow-protocol-api / src / main / java / org / opendaylight / openflowjava / protocol / api / extensibility / EnhancedMessageTypeKey.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/EnhancedMessageTypeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
similarity index 75%
rename from openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/EnhancedMessageTypeKey.java
rename to openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
index f16987d19507c716d800d91937d4df159541cd0e..15919e4f38805681cf18a9106e853b99f6c0b4c8 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/EnhancedMessageTypeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
@@ -5,10 +5,8 @@
  * 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
-package org.opendaylight.openflowjava.protocol.impl.deserialization;\r
+package org.opendaylight.openflowjava.protocol.api.extensibility;\r
 \r
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;\r
 \r
 /**\r
  * More specific key for {@link SerializerRegistry}\r
@@ -30,13 +28,6 @@ public class EnhancedMessageTypeKey<E, F> extends MessageTypeKey<E> {
         this.msgType2 = msgType2;\r
     }\r
 \r
-    /**\r
-     * @return more specific type\r
-     */\r
-    public Class<F> getMsgType2() {\r
-        return msgType2;\r
-    }\r
-\r
     @Override\r
     public boolean equals(Object obj) {\r
         if (this == obj)\r
@@ -50,7 +41,7 @@ public class EnhancedMessageTypeKey<E, F> extends MessageTypeKey<E> {
         if (msgType2 == null) {\r
             if (other.msgType2 != null)\r
                 return false;\r
-        } else if (!msgType2.equals(other.msgType2))\r
+        } else if (!msgType2.getName().equals(other.msgType2.getName()))\r
             return false;\r
         return true;\r
     }\r