From: Robert Varga <rovarga@cisco.com>
Date: Tue, 16 Aug 2016 22:44:41 +0000 (+0200)
Subject: Make DataTreeCandidatePayload MigratedSerializable
X-Git-Tag: release/carbon~515
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d36bb316a9dd7ba06298195f4c8760dee561b8ec

Make DataTreeCandidatePayload MigratedSerializable

This class has been superseded and we want to purge it from
everywhere. Mark it as MigratedSerializable, which will trigger
a snapshot to be taken.

Change-Id: I1613d3cc2c359296718a20a4263ba848259f46d3
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java
index a971ee6ad5..f40438b269 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import org.opendaylight.controller.cluster.datastore.persisted.DataTreeCandidateInputOutput;
+import org.opendaylight.controller.cluster.raft.persisted.MigratedSerializable;
 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 
@@ -22,7 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
  * @deprecated Deprecated in Boron in favor of CommitTransactionPayload
  */
 @Deprecated
-final class DataTreeCandidatePayload extends Payload implements Externalizable {
+final class DataTreeCandidatePayload extends Payload implements Externalizable, MigratedSerializable {
     private static final long serialVersionUID = 1L;
 
     private transient byte[] serialized;
@@ -75,4 +76,16 @@ final class DataTreeCandidatePayload extends Payload implements Externalizable {
         serialized = new byte[length];
         in.readFully(serialized);
     }
+
+    @Override
+    public boolean isMigrated() {
+        return true;
+    }
+
+    @Deprecated
+    @Override
+    public Object writeReplace() {
+        // this is fine
+        return this;
+    }
 }