From ce51608c403fd3ca5989afb4a4667e125f722fb4 Mon Sep 17 00:00:00 2001 From: tpantelis Date: Sun, 1 Feb 2015 22:10:19 -0500 Subject: [PATCH] Bug 2410: Use generated serialVersionUID for messages Changed the remaining message classes whose serialVersionUID had previously been set to 1 to the generated value to maintain backwards compatibility with Helium. It turns out CommitEntry, PersistEntry, and SaveSnapShot are no longer used so I removed them. Change-Id: Ib3c251b7eaf8b8ce5aa4edf693aca23bf67d0402 Signed-off-by: tpantelis --- .../controller/cluster/raft/Snapshot.java | 3 +- .../raft/base/messages/CommitEntry.java | 18 -------- .../raft/base/messages/PersistEntry.java | 18 -------- .../raft/base/messages/SaveSnapshot.java | 19 -------- .../raft/messages/AppendEntriesReply.java | 3 +- .../raft/messages/InstallSnapshotReply.java | 4 +- .../cluster/raft/messages/RequestVote.java | 3 +- .../raft/messages/RequestVoteReply.java | 3 +- .../cluster/datastore/ShardManager.java | 21 ++++----- .../remote/rpc/messages/ExecuteRpc.java | 33 +++++++------- .../remote/rpc/messages/InvokeRpc.java | 43 +++++++++---------- .../remote/rpc/messages/RpcResponse.java | 17 ++++---- .../remote/rpc/registry/RoutingTable.java | 2 +- .../rpc/registry/gossip/BucketImpl.java | 2 +- .../remote/rpc/registry/gossip/Messages.java | 16 ++++--- 15 files changed, 79 insertions(+), 126 deletions(-) delete mode 100644 opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/CommitEntry.java delete mode 100644 opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/PersistEntry.java delete mode 100644 opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SaveSnapshot.java diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/Snapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/Snapshot.java index 77bf103701..feccea7edb 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/Snapshot.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/Snapshot.java @@ -12,7 +12,8 @@ import java.util.List; public class Snapshot implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -8298574936724056236L; + private final byte[] state; private final List unAppliedEntries; private final long lastIndex; diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/CommitEntry.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/CommitEntry.java deleted file mode 100644 index 6335e3272e..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/CommitEntry.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. 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.controller.cluster.raft.base.messages; - -import java.io.Serializable; - -/** - * Message sent to commit an entry to the log - */ -public class CommitEntry implements Serializable { - private static final long serialVersionUID = 1L; -} diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/PersistEntry.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/PersistEntry.java deleted file mode 100644 index 68ecc1289b..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/PersistEntry.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. 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.controller.cluster.raft.base.messages; - -import java.io.Serializable; - -/** - * Message sent to Persist an entry into the transaction journal - */ -public class PersistEntry implements Serializable { - private static final long serialVersionUID = 1L; -} diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SaveSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SaveSnapshot.java deleted file mode 100644 index 7b7f085856..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/SaveSnapshot.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. 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.controller.cluster.raft.base.messages; - -import java.io.Serializable; - -/** - * This message is sent by a RaftActor to itself so that a subclass can process - * it and use it to save it's state - */ -public class SaveSnapshot implements Serializable { - private static final long serialVersionUID = 1L; -} diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesReply.java index a782eda565..32ed85b281 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesReply.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesReply.java @@ -12,7 +12,7 @@ package org.opendaylight.controller.cluster.raft.messages; * Reply for the AppendEntriesRpc message */ public class AppendEntriesReply extends AbstractRaftRPC { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -7487547356392536683L; // true if follower contained entry matching // prevLogIndex and prevLogTerm @@ -38,6 +38,7 @@ public class AppendEntriesReply extends AbstractRaftRPC { this.logLastTerm = logLastTerm; } + @Override public long getTerm() { return term; } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java index 71e7ecc189..15621bf894 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java @@ -9,13 +9,13 @@ package org.opendaylight.controller.cluster.raft.messages; public class InstallSnapshotReply extends AbstractRaftRPC { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 642227896390779503L; // The followerId - this will be used to figure out which follower is // responding private final String followerId; private final int chunkIndex; - private boolean success; + private final boolean success; public InstallSnapshotReply(long term, String followerId, int chunkIndex, boolean success) { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java index 8321d0c25b..9ba5acb664 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java @@ -12,7 +12,7 @@ package org.opendaylight.controller.cluster.raft.messages; * Invoked by candidates to gather votes (§5.2). */ public class RequestVote extends AbstractRaftRPC { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -6967509186297108657L; // candidate requesting vote private String candidateId; @@ -35,6 +35,7 @@ public class RequestVote extends AbstractRaftRPC { public RequestVote() { } + @Override public long getTerm() { return term; } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java index da3ba5c39f..b3c95d6eca 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java @@ -9,7 +9,7 @@ package org.opendaylight.controller.cluster.raft.messages; public class RequestVoteReply extends AbstractRaftRPC { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 8427899326488775660L; // true means candidate received vot private final boolean voteGranted; @@ -19,6 +19,7 @@ public class RequestVoteReply extends AbstractRaftRPC { this.voteGranted = voteGranted; } + @Override public long getTerm() { return term; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java index 10876045ae..22e2dbd47d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java @@ -27,6 +27,15 @@ import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedPersistentActorWithMetering; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; @@ -46,15 +55,6 @@ import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContex import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.duration.Duration; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * The ShardManager has the following jobs, @@ -555,7 +555,8 @@ public class ShardManager extends AbstractUntypedPersistentActorWithMetering { } static class SchemaContextModules implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -8884620101025936590L; + private final Set modules; SchemaContextModules(Set modules){ diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java index 4bb5258b40..5d780be641 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java @@ -9,29 +9,28 @@ package org.opendaylight.controller.remote.rpc.messages; import com.google.common.base.Preconditions; -import org.opendaylight.yangtools.yang.common.QName; - import java.io.Serializable; +import org.opendaylight.yangtools.yang.common.QName; public class ExecuteRpc implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1128904894827335676L; - private final String inputCompositeNode; - private final QName rpc; + private final String inputCompositeNode; + private final QName rpc; - public ExecuteRpc(final String inputCompositeNode, final QName rpc) { - Preconditions.checkNotNull(inputCompositeNode, "Composite Node input string should be present"); - Preconditions.checkNotNull(rpc, "rpc Qname should not be null"); + public ExecuteRpc(final String inputCompositeNode, final QName rpc) { + Preconditions.checkNotNull(inputCompositeNode, "Composite Node input string should be present"); + Preconditions.checkNotNull(rpc, "rpc Qname should not be null"); - this.inputCompositeNode = inputCompositeNode; - this.rpc = rpc; - } + this.inputCompositeNode = inputCompositeNode; + this.rpc = rpc; + } - public String getInputCompositeNode() { - return inputCompositeNode; - } + public String getInputCompositeNode() { + return inputCompositeNode; + } - public QName getRpc() { - return rpc; - } + public QName getRpc() { + return rpc; + } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/InvokeRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/InvokeRpc.java index 652569b7ba..9c40dbfc58 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/InvokeRpc.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/InvokeRpc.java @@ -8,37 +8,36 @@ package org.opendaylight.controller.remote.rpc.messages; import com.google.common.base.Preconditions; +import java.io.Serializable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import java.io.Serializable; - public class InvokeRpc implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -2813459607858108953L; - private final QName rpc; - private final YangInstanceIdentifier identifier; - private final CompositeNode input; + private final QName rpc; + private final YangInstanceIdentifier identifier; + private final CompositeNode input; - public InvokeRpc(final QName rpc, final YangInstanceIdentifier identifier, final CompositeNode input) { - Preconditions.checkNotNull(rpc, "rpc qname should not be null"); - Preconditions.checkNotNull(input, "rpc input should not be null"); + public InvokeRpc(final QName rpc, final YangInstanceIdentifier identifier, final CompositeNode input) { + Preconditions.checkNotNull(rpc, "rpc qname should not be null"); + Preconditions.checkNotNull(input, "rpc input should not be null"); - this.rpc = rpc; - this.identifier = identifier; - this.input = input; - } + this.rpc = rpc; + this.identifier = identifier; + this.input = input; + } - public QName getRpc() { - return rpc; - } + public QName getRpc() { + return rpc; + } - public YangInstanceIdentifier getIdentifier() { - return identifier; - } + public YangInstanceIdentifier getIdentifier() { + return identifier; + } - public CompositeNode getInput() { - return input; - } + public CompositeNode getInput() { + return input; + } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java index 387cb90112..e6b208cb6f 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java @@ -10,14 +10,15 @@ package org.opendaylight.controller.remote.rpc.messages; import java.io.Serializable; public class RpcResponse implements Serializable { - private static final long serialVersionUID = 1L; - private final String resultCompositeNode; + private static final long serialVersionUID = -4211279498688989245L; - public RpcResponse(final String resultCompositeNode) { - this.resultCompositeNode = resultCompositeNode; - } + private final String resultCompositeNode; - public String getResultCompositeNode() { - return resultCompositeNode; - } + public RpcResponse(final String resultCompositeNode) { + this.resultCompositeNode = resultCompositeNode; + } + + public String getResultCompositeNode() { + return resultCompositeNode; + } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java index 52b1106c87..f67657f692 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java @@ -17,7 +17,7 @@ import org.opendaylight.controller.remote.rpc.registry.gossip.Copier; import org.opendaylight.controller.sal.connector.api.RpcRouter; public class RoutingTable implements Copier, Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 5592610415175278760L; private final Map, Long> table = new HashMap<>(); private ActorRef router; diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java index b81175e9a2..4c4573d909 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.remote.rpc.registry.gossip; import java.io.Serializable; public class BucketImpl> implements Bucket, Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 294779770032719196L; private Long version = System.currentTimeMillis(); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java index b05bd7d0f6..00437e7e56 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Messages.java @@ -46,7 +46,8 @@ public class Messages { } public static class ContainsBuckets implements Serializable{ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -4940160367495308286L; + private final Map buckets; public ContainsBuckets(Map buckets){ @@ -87,7 +88,8 @@ public class Messages { } public static class ContainsBucketVersions implements Serializable{ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -8172148925383801613L; + Map versions; public ContainsBucketVersions(Map versions) { @@ -119,15 +121,16 @@ public class Messages { public static class GossiperMessages{ public static class Tick implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -4770935099506366773L; } public static final class GossipTick extends Tick { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 5803354404380026143L; } public static final class GossipStatus extends ContainsBucketVersions implements Serializable{ - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -593037395143883265L; + private final Address from; public GossipStatus(Address from, Map versions) { @@ -141,7 +144,8 @@ public class Messages { } public static final class GossipEnvelope extends ContainsBuckets implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 8346634072582438818L; + private final Address from; private final Address to; -- 2.36.6