From 38126131b91a300c7545df31b9b1ba846292696e Mon Sep 17 00:00:00 2001 From: Moiz Raja Date: Thu, 14 Aug 2014 10:37:21 -0700 Subject: [PATCH] Do not use protobuf serialization for FindPrimary and it's responses FindPrimary, PrimaryFound and PrimaryNotFound are local messages so there is no advantage to serializing and deserializing them into protobuf messages Change-Id: Ib778c6ff10d5622276e5907292a39e77f1e72edf Signed-off-by: Moiz Raja --- .../controller/cluster/datastore/messages/FindPrimary.java | 7 +++---- .../cluster/datastore/messages/PrimaryFound.java | 7 +++---- .../cluster/datastore/messages/PrimaryNotFound.java | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java index f584467ee9..f5a6a34841 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java @@ -9,14 +9,13 @@ package org.opendaylight.controller.cluster.datastore.messages; import com.google.common.base.Preconditions; -import org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages; /** * The FindPrimary message is used to locate the primary of any given shard * */ public class FindPrimary implements SerializableMessage{ - public static final Class SERIALIZABLE_CLASS = ShardManagerMessages.FindPrimary.class; + public static final Class SERIALIZABLE_CLASS = FindPrimary.class; private final String shardName; public FindPrimary(String shardName){ @@ -32,10 +31,10 @@ public class FindPrimary implements SerializableMessage{ @Override public Object toSerializable() { - return ShardManagerMessages.FindPrimary.newBuilder().setShardName(shardName).build(); + return this; } public static FindPrimary fromSerializable(Object message){ - return new FindPrimary(((ShardManagerMessages.FindPrimary)message).getShardName()); + return (FindPrimary) message; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryFound.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryFound.java index 69502837bc..a2f6701524 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryFound.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryFound.java @@ -8,10 +8,9 @@ package org.opendaylight.controller.cluster.datastore.messages; -import org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages; public class PrimaryFound implements SerializableMessage { - public static final Class SERIALIZABLE_CLASS = ShardManagerMessages.PrimaryFound.class; + public static final Class SERIALIZABLE_CLASS = PrimaryFound.class; private final String primaryPath; public PrimaryFound(String primaryPath) { @@ -49,10 +48,10 @@ public class PrimaryFound implements SerializableMessage { @Override public Object toSerializable() { - return ShardManagerMessages.PrimaryFound.newBuilder().setPrimaryPath(primaryPath).build(); + return this; } public static PrimaryFound fromSerializable(Object message){ - return new PrimaryFound(((ShardManagerMessages.PrimaryFound)message).getPrimaryPath()); + return (PrimaryFound) message; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java index 057028c469..731a5364db 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java @@ -9,10 +9,9 @@ package org.opendaylight.controller.cluster.datastore.messages; import com.google.common.base.Preconditions; -import org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages; public class PrimaryNotFound implements SerializableMessage { - public static final Class SERIALIZABLE_CLASS = ShardManagerMessages.PrimaryNotFound.class; + public static final Class SERIALIZABLE_CLASS = PrimaryNotFound.class; private final String shardName; @@ -42,10 +41,10 @@ public class PrimaryNotFound implements SerializableMessage { @Override public Object toSerializable() { - return ShardManagerMessages.PrimaryNotFound.newBuilder().setShardName(shardName).build(); + return this; } public static PrimaryNotFound fromSerializable(Object message){ - return new PrimaryNotFound(((ShardManagerMessages.PrimaryNotFound)message).getShardName()); + return (PrimaryNotFound) message; } } -- 2.36.6