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 <tompantelis@gmail.com>

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 1f92d5ffe0535248a97da655531fad97f66736d3..498d8d3bbbd3e923c81a0b254254c0eb19e2ff4f 100644 (file)
--- 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;
 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;
 
 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;
     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 8dd49e1cad4982aad17d1084671c2a792aa7078f..606835e21fb09f3cda595aa3cdb27c052a885678 100644 (file)
--- 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;
 
 
 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() {
     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 d848a8442db298528a6161d1b3269b36ac669b88..85dcad7f55ee2072dbe7509692934804a28cdc6b 100644 (file)
--- 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;
 
 
 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 1845f735b4cda2167e31d2a30c03b7e51aecccac..c58d86354a917d9fc968de3eff2b97ba6107d356 100644 (file)
--- 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;
 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;
 
 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;
     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 ba1c157d37241f2274c9c7a9ed307f281a282a82..31d15ddddfc52bee94365954a0dd56fe92f93b9d 100644 (file)
--- 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;
 
 
 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.
  */
 /**
  * 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() {
     public static final SendHeartBeat INSTANCE = new SendHeartBeat();
 
     private SendHeartBeat() {