Deprecate old RaftVersions

Mark old RaftVersion constants as deprecated and adjust checks to work
on BORON instead of FLUORINE, so they can be properly removed when we
remove BORON support.

Change-Id: Id5b4d2995306d9639a2cd81b82304e090d1f105d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftVersions.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftVersions.java
index 7876ea7cf5ce6e7fdcac141598c637949ed2811b..a81dd48e28e977055eae8772f14c74051147d3e5 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftVersions.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftVersions.java
@@ -13,8 +13,11 @@ package org.opendaylight.controller.cluster.raft;
  * @author Thomas Pantelis
  */
 public final class RaftVersions {
+    @Deprecated(since = "7.0.0", forRemoval = true)
     public static final short HELIUM_VERSION = 0;
+    @Deprecated(since = "7.0.0", forRemoval = true)
     public static final short LITHIUM_VERSION = 1;
+    @Deprecated(since = "7.0.0", forRemoval = true)
     public static final short BORON_VERSION = 3;
     public static final short FLUORINE_VERSION = 4;
     public static final short CURRENT_VERSION = FLUORINE_VERSION;

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
index 95965d560f4e02c319c2fadb56394f5ecc0a2ceb..4c63f59ef88da1f4f876f3c8c4ca1b20273a29ac 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
@@ -140,7 +140,7 @@ public final class AppendEntries extends AbstractRaftRPC {
 
     @Override
     Object writeReplace() {
-        return recipientRaftVersion >= RaftVersions.FLUORINE_VERSION ? new ProxyV2(this) : new Proxy(this);
+        return recipientRaftVersion > RaftVersions.BORON_VERSION ? new ProxyV2(this) : new Proxy(this);
     }
 
     /**

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 ef2469790b00650594d420769cc6a9410ff2ce23..d9e6d9795712972af1890e5e243b06d6cf89d97b 100644 (file)
--- 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
@@ -117,7 +117,7 @@ public final class AppendEntriesReply extends AbstractRaftRPC {
 
     @Override
     Object writeReplace() {
-        return recipientRaftVersion >= RaftVersions.FLUORINE_VERSION ? new Proxy2(this) : new Proxy(this);
+        return recipientRaftVersion > RaftVersions.BORON_VERSION ? new Proxy2(this) : new Proxy(this);
     }
 
     /**

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
index bc9c6f1b87631705653f67391b8e36cf0e59d8f7..b061a2ca5431707dbeda9c9c46eb1a4ca287e83e 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
@@ -91,7 +91,7 @@ public class AppendEntriesTest {
             verifyReplicatedLogEntry(iter.next(), e);
         }
 
-        if (recipientRaftVersion >= RaftVersions.FLUORINE_VERSION) {
+        if (recipientRaftVersion > RaftVersions.BORON_VERSION) {
             assertEquals("getLeaderAddress", expected.getLeaderAddress(), actual.getLeaderAddress());
             assertEquals("getLeaderRaftVersion", RaftVersions.CURRENT_VERSION, actual.getLeaderRaftVersion());
         } else {