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%2FDataTreeCohortActor.java;h=c8372e409e1ab6e3de0254d73fcbc0e343e2c771;hb=906ac818a31d76ca4aa1b014649272a6aad2de6c;hp=26c5f45568e2ca00ea1205a27175504dbe90cfc7;hpb=5fa5244653ee7ad3042324fb1f21fad69581b3d2;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java index 26c5f45568..c8372e409e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.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; @@ -20,8 +19,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.mdsal.common.api.PostCanCommitStep; @@ -235,11 +234,9 @@ final class DataTreeCohortActor extends AbstractUntypedActor { }, MoreExecutors.directExecutor()); } - @Nullable - abstract CohortBehaviour nextBehaviour(TransactionIdentifier txId, S nextStep); + abstract @Nullable CohortBehaviour nextBehaviour(TransactionIdentifier txId, S nextStep); - @Nonnull - abstract ListenableFuture process(M command); + abstract @NonNull ListenableFuture process(M command); abstract ListenableFuture abort();