Rename DOMDataTreeCommitCohortRegistry to CommitCohortExtension

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / store / AbstractDOMStoreTransaction.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTransaction.java
index cc6111ff6b2cab3780fae10945c8ef8ff2a5c1c0..018fb7f8abb6b3f73248d05bceb5516f351390c7 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTransaction.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTransaction.java
@@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
@@ -24,18 +24,17 @@ import org.eclipse.jdt.annotation.Nullable;
  * @param <T> identifier type
  */
 @Beta
-@NonNullByDefault
 public abstract class AbstractDOMStoreTransaction<T> implements DOMStoreTransaction {
     private final @Nullable Throwable debugContext;
-    private final T identifier;
+    private final @NonNull T identifier;
 
-    protected AbstractDOMStoreTransaction(final T identifier) {
+    protected AbstractDOMStoreTransaction(final @NonNull T identifier) {
         this(identifier, false);
     }
 
-    protected AbstractDOMStoreTransaction(final T identifier, final boolean debug) {
+    protected AbstractDOMStoreTransaction(final @NonNull T identifier, final boolean debug) {
         this.identifier = requireNonNull(identifier, "Identifier must not be null.");
-        this.debugContext = debug ? new Throwable().fillInStackTrace() : null;
+        debugContext = debug ? new Throwable().fillInStackTrace() : null;
     }
 
     @Override
@@ -65,7 +64,7 @@ public abstract class AbstractDOMStoreTransaction<T> implements DOMStoreTransact
      *            ToStringHelper instance
      * @return ToStringHelper instance which was passed in
      */
-    protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
+    protected @NonNull ToStringHelper addToStringAttributes(final @NonNull ToStringHelper toStringHelper) {
         return toStringHelper.add("id", identifier);
     }
 }