From 10e35192bf210eeadcba20bd0c17a61bc8fd9716 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 2 Dec 2022 08:29:49 +0100 Subject: [PATCH] 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 --- .../org/opendaylight/controller/cluster/raft/RaftVersions.java | 3 +++ .../controller/cluster/raft/messages/AppendEntries.java | 2 +- .../controller/cluster/raft/messages/AppendEntriesReply.java | 2 +- .../controller/cluster/raft/messages/AppendEntriesTest.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) 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 7876ea7cf5..a81dd48e28 100644 --- 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 95965d560f..4c63f59ef8 100644 --- 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 ef2469790b..d9e6d97957 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 @@ -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 bc9c6f1b87..b061a2ca54 100644 --- 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 { -- 2.36.6