From: Tom Pantelis Date: Wed, 24 May 2017 13:40:52 +0000 (-0400) Subject: Bug 5740: Remove Serializable where not necessary X-Git-Tag: release/nitrogen~183 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=bfe4439155b27fbf9ae300252420c8a81fcbdb80 Bug 5740: Remove Serializable where not necessary Some raft message classes are Serializable but they don't need to be as they're only sent locally. Change-Id: Ibd052b9a4589dd2476b30c51e301b3dd609df750 Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ApplyState.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ApplyState.java index 1f92d5ffe0..498d8d3bbb 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ApplyState.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ApplyState.java @@ -9,12 +9,13 @@ package org.opendaylight.controller.cluster.raft.base.messages; import akka.actor.ActorRef; -import java.io.Serializable; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.yangtools.concepts.Identifier; -public class ApplyState implements Serializable { - private static final long serialVersionUID = 1L; +/** + * Local message sent by a RaftActor to itself to signal state has been applied to the state machine. + */ +public class ApplyState { private final ActorRef clientActor; private final Identifier identifier; private final ReplicatedLogEntry replicatedLogEntry; diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ElectionTimeout.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ElectionTimeout.java index 8dd49e1cad..606835e21f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ElectionTimeout.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/ElectionTimeout.java @@ -8,13 +8,10 @@ package org.opendaylight.controller.cluster.raft.base.messages; -import java.io.Serializable; - /** - * Message sent to indicate the current election term has timed out. + * Local message sent to indicate the current election term has timed out. */ -public final class ElectionTimeout implements Serializable { - private static final long serialVersionUID = 1L; +public final class ElectionTimeout { public static final ElectionTimeout INSTANCE = new ElectionTimeout(); private ElectionTimeout() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/InitiateCaptureSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/InitiateCaptureSnapshot.java index d848a8442d..85dcad7f55 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/InitiateCaptureSnapshot.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/InitiateCaptureSnapshot.java @@ -8,8 +8,5 @@ package org.opendaylight.controller.cluster.raft.base.messages; -import java.io.Serializable; - -public class InitiateCaptureSnapshot implements Serializable { - private static final long serialVersionUID = 1L; +public class InitiateCaptureSnapshot { } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/Replicate.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/Replicate.java index 1845f735b4..c58d86354a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/Replicate.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/Replicate.java @@ -9,12 +9,10 @@ package org.opendaylight.controller.cluster.raft.base.messages; import akka.actor.ActorRef; -import java.io.Serializable; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.yangtools.concepts.Identifier; -public class Replicate implements Serializable { - private static final long serialVersionUID = 1L; +public class Replicate { private final ActorRef clientActor; private final Identifier identifier; private final ReplicatedLogEntry replicatedLogEntry; diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SendHeartBeat.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SendHeartBeat.java index ba1c157d37..31d15ddddf 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SendHeartBeat.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SendHeartBeat.java @@ -8,13 +8,10 @@ package org.opendaylight.controller.cluster.raft.base.messages; -import java.io.Serializable; - /** * This messages is sent via a schedule to the Leader to prompt it to send a heart beat to its followers. */ -public final class SendHeartBeat implements Serializable { - private static final long serialVersionUID = 1L; +public final class SendHeartBeat { public static final SendHeartBeat INSTANCE = new SendHeartBeat(); private SendHeartBeat() {