From 844efe1d20cb61e5983532038e5135793fde5863 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 29 Dec 2023 10:10:25 +0100 Subject: [PATCH] Deprecate ask-based protocol messages Since we have removed the ask-based client, we really have no way of testing ask-based messages' interaction with Shard. We keep Shard compatible, but deprecate all ask-based messages and methods/classes dealing with them on the backend. JIRA: CONTROLLER-2054 Change-Id: I5764713b686ae11f8d750e691576b6d20637ab7d Signed-off-by: Robert Varga --- .../cluster/datastore/CohortEntry.java | 1 + .../controller/cluster/datastore/Shard.java | 56 ++++++++++++------- .../datastore/ShardCommitCoordinator.java | 2 + .../datastore/ShardReadTransaction.java | 3 +- .../datastore/ShardReadWriteTransaction.java | 8 +-- .../cluster/datastore/ShardTransaction.java | 28 ++++------ .../ShardTransactionActorFactory.java | 29 ++++------ .../ShardTransactionMessageRetrySupport.java | 3 +- .../datastore/ShardWriteTransaction.java | 3 +- .../cluster/datastore/TransactionType.java | 14 ++--- .../datastore/messages/AbortTransaction.java | 11 ++-- .../messages/AbortTransactionReply.java | 9 +-- .../datastore/messages/AbstractRead.java | 1 + .../AbstractThreePhaseCommitMessage.java | 1 + .../messages/BatchedModifications.java | 24 ++++---- .../messages/BatchedModificationsReply.java | 10 ++-- .../messages/CanCommitTransaction.java | 11 ++-- .../messages/CanCommitTransactionReply.java | 13 +++-- .../datastore/messages/CloseTransaction.java | 9 +-- .../messages/CloseTransactionChain.java | 4 +- .../messages/CloseTransactionReply.java | 2 +- .../datastore/messages/CommitTransaction.java | 11 ++-- .../messages/CommitTransactionReply.java | 9 +-- .../datastore/messages/CreateTransaction.java | 4 +- .../messages/CreateTransactionReply.java | 12 ++-- .../datastore/messages/DataExists.java | 10 ++-- .../datastore/messages/DataExistsReply.java | 8 +-- .../messages/ForwardedReadyTransaction.java | 3 +- .../cluster/datastore/messages/ReadData.java | 1 + .../datastore/messages/ReadDataReply.java | 1 + .../messages/ReadyLocalTransaction.java | 1 + .../ReadyLocalTransactionSerializer.java | 2 +- .../messages/ReadyTransactionReply.java | 13 +++-- .../VersionedExternalizableMessage.java | 1 + .../modification/AbstractModification.java | 2 +- .../modification/CompositeModification.java | 1 + .../modification/DeleteModification.java | 4 +- .../modification/MergeModification.java | 3 +- .../MutableCompositeModification.java | 1 + .../modification/WriteModification.java | 1 + .../AbstractBatchedModificationsCursor.java | 1 + .../ShardCommitCoordinationTest.java | 3 +- .../cluster/datastore/ShardTest.java | 4 ++ .../ShardTransactionFailureTest.java | 1 + .../datastore/ShardTransactionTest.java | 1 + .../messages/AbortTransactionReplyTest.java | 2 +- .../messages/AbortTransactionTest.java | 2 +- .../messages/BatchedModificationsTest.java | 1 + .../CanCommitTransactionReplyTest.java | 2 +- .../messages/CanCommitTransactionTest.java | 2 +- .../messages/CloseTransactionChainTest.java | 1 + .../messages/CloseTransactionTest.java | 1 + .../messages/CommitTransactionReplyTest.java | 2 +- .../messages/CommitTransactionTest.java | 1 + .../messages/CreateTransactionReplyTest.java | 2 +- .../messages/CreateTransactionTest.java | 2 +- .../messages/DataExistsReplyTest.java | 2 +- .../datastore/messages/DataExistsTest.java | 2 +- .../datastore/messages/ReadDataReplyTest.java | 1 + .../datastore/messages/ReadDataTest.java | 2 +- .../ReadyLocalTransactionSerializerTest.java | 2 +- .../messages/ReadyTransactionReplyTest.java | 1 + .../AbstractModificationTest.java | 1 + .../modification/DeleteModificationTest.java | 1 + .../modification/MergeModificationTest.java | 1 + .../MutableCompositeModificationTest.java | 1 + .../modification/WriteModificationTest.java | 1 + 67 files changed, 212 insertions(+), 161 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java index 4260ff733b..120b004a6e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java @@ -24,6 +24,7 @@ import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; +@Deprecated(since = "9.0.0", forRemoval = true) final class CohortEntry { private final ReadWriteShardDataTreeTransaction transaction; private final TransactionIdentifier transactionId; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index a7927d824d..a9b401706b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -51,7 +51,6 @@ import org.opendaylight.controller.cluster.access.commands.OutOfSequenceEnvelope import org.opendaylight.controller.cluster.access.commands.TransactionRequest; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; -import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.controller.cluster.access.concepts.RequestEnvelope; import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.opendaylight.controller.cluster.access.concepts.RequestSuccess; @@ -181,6 +180,7 @@ public class Shard extends RaftActor { private DatastoreContext datastoreContext; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardCommitCoordinator commitCoordinator; private long transactionCommitTimeout; @@ -191,6 +191,7 @@ public class Shard extends RaftActor { private final MessageTracker appendEntriesReplyTracker; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardTransactionActorFactory transactionActorFactory; private final ShardSnapshotCohort snapshotCohort; @@ -199,6 +200,7 @@ public class Shard extends RaftActor { private ShardSnapshot restoreFromSnapshot; + @Deprecated(since = "9.0.0", forRemoval = true) private final ShardTransactionMessageRetrySupport messageRetrySupport; @VisibleForTesting @@ -702,13 +704,14 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCommitTransaction(final CommitTransaction commit) { - final TransactionIdentifier txId = commit.getTransactionId(); + final var txId = commit.getTransactionId(); if (isLeader()) { askProtocolEncountered(txId); commitCoordinator.handleCommit(txId, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (leader == null) { messageRetrySupport.addMessageToRetry(commit, getSender(), "Could not commit transaction " + txId); } else { @@ -718,15 +721,16 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCanCommitTransaction(final CanCommitTransaction canCommit) { - final TransactionIdentifier txId = canCommit.getTransactionId(); + final var txId = canCommit.getTransactionId(); LOG.debug("{}: Can committing transaction {}", persistenceId(), txId); if (isLeader()) { askProtocolEncountered(txId); commitCoordinator.handleCanCommit(txId, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (leader == null) { messageRetrySupport.addMessageToRetry(canCommit, getSender(), "Could not canCommit transaction " + txId); @@ -738,6 +742,7 @@ public class Shard extends RaftActor { } @SuppressWarnings("checkstyle:IllegalCatch") + @Deprecated(since = "9.0.0", forRemoval = true) private void handleBatchedModificationsLocal(final BatchedModifications batched, final ActorRef sender) { askProtocolEncountered(batched.getTransactionId()); @@ -750,6 +755,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleBatchedModifications(final BatchedModifications batched) { // This message is sent to prepare the modifications transaction directly on the Shard as an // optimization to avoid the extra overhead of a separate ShardTransaction actor. On the last @@ -767,7 +773,7 @@ public class Shard extends RaftActor { if (isLeader() && isLeaderActive) { handleBatchedModificationsLocal(batched, getSender()); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(batched, getSender(), "Could not process BatchedModifications " + batched.getTransactionId()); @@ -776,9 +782,8 @@ public class Shard extends RaftActor { // we need to reconstruct previous BatchedModifications from the transaction // DataTreeModification, honoring the max batched modification count, and forward all the // previous BatchedModifications to the new leader. - Collection newModifications = commitCoordinator - .createForwardedBatchedModifications(batched, - datastoreContext.getShardBatchedModificationCount()); + final var newModifications = commitCoordinator.createForwardedBatchedModifications(batched, + datastoreContext.getShardBatchedModificationCount()); LOG.debug("{}: Forwarding {} BatchedModifications to leader {}", persistenceId(), newModifications.size(), leader); @@ -807,11 +812,12 @@ public class Shard extends RaftActor { } @SuppressWarnings("checkstyle:IllegalCatch") - private void handleReadyLocalTransaction(final ReadyLocalTransaction message) { - final TransactionIdentifier txId = message.getTransactionId(); + @Deprecated(since = "9.0.0", forRemoval = true) + private void handleReadyLocalTransaction(final ReadyLocalTransaction message) { + final var txId = message.getTransactionId(); LOG.debug("{}: handleReadyLocalTransaction for {}", persistenceId(), txId); - boolean isLeaderActive = isLeaderActive(); + final var isLeaderActive = isLeaderActive(); if (isLeader() && isLeaderActive) { askProtocolEncountered(txId); try { @@ -821,7 +827,7 @@ public class Shard extends RaftActor { getSender().tell(new Failure(e), getSelf()); } } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(message, getSender(), "Could not process ready local transaction " + txId); @@ -833,22 +839,23 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleForwardedReadyTransaction(final ForwardedReadyTransaction forwardedReady) { LOG.debug("{}: handleForwardedReadyTransaction for {}", persistenceId(), forwardedReady.getTransactionId()); - boolean isLeaderActive = isLeaderActive(); + final var isLeaderActive = isLeaderActive(); if (isLeader() && isLeaderActive) { askProtocolEncountered(forwardedReady.getTransactionId()); commitCoordinator.handleForwardedReadyTransaction(forwardedReady, getSender(), this); } else { - ActorSelection leader = getLeader(); + final var leader = getLeader(); if (!isLeaderActive || leader == null) { messageRetrySupport.addMessageToRetry(forwardedReady, getSender(), "Could not process forwarded ready transaction " + forwardedReady.getTransactionId()); } else { LOG.debug("{}: Forwarding ForwardedReadyTransaction to leader {}", persistenceId(), leader); - ReadyLocalTransaction readyLocal = new ReadyLocalTransaction(forwardedReady.getTransactionId(), + final var readyLocal = new ReadyLocalTransaction(forwardedReady.getTransactionId(), forwardedReady.getTransaction().getSnapshot(), forwardedReady.isDoImmediateCommit(), forwardedReady.getParticipatingShardNames()); readyLocal.setRemoteVersion(getCurrentBehavior().getLeaderPayloadVersion()); @@ -857,8 +864,9 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleAbortTransaction(final AbortTransaction abort) { - final TransactionIdentifier transactionId = abort.getTransactionId(); + final var transactionId = abort.getTransactionId(); askProtocolEncountered(transactionId); doAbortTransaction(transactionId, getSender()); } @@ -867,6 +875,7 @@ public class Shard extends RaftActor { commitCoordinator.handleAbort(transactionID, sender, this); } + @Deprecated(since = "9.0.0", forRemoval = true) private void handleCreateTransaction(final Object message) { if (isLeader()) { createTransaction(CreateTransaction.fromSerializable(message)); @@ -878,9 +887,10 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private void closeTransactionChain(final CloseTransactionChain closeTransactionChain) { if (isLeader()) { - final LocalHistoryIdentifier id = closeTransactionChain.getIdentifier(); + final var id = closeTransactionChain.getIdentifier(); askProtocolEncountered(id.getClientId()); store.closeTransactionChain(id); } else if (getLeader() != null) { @@ -890,6 +900,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) @SuppressWarnings("checkstyle:IllegalCatch") private void createTransaction(final CreateTransaction createTransaction) { askProtocolEncountered(createTransaction.getTransactionId()); @@ -900,7 +911,7 @@ public class Shard extends RaftActor { return; } - ActorRef transactionActor = createTransaction(createTransaction.getTransactionType(), + final var transactionActor = createTransaction(createTransaction.getTransactionType(), createTransaction.getTransactionId()); getSender().tell(new CreateTransactionReply(Serialization.serializedActorPath(transactionActor), @@ -910,6 +921,7 @@ public class Shard extends RaftActor { } } + @Deprecated(since = "9.0.0", forRemoval = true) private ActorRef createTransaction(final int transactionType, final TransactionIdentifier transactionId) { LOG.debug("{}: Creating transaction : {} ", persistenceId(), transactionId); return transactionActorFactory.newShardTransaction(TransactionType.fromInt(transactionType), @@ -917,14 +929,16 @@ public class Shard extends RaftActor { } // Called on leader only + @Deprecated(since = "9.0.0", forRemoval = true) private void askProtocolEncountered(final TransactionIdentifier transactionId) { askProtocolEncountered(transactionId.getHistoryId().getClientId()); } // Called on leader only + @Deprecated(since = "9.0.0", forRemoval = true) private void askProtocolEncountered(final ClientIdentifier clientId) { - final FrontendIdentifier frontend = clientId.getFrontendId(); - final LeaderFrontendState state = knownFrontends.get(frontend); + final var frontend = clientId.getFrontendId(); + final var state = knownFrontends.get(frontend); if (!(state instanceof LeaderFrontendState.Disabled)) { LOG.debug("{}: encountered ask-based client {}, disabling transaction tracking", persistenceId(), clientId); if (knownFrontends.isEmpty()) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java index 8073184508..946203b6b7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java @@ -47,6 +47,7 @@ import org.slf4j.Logger; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) final class ShardCommitCoordinator { // Interface hook for unit tests to replace or decorate the ShardDataTreeCohorts. @@ -206,6 +207,7 @@ final class ShardCommitCoordinator { } } + @Deprecated(since = "9.0.0", forRemoval = true) Collection createForwardedBatchedModifications(final BatchedModifications from, final int maxModificationsPerBatch) { CohortEntry cohortEntry = cohortCache.remove(from.getTransactionId()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java index 49cb3c4d38..ac751fb33d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java @@ -18,7 +18,8 @@ import org.opendaylight.controller.cluster.datastore.messages.ReadData; * * @author syedbahm */ -public class ShardReadTransaction extends ShardTransaction { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class ShardReadTransaction extends ShardTransaction { private final AbstractShardDataTreeTransaction transaction; public ShardReadTransaction(final AbstractShardDataTreeTransaction transaction, final ActorRef shardActor, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java index 8cbf143673..84c346def8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java @@ -5,7 +5,6 @@ * 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.datastore; import akka.actor.ActorRef; @@ -17,14 +16,15 @@ import org.opendaylight.controller.cluster.datastore.messages.ReadData; * * @author syedbahm */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ShardReadWriteTransaction extends ShardWriteTransaction { - public ShardReadWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor, - ShardStats shardStats) { + public ShardReadWriteTransaction(final ReadWriteShardDataTreeTransaction transaction, final ActorRef shardActor, + final ShardStats shardStats) { super(transaction, shardActor, shardStats); } @Override - public void handleReceive(Object message) { + public void handleReceive(final Object message) { if (ReadData.isSerializedType(message)) { readData(ReadData.fromSerializable(message)); } else if (DataExists.isSerializedType(message)) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java index 44393a14f1..3b3462884f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java @@ -29,6 +29,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** * The ShardTransaction Actor represents a remote transaction that delegates all actions to DOMDataReadWriteTransaction. */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class ShardTransaction extends AbstractUntypedActorWithMetering { private final ActorRef shardActor; private final ShardStats shardStats; @@ -119,7 +120,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Some fields are not Serializable but we don't " + "create remote instances of this actor and thus don't need it to be Serializable.") private static class ShardTransactionCreator implements Creator { - + @java.io.Serial private static final long serialVersionUID = 1L; final AbstractShardDataTreeTransaction transaction; @@ -139,23 +140,14 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering @Override public ShardTransaction create() { - final ShardTransaction tx; - switch (type) { - case READ_ONLY: - tx = new ShardReadTransaction(transaction, shardActor, shardStats); - break; - case READ_WRITE: - tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor, - shardStats); - break; - case WRITE_ONLY: - tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor, - shardStats); - break; - default: - throw new IllegalArgumentException("Unhandled transaction type " + type); - } - + final var tx = switch (type) { + case READ_ONLY -> new ShardReadTransaction(transaction, shardActor, shardStats); + case READ_WRITE -> new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction) transaction, + shardActor, shardStats); + case WRITE_ONLY -> new ShardWriteTransaction((ReadWriteShardDataTreeTransaction) transaction, + shardActor, shardStats); + default -> throw new IllegalArgumentException("Unhandled transaction type " + type); + }; tx.getContext().setReceiveTimeout(datastoreContext.getShardTransactionIdleTimeout()); return tx; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java index 881f3c39d0..122c43592a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionActorFactory.java @@ -22,7 +22,8 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * * @author Thomas Pantelis */ -class ShardTransactionActorFactory { +@Deprecated(since = "9.0.0", forRemoval = true) +final class ShardTransactionActorFactory { private static final AtomicLong ACTOR_NAME_COUNTER = new AtomicLong(); private final ShardDataTree dataTree; @@ -33,9 +34,9 @@ class ShardTransactionActorFactory { private final ActorRef shardActor; private final String shardName; - ShardTransactionActorFactory(ShardDataTree dataTree, DatastoreContext datastoreContext, - String txnDispatcherPath, ActorRef shardActor, ActorContext actorContext, ShardStats shardMBean, - String shardName) { + ShardTransactionActorFactory(final ShardDataTree dataTree, final DatastoreContext datastoreContext, + final String txnDispatcherPath, final ActorRef shardActor, final ActorContext actorContext, + final ShardStats shardMBean, final String shardName) { this.dataTree = requireNonNull(dataTree); this.datastoreContext = requireNonNull(datastoreContext); this.txnDispatcherPath = requireNonNull(txnDispatcherPath); @@ -62,20 +63,12 @@ class ShardTransactionActorFactory { return sb.append(txId.getTransactionId()).append('_').append(ACTOR_NAME_COUNTER.incrementAndGet()).toString(); } - ActorRef newShardTransaction(TransactionType type, TransactionIdentifier transactionID) { - final AbstractShardDataTreeTransaction transaction; - switch (type) { - case READ_ONLY: - transaction = dataTree.newReadOnlyTransaction(transactionID); - break; - case READ_WRITE: - case WRITE_ONLY: - transaction = dataTree.newReadWriteTransaction(transactionID); - break; - default: - throw new IllegalArgumentException("Unsupported transaction type " + type); - } - + ActorRef newShardTransaction(final TransactionType type, final TransactionIdentifier transactionID) { + final AbstractShardDataTreeTransaction transaction = switch (type) { + case READ_ONLY -> dataTree.newReadOnlyTransaction(transactionID); + case READ_WRITE, WRITE_ONLY -> dataTree.newReadWriteTransaction(transactionID); + default -> throw new IllegalArgumentException("Unsupported transaction type " + type); + }; return actorContext.actorOf(ShardTransaction.props(type, transaction, shardActor, datastoreContext, shardMBean) .withDispatcher(txnDispatcherPath), actorNameFor(transactionID)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionMessageRetrySupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionMessageRetrySupport.java index 9a439bd35b..bfd7802213 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionMessageRetrySupport.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionMessageRetrySupport.java @@ -25,6 +25,7 @@ import scala.concurrent.duration.FiniteDuration; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) class ShardTransactionMessageRetrySupport implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(ShardTransactionMessageRetrySupport.class); @@ -81,7 +82,7 @@ class ShardTransactionMessageRetrySupport implements Closeable { messagesToRetry.clear(); } - private static class MessageInfo { + private static final class MessageInfo { final Object message; final ActorRef replyTo; final String failureMessage; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java index 67f2c684a1..764361a016 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java @@ -6,7 +6,6 @@ * 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.datastore; import akka.actor.ActorRef; @@ -24,8 +23,8 @@ import org.opendaylight.controller.cluster.datastore.modification.Modification; * * @author syedbahm */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ShardWriteTransaction extends ShardTransaction { - private int totalBatchedModificationsReceived; private Exception lastBatchedModificationsException; private final ReadWriteShardDataTreeTransaction transaction; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionType.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionType.java index 649dae5289..19ca628d26 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionType.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionType.java @@ -12,14 +12,12 @@ public enum TransactionType { WRITE_ONLY, READ_WRITE; - // Cache all values - private static final TransactionType[] VALUES = values(); - public static TransactionType fromInt(final int type) { - try { - return VALUES[type]; - } catch (IndexOutOfBoundsException e) { - throw new IllegalArgumentException("In TransactionType enum value " + type, e); - } + return switch (type) { + case 0 -> READ_ONLY; + case 1 -> WRITE_ONLY; + case 2 -> READ_WRITE; + default -> throw new IllegalArgumentException("In TransactionType enum value " + type); + }; } } \ No newline at end of file diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java index 25c13989d5..d0f1d3e7e1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransaction.java @@ -5,28 +5,29 @@ * 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.datastore.messages; import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public class AbortTransaction extends AbstractThreePhaseCommitMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class AbortTransaction extends AbstractThreePhaseCommitMessage { + @java.io.Serial private static final long serialVersionUID = 1L; public AbortTransaction() { } - public AbortTransaction(TransactionIdentifier transactionID, final short version) { + public AbortTransaction(final TransactionIdentifier transactionID, final short version) { super(transactionID, version); } - public static AbortTransaction fromSerializable(Object serializable) { + public static AbortTransaction fromSerializable(final Object serializable) { Preconditions.checkArgument(serializable instanceof AbortTransaction); return (AbortTransaction)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof AbortTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java index 8d3fb17c20..911d8cf058 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java @@ -9,7 +9,8 @@ package org.opendaylight.controller.cluster.datastore.messages; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; -public class AbortTransactionReply extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class AbortTransactionReply extends VersionedExternalizableMessage { @java.io.Serial private static final long serialVersionUID = 7251132353204199793L; private static final AbortTransactionReply INSTANCE = new AbortTransactionReply(); @@ -17,15 +18,15 @@ public class AbortTransactionReply extends VersionedExternalizableMessage { public AbortTransactionReply() { } - private AbortTransactionReply(short version) { + private AbortTransactionReply(final short version) { super(version); } - public static AbortTransactionReply instance(short version) { + public static AbortTransactionReply instance(final short version) { return version == DataStoreVersions.CURRENT_VERSION ? INSTANCE : new AbortTransactionReply(version); } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof AbortTransactionReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java index dd4c9b8b01..00aa7fa64b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractRead.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; * @author gwu * */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class AbstractRead extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java index 3b45e642ca..6296c280a2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class AbstractThreePhaseCommitMessage extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModifications.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModifications.java index 77d2687ccb..4e7b40ab1f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModifications.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModifications.java @@ -26,7 +26,9 @@ import org.opendaylight.controller.cluster.datastore.modification.MutableComposi * * @author Thomas Pantelis */ -public class BatchedModifications extends MutableCompositeModification { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class BatchedModifications extends MutableCompositeModification { + @java.io.Serial private static final long serialVersionUID = 1L; private boolean ready; @@ -39,7 +41,7 @@ public class BatchedModifications extends MutableCompositeModification { public BatchedModifications() { } - public BatchedModifications(TransactionIdentifier transactionId, short version) { + public BatchedModifications(final TransactionIdentifier transactionId, final short version) { super(version); this.transactionId = requireNonNull(transactionId, "transactionID can't be null"); } @@ -48,10 +50,10 @@ public class BatchedModifications extends MutableCompositeModification { return ready; } - public void setReady(Optional> possibleParticipatingShardNames) { - this.ready = true; - this.participatingShardNames = requireNonNull(possibleParticipatingShardNames).orElse(null); - Preconditions.checkArgument(this.participatingShardNames == null || this.participatingShardNames.size() > 1); + public void setReady(final Optional> possibleParticipatingShardNames) { + ready = true; + participatingShardNames = requireNonNull(possibleParticipatingShardNames).orElse(null); + Preconditions.checkArgument(participatingShardNames == null || participatingShardNames.size() > 1); } public void setReady() { @@ -66,7 +68,7 @@ public class BatchedModifications extends MutableCompositeModification { return doCommitOnReady; } - public void setDoCommitOnReady(boolean doCommitOnReady) { + public void setDoCommitOnReady(final boolean doCommitOnReady) { this.doCommitOnReady = doCommitOnReady; } @@ -74,7 +76,7 @@ public class BatchedModifications extends MutableCompositeModification { return totalMessagesSent; } - public void setTotalMessagesSent(int totalMessagesSent) { + public void setTotalMessagesSent(final int totalMessagesSent) { this.totalMessagesSent = totalMessagesSent; } @@ -83,7 +85,7 @@ public class BatchedModifications extends MutableCompositeModification { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); transactionId = TransactionIdentifier.readFrom(in); ready = in.readBoolean(); @@ -104,7 +106,7 @@ public class BatchedModifications extends MutableCompositeModification { } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); transactionId.writeTo(out); out.writeBoolean(ready); @@ -114,7 +116,7 @@ public class BatchedModifications extends MutableCompositeModification { if (getVersion() >= DataStoreVersions.FLUORINE_VERSION) { if (participatingShardNames != null) { out.writeInt(participatingShardNames.size()); - for (String shardName: participatingShardNames) { + for (String shardName : participatingShardNames) { out.writeObject(shardName); } } else { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsReply.java index 29bb3e9ea6..0cca8d03ff 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsReply.java @@ -16,7 +16,9 @@ import java.io.ObjectOutput; * * @author Thomas Pantelis */ -public class BatchedModificationsReply extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class BatchedModificationsReply extends VersionedExternalizableMessage { + @java.io.Serial private static final long serialVersionUID = 1L; private int numBatched; @@ -24,7 +26,7 @@ public class BatchedModificationsReply extends VersionedExternalizableMessage { public BatchedModificationsReply() { } - public BatchedModificationsReply(int numBatched) { + public BatchedModificationsReply(final int numBatched) { this.numBatched = numBatched; } @@ -33,13 +35,13 @@ public class BatchedModificationsReply extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); numBatched = in.readInt(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); out.writeInt(numBatched); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java index 087c7b6376..f50412fc0e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java @@ -5,28 +5,29 @@ * 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.datastore.messages; import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public class CanCommitTransaction extends AbstractThreePhaseCommitMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CanCommitTransaction extends AbstractThreePhaseCommitMessage { + @java.io.Serial private static final long serialVersionUID = 1L; public CanCommitTransaction() { } - public CanCommitTransaction(TransactionIdentifier transactionID, final short version) { + public CanCommitTransaction(final TransactionIdentifier transactionID, final short version) { super(transactionID, version); } - public static CanCommitTransaction fromSerializable(Object serializable) { + public static CanCommitTransaction fromSerializable(final Object serializable) { Preconditions.checkArgument(serializable instanceof CanCommitTransaction); return (CanCommitTransaction)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CanCommitTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java index 51fa29f113..5c8fae94b8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java @@ -14,7 +14,8 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; -public class CanCommitTransactionReply extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CanCommitTransactionReply extends VersionedExternalizableMessage { @java.io.Serial private static final long serialVersionUID = 4355566635423934872L; @@ -38,13 +39,13 @@ public class CanCommitTransactionReply extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); canCommit = in.readBoolean(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); out.writeBoolean(canCommit); } @@ -54,11 +55,11 @@ public class CanCommitTransactionReply extends VersionedExternalizableMessage { return "CanCommitTransactionReply [canCommit=" + canCommit + ", version=" + getVersion() + "]"; } - public static CanCommitTransactionReply yes(short version) { + public static CanCommitTransactionReply yes(final short version) { return version == DataStoreVersions.CURRENT_VERSION ? YES : new CanCommitTransactionReply(true, version); } - public static CanCommitTransactionReply no(short version) { + public static CanCommitTransactionReply no(final short version) { return version == DataStoreVersions.CURRENT_VERSION ? NO : new CanCommitTransactionReply(false, version); } @@ -67,7 +68,7 @@ public class CanCommitTransactionReply extends VersionedExternalizableMessage { return (CanCommitTransactionReply)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CanCommitTransactionReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java index 1a3567cafa..5b3c050e4b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java @@ -5,20 +5,21 @@ * 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.datastore.messages; -public class CloseTransaction extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CloseTransaction extends VersionedExternalizableMessage { + @java.io.Serial private static final long serialVersionUID = 1L; public CloseTransaction() { } - public CloseTransaction(short version) { + public CloseTransaction(final short version) { super(version); } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CloseTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java index 1e96286eb9..d06b7319b4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java @@ -16,8 +16,10 @@ import java.io.ObjectOutput; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.yangtools.concepts.Identifiable; -public class CloseTransactionChain extends VersionedExternalizableMessage +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CloseTransactionChain extends VersionedExternalizableMessage implements Identifiable { + @java.io.Serial private static final long serialVersionUID = 1L; private LocalHistoryIdentifier transactionChainId; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java index 0e21b578ca..a746580516 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java @@ -5,9 +5,9 @@ * 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.datastore.messages; +@Deprecated(since = "9.0.0", forRemoval = true) public class CloseTransactionReply extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java index fe13e5d8b1..bd80287ae9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java @@ -5,28 +5,29 @@ * 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.datastore.messages; import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public class CommitTransaction extends AbstractThreePhaseCommitMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CommitTransaction extends AbstractThreePhaseCommitMessage { + @java.io.Serial private static final long serialVersionUID = 1L; public CommitTransaction() { } - public CommitTransaction(TransactionIdentifier transactionID, final short version) { + public CommitTransaction(final TransactionIdentifier transactionID, final short version) { super(transactionID, version); } - public static CommitTransaction fromSerializable(Object serializable) { + public static CommitTransaction fromSerializable(final Object serializable) { Preconditions.checkArgument(serializable instanceof CommitTransaction); return (CommitTransaction)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CommitTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java index 1dd8e8ec8f..167124c6fe 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java @@ -9,7 +9,8 @@ package org.opendaylight.controller.cluster.datastore.messages; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; -public class CommitTransactionReply extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CommitTransactionReply extends VersionedExternalizableMessage { @java.io.Serial private static final long serialVersionUID = -8342450250867395000L; @@ -18,15 +19,15 @@ public class CommitTransactionReply extends VersionedExternalizableMessage { public CommitTransactionReply() { } - private CommitTransactionReply(short version) { + private CommitTransactionReply(final short version) { super(version); } - public static CommitTransactionReply instance(short version) { + public static CommitTransactionReply instance(final short version) { return version == DataStoreVersions.CURRENT_VERSION ? INSTANCE : new CommitTransactionReply(version); } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CommitTransactionReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java index 3283a55f43..5ef056e8a0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java @@ -15,7 +15,9 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public class CreateTransaction extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CreateTransaction extends VersionedExternalizableMessage { + @java.io.Serial private static final long serialVersionUID = 1L; private TransactionIdentifier transactionId; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java index 87dd7c57fb..644daf21fb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java @@ -15,7 +15,9 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; -public class CreateTransactionReply extends VersionedExternalizableMessage { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class CreateTransactionReply extends VersionedExternalizableMessage { + @java.io.Serial private static final long serialVersionUID = 1L; private String transactionPath; @@ -40,14 +42,14 @@ public class CreateTransactionReply extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); transactionId = TransactionIdentifier.readFrom(in); transactionPath = in.readUTF(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); transactionId.writeTo(out); out.writeUTF(transactionPath); @@ -60,12 +62,12 @@ public class CreateTransactionReply extends VersionedExternalizableMessage { + ", version=" + getVersion() + "]"; } - public static CreateTransactionReply fromSerializable(Object serializable) { + public static CreateTransactionReply fromSerializable(final Object serializable) { checkArgument(serializable instanceof CreateTransactionReply); return (CreateTransactionReply)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CreateTransactionReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java index b7e38d5082..6c646f7cc3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExists.java @@ -5,7 +5,6 @@ * 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.datastore.messages; import com.google.common.base.Preconditions; @@ -15,6 +14,7 @@ import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +@Deprecated(since = "9.0.0", forRemoval = true) public class DataExists extends AbstractRead { private static final long serialVersionUID = 1L; @@ -26,12 +26,12 @@ public class DataExists extends AbstractRead { } @Override - public FluentFuture apply(DOMStoreReadTransaction readDelegate) { + public FluentFuture apply(final DOMStoreReadTransaction readDelegate) { return readDelegate.exists(getPath()); } @Override - public void processResponse(Object response, SettableFuture returnFuture) { + public void processResponse(final Object response, final SettableFuture returnFuture) { if (DataExistsReply.isSerializedType(response)) { returnFuture.set(Boolean.valueOf(DataExistsReply.fromSerializable(response).exists())); } else { @@ -41,7 +41,7 @@ public class DataExists extends AbstractRead { } @Override - protected AbstractRead newInstance(short withVersion) { + protected AbstractRead newInstance(final short withVersion) { return new DataExists(getPath(), withVersion); } @@ -50,7 +50,7 @@ public class DataExists extends AbstractRead { return (DataExists)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof DataExists; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReply.java index a57df0ecda..799cd8b86e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReply.java @@ -5,7 +5,6 @@ * 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.datastore.messages; import com.google.common.base.Preconditions; @@ -13,6 +12,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +@Deprecated(since = "9.0.0", forRemoval = true) public class DataExistsReply extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; @@ -31,13 +31,13 @@ public class DataExistsReply extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); exists = in.readBoolean(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); out.writeBoolean(exists); } @@ -47,7 +47,7 @@ public class DataExistsReply extends VersionedExternalizableMessage { return (DataExistsReply)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof DataExistsReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java index eeca6682bd..fbc66a4d05 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java @@ -20,7 +20,8 @@ import org.opendaylight.controller.cluster.datastore.ReadWriteShardDataTreeTrans * * @author Thomas Pantelis */ -public class ForwardedReadyTransaction { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class ForwardedReadyTransaction { private final TransactionIdentifier transactionId; private final ReadWriteShardDataTreeTransaction transaction; private final boolean doImmediateCommit; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java index 1113a854bf..8172d64d52 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadData.java @@ -16,6 +16,7 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadData extends AbstractRead> { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java index 099ca228cd..2ed53ad050 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReply.java @@ -13,6 +13,7 @@ import java.io.ObjectOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadDataReply extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransaction.java index 7cff030eb9..55ab132db6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransaction.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; * to be sent out to a remote system, it needs to be intercepted by {@link ReadyLocalTransactionSerializer} * and turned into {@link BatchedModifications}. */ +@Deprecated(since = "9.0.0", forRemoval = true) public final class ReadyLocalTransaction { private final DataTreeModification modification; private final TransactionIdentifier transactionId; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java index c44f9105c0..7346a8c07e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java @@ -24,8 +24,8 @@ import org.opendaylight.controller.cluster.datastore.utils.AbstractBatchedModifi * into akka serialization to allow forwarding of ReadyLocalTransaction to remote * shards. */ +@Deprecated(since = "9.0.0", forRemoval = true) public final class ReadyLocalTransactionSerializer extends JSerializer { - private final ExtendedActorSystem system; public ReadyLocalTransactionSerializer(final ExtendedActorSystem system) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReply.java index 5ddc77f8f6..a341c72333 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReply.java @@ -13,6 +13,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadyTransactionReply extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; @@ -21,11 +22,11 @@ public class ReadyTransactionReply extends VersionedExternalizableMessage { public ReadyTransactionReply() { } - public ReadyTransactionReply(String cohortPath) { + public ReadyTransactionReply(final String cohortPath) { this(cohortPath, DataStoreVersions.CURRENT_VERSION); } - public ReadyTransactionReply(String cohortPath, short version) { + public ReadyTransactionReply(final String cohortPath, final short version) { super(version); this.cohortPath = cohortPath; } @@ -35,22 +36,22 @@ public class ReadyTransactionReply extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); cohortPath = in.readUTF(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); out.writeUTF(cohortPath); } - public static ReadyTransactionReply fromSerializable(Object serializable) { + public static ReadyTransactionReply fromSerializable(final Object serializable) { return (ReadyTransactionReply)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof ReadyTransactionReply; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java index 42e7399bea..5f410a42b9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/VersionedExternalizableMessage.java @@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVer * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class VersionedExternalizableMessage implements Externalizable, SerializableMessage { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java index 2645a03538..3eec9a4a46 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java @@ -5,7 +5,6 @@ * 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.datastore.modification; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -13,6 +12,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; /** * Base class to be used for all simple modifications that can be applied to a DOMStoreTransaction. */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class AbstractModification implements Modification { @java.io.Serial private static final long serialVersionUID = 2647778426312509718L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/CompositeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/CompositeModification.java index b59132fe87..3705707de2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/CompositeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/CompositeModification.java @@ -16,6 +16,7 @@ import java.util.List; * A CompositeModification gets stored in the transaction log for a Shard. During recovery when the transaction log * is being replayed a DOMStoreWriteTransaction could be created and a CompositeModification could be applied to it. */ +@Deprecated(since = "9.0.0", forRemoval = true) public interface CompositeModification extends Modification { /** * Get a list of modifications contained by this composite. diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java index 55ed0a30bc..267dfa8368 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModification.java @@ -21,7 +21,9 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; /** * DeleteModification store all the parameters required to delete a path from the data tree. */ -public class DeleteModification extends AbstractModification { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class DeleteModification extends AbstractModification { + @java.io.Serial private static final long serialVersionUID = 1L; public DeleteModification() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java index 90bdba196a..9244a38c80 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java @@ -19,7 +19,8 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; /** * MergeModification stores all the parameters required to merge data into the specified path. */ -public class MergeModification extends WriteModification { +@Deprecated(since = "9.0.0", forRemoval = true) +public final class MergeModification extends WriteModification { private static final long serialVersionUID = 1L; public MergeModification() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java index 33a5b7b485..26e049089e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java @@ -28,6 +28,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; /** * MutableCompositeModification is just a mutable version of a CompositeModification. */ +@Deprecated(since = "9.0.0", forRemoval = true) public class MutableCompositeModification extends VersionedExternalizableMessage implements CompositeModification { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java index a728313eb2..dc2d3fff43 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; /** * WriteModification stores all the parameters required to write data to the specified path. */ +@Deprecated(since = "9.0.0", forRemoval = true) public class WriteModification extends AbstractModification { private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java index ae0938e600..d740461fdf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/AbstractBatchedModificationsCursor.java @@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class AbstractBatchedModificationsCursor extends AbstractDataTreeModificationCursor { protected abstract BatchedModifications getModifications(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java index 8ef0f36c3a..0b5295584e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinationTest.java @@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ShardCommitCoordinationTest extends AbstractShardTest { private static final Logger LOG = LoggerFactory.getLogger(ShardCommitCoordinationTest.class); @@ -553,7 +554,7 @@ public class ShardCommitCoordinationTest extends AbstractShardTest { LOG.info("{} ending", testName); } - static void verifyInnerListEntry(TestActorRef shard, int outerID, String innerID) { + static void verifyInnerListEntry(final TestActorRef shard, final int outerID, final String innerID) { final YangInstanceIdentifier path = innerEntryPath(outerID, innerID); final NormalizedNode innerListEntry = readStore(shard, path); assertNotNull(path + " not found", innerListEntry); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java index 888fe9e8a1..e0db8543f6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java @@ -647,6 +647,7 @@ public class ShardTest extends AbstractShardTest { verifyOuterListEntry(shard, 1); } + @Deprecated(since = "9.0.0", forRemoval = true) @Test(expected = IllegalStateException.class) public void testBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Exception { final ShardTestKit testKit = new ShardTestKit(getSystem()); @@ -673,6 +674,7 @@ public class ShardTest extends AbstractShardTest { } @Test + @Deprecated(since = "9.0.0", forRemoval = true) public void testBatchedModificationsWithOperationFailure() { final ShardTestKit testKit = new ShardTestKit(getSystem()); final TestActorRef shard = actorFactory.createTestActor( @@ -762,6 +764,7 @@ public class ShardTest extends AbstractShardTest { } @Test + @Deprecated(since = "9.0.0", forRemoval = true) public void testOnBatchedModificationsWhenNotLeader() { final AtomicBoolean overrideLeaderCalls = new AtomicBoolean(); final ShardTestKit testKit = new ShardTestKit(getSystem()); @@ -802,6 +805,7 @@ public class ShardTest extends AbstractShardTest { } @Test + @Deprecated(since = "9.0.0", forRemoval = true) public void testTransactionMessagesWithNoLeader() { final ShardTestKit testKit = new ShardTestKit(getSystem()); dataStoreContextBuilder.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java index 0c77fccdf0..7a96f263c6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java @@ -34,6 +34,7 @@ import scala.concurrent.duration.FiniteDuration; * * @author Basheeruddin Ahmed */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ShardTransactionFailureTest extends AbstractActorTest { private static final EffectiveModelContext TEST_SCHEMA_CONTEXT = TestModel.createTestContext(); private static final TransactionType RO = TransactionType.READ_ONLY; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index 06789dedb9..d80a5d1fc0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -55,6 +55,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +@Deprecated(since = "9.0.0", forRemoval = true) public class ShardTransactionTest extends AbstractActorTest { private static final TransactionType RO = TransactionType.READ_ONLY; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReplyTest.java index a869ab6ff8..1b03354621 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReplyTest.java @@ -21,8 +21,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class AbortTransactionReplyTest { - @Test public void testSerialization() { AbortTransactionReply expected = AbortTransactionReply.instance(DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java index d4fb0e10e4..c0300e667b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.cluster.datastore.MockIdentifiers; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class AbortTransactionTest { - @Test public void testSerialization() { AbortTransaction expected = new AbortTransaction( diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java index 6452072242..69450b7efb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java @@ -35,6 +35,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class BatchedModificationsTest extends AbstractTest { @Test public void testSerialization() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReplyTest.java index 0a91ebb870..5ebc282ceb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReplyTest.java @@ -21,8 +21,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CanCommitTransactionReplyTest { - @Test public void testSerialization() { testSerialization(CanCommitTransactionReply.yes(DataStoreVersions.CURRENT_VERSION), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionTest.java index f28385c622..806c504c52 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CanCommitTransactionTest extends AbstractTest { - @Test public void testSerialization() { CanCommitTransaction expected = new CanCommitTransaction(nextTransactionId(), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java index 1ac6c82ad0..e18acec0d2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChainTest.java @@ -22,6 +22,7 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CloseTransactionChainTest extends AbstractTest { @Test public void testSerialization() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java index 4b9af413d2..db53db4b89 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CloseTransactionTest { @Test public void testCloseTransactionSerialization() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReplyTest.java index a726e4b909..1017772bd0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReplyTest.java @@ -21,8 +21,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CommitTransactionReplyTest { - @Test public void testSerialization() { CommitTransactionReply expected = CommitTransactionReply.instance(DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionTest.java index db16412f01..2ab6ca7b3a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionTest.java @@ -22,6 +22,7 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CommitTransactionTest extends AbstractTest { @Test diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReplyTest.java index 541126a91f..5acacfe8b1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReplyTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CreateTransactionReplyTest extends AbstractTest { - @Test public void testSerialization() { CreateTransactionReply expected = new CreateTransactionReply("txPath", nextTransactionId(), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java index b25644b76d..9d573e9488 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class CreateTransactionTest extends AbstractTest { - @Test public void testSerialization() { CreateTransaction expected = new CreateTransaction(nextTransactionId(), 2, DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReplyTest.java index ad58fc0fa6..61eb8b16a1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsReplyTest.java @@ -21,8 +21,8 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class DataExistsReplyTest { - @Test public void testSerialization() { DataExistsReply expected = new DataExistsReply(true, DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsTest.java index 8e9af95f44..bcd7322150 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DataExistsTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.md.cluster.datastore.model.TestModel; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class DataExistsTest { - @Test public void testSerialization() { DataExists expected = new DataExists(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java index 8af294e1ca..9c31e1909a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataReplyTest.java @@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadDataReplyTest { @Test diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataTest.java index 6ef4bef031..df692b59d5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadDataTest.java @@ -22,8 +22,8 @@ import org.opendaylight.controller.md.cluster.datastore.model.TestModel; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadDataTest { - @Test public void testSerialization() { ReadData expected = new ReadData(TestModel.TEST_PATH, DataStoreVersions.CURRENT_VERSION); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializerTest.java index 2aaf41bf57..2abb05d360 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializerTest.java @@ -39,8 +39,8 @@ import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadyLocalTransactionSerializerTest extends AbstractTest { - @Test public void testToAndFromBinary() throws NotSerializableException { DataTree dataTree = new InMemoryDataTreeFactory().create( diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReplyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReplyTest.java index bb5f04b787..38eea9af54 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReplyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ReadyTransactionReplyTest.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.cluster.datastore.DataStoreVersions; * * @author Thomas Pantelis */ +@Deprecated(since = "9.0.0", forRemoval = true) public class ReadyTransactionReplyTest { @Test diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java index f2527b13ab..9d11ea986a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModificationTest.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +@Deprecated(since = "9.0.0", forRemoval = true) public abstract class AbstractModificationTest { private static EffectiveModelContext TEST_SCHEMA_CONTEXT; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java index 546d900c8c..f1cb4870a3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/DeleteModificationTest.java @@ -17,6 +17,7 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +@Deprecated(since = "9.0.0", forRemoval = true) public class DeleteModificationTest extends AbstractModificationTest { @Test public void testApply() throws Exception { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java index 20fc946890..ff22645f92 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MergeModificationTest.java @@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +@Deprecated(since = "9.0.0", forRemoval = true) public class MergeModificationTest extends AbstractModificationTest { @Test public void testApply() throws Exception { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java index 7cf6b98157..3d58db873d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModificationTest.java @@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +@Deprecated(since = "9.0.0", forRemoval = true) public class MutableCompositeModificationTest extends AbstractModificationTest { @Test public void testApply() throws Exception { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java index e8d37f866e..82c8f757e8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/modification/WriteModificationTest.java @@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +@Deprecated(since = "9.0.0", forRemoval = true) public class WriteModificationTest extends AbstractModificationTest { @Test public void testApply() throws Exception { -- 2.36.6