X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FCohortEntry.java;h=120b004a6e9bf44513acc784df5efe619232abe0;hb=HEAD;hp=80ba952abb926fff45d9864bf521d59925aea911;hpb=c7fb53c205eddf3324a686b024e600480410fdb1;p=controller.git 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 80ba952abb..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 @@ -7,19 +7,24 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.List; import java.util.Optional; import java.util.SortedSet; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.CohortDecorator; import org.opendaylight.controller.cluster.datastore.modification.Modification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; +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; @@ -34,16 +39,16 @@ final class CohortEntry { private Shard shard; private CohortEntry(final ReadWriteShardDataTreeTransaction transaction, final short clientVersion) { - this.cohort = null; - this.transaction = Preconditions.checkNotNull(transaction); - this.transactionId = transaction.getIdentifier(); + cohort = null; + this.transaction = requireNonNull(transaction); + transactionId = transaction.getIdentifier(); this.clientVersion = clientVersion; } private CohortEntry(final ShardDataTreeCohort cohort, final short clientVersion) { - this.cohort = Preconditions.checkNotNull(cohort); - this.transactionId = cohort.getIdentifier(); - this.transaction = null; + this.cohort = requireNonNull(cohort); + transactionId = cohort.transactionId(); + transaction = null; this.clientVersion = clientVersion; } @@ -88,6 +93,7 @@ final class CohortEntry { } @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "THROWS_METHOD_THROWS_RUNTIMEEXCEPTION", justification = "Re-thrown") void applyModifications(final List modifications) { totalBatchedModificationsReceived++; if (lastBatchedModificationsException == null) { @@ -103,7 +109,7 @@ final class CohortEntry { } } - void canCommit(final FutureCallback callback) { + void canCommit(final FutureCallback callback) { cohort.canCommit(callback); } @@ -115,12 +121,12 @@ final class CohortEntry { cohort.commit(callback); } - void abort(final FutureCallback callback) { + void abort(final FutureCallback callback) { cohort.abort(callback); } void ready(final Optional> participatingShardNames, final CohortDecorator cohortDecorator) { - Preconditions.checkState(cohort == null, "cohort was already set"); + checkState(cohort == null, "cohort was already set"); cohort = transaction.ready(participatingShardNames);