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%2FAbstractTransactionContext.java;h=bc8efa6c5ae2b9d87dd94cac8e7386a4a6a1d06b;hb=d19cf96d390ffcdba8b1f64a6dd3f3749ecc5872;hp=6c4fc6097d5adf2d3d3bb771f5b67647f64b74f8;hpb=925cb4a228d0fda99c7bfeb432eb25285a223887;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java index 6c4fc6097d..bc8efa6c5a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionContext.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +24,7 @@ abstract class AbstractTransactionContext implements TransactionContext { } protected AbstractTransactionContext(TransactionIdentifier transactionIdentifier, short transactionVersion) { + // FIXME: requireNonNull()? this.transactionIdentifier = transactionIdentifier; this.transactionVersion = transactionVersion; } @@ -33,7 +34,8 @@ abstract class AbstractTransactionContext implements TransactionContext { * * @return Transaction identifier. */ - @Nonnull protected final TransactionIdentifier getIdentifier() { + // FIXME: does this imply Identifiable? + protected final @NonNull TransactionIdentifier getIdentifier() { return transactionIdentifier; }