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%2FAbstractShardDataTreeTransaction.java;h=bec1a38f2453790d6a80e786e1be7d3dfa6c560b;hb=refs%2Fchanges%2F77%2F84577%2F1;hp=9412d47b510bfe82063c295a90f1c2e5f1d52f2d;hpb=a28080b967656fe74811b56d9ff8070eab794ad1;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java index 9412d47b51..bec1a38f24 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.persisted.AbortTransactionPayload; import org.opendaylight.yangtools.concepts.Identifiable; @@ -29,9 +31,9 @@ abstract class AbstractShardDataTreeTransaction AbstractShardDataTreeTransaction(final ShardDataTreeTransactionParent parent, final TransactionIdentifier id, final T snapshot) { - this.parent = Preconditions.checkNotNull(parent); - this.snapshot = Preconditions.checkNotNull(snapshot); - this.id = Preconditions.checkNotNull(id); + this.parent = requireNonNull(parent); + this.snapshot = requireNonNull(snapshot); + this.id = requireNonNull(id); } @Override @@ -66,7 +68,7 @@ abstract class AbstractShardDataTreeTransaction } final void abort(final Runnable callback) { - Preconditions.checkState(close(), "Transaction is already closed"); + checkState(close(), "Transaction is already closed"); parent.abortTransaction(this, callback); }