From 1896e955bb406e2734811a992856206b753f2d0c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 8 Oct 2018 14:32:48 +0200 Subject: [PATCH] Migrate mdsal-dom-spi to JDT annotations This removes the use of javax.annotation nullable annotations to remove import-package. Change-Id: Ic7751f6fbffeb063ddda0bf4dc8b7dc7b66f7c80 JIRA: MDSAL-373 Signed-off-by: Robert Varga --- .../dom/spi/AbstractRegistrationTree.java | 12 ++++++------ .../mdsal/dom/spi/DOMDataTreePrefixTable.java | 18 ++++++------------ .../mdsal/dom/spi/DefaultDOMRpcResult.java | 3 +-- .../dom/spi/ForwardingDOMDataBroker.java | 5 ++--- .../ForwardingDOMDataReadOnlyTransaction.java | 5 ++--- ...ForwardingDOMDataReadWriteTransaction.java | 5 ++--- .../ForwardingDOMDataWriteTransaction.java | 5 ++--- .../spi/ForwardingDOMRpcImplementation.java | 5 ++--- .../spi/ForwardingDOMRpcProviderService.java | 5 ++--- .../dom/spi/ForwardingDOMRpcService.java | 5 ++--- .../spi/ForwardingDOMTransactionChain.java | 5 ++--- .../shard/DOMDataTreeListenerRegistry.java | 7 +++---- .../spi/shard/DOMDataTreeShardProducer.java | 6 +++--- .../DOMDataTreeShardWriteTransaction.java | 6 +++--- .../spi/shard/WriteableModificationNode.java | 7 +++---- .../AbstractDOMStoreTreeChangePublisher.java | 10 +++++----- .../store/DOMStoreTreeChangePublisher.java | 19 +++++++------------ .../store/SnapshotBackedWriteTransaction.java | 2 +- .../AbstractDOMRpcProviderServiceTest.java | 8 ++++---- .../dom/spi/ForwardingDOMDataBrokerTest.java | 2 -- ...wardingDOMDataReadOnlyTransactionTest.java | 2 -- ...ForwardingDOMDataWriteTransactionTest.java | 2 -- .../ForwardingDOMRpcImplementationTest.java | 2 -- .../ForwardingDOMRpcProviderServiceTest.java | 2 -- .../dom/spi/ForwardingDOMRpcResultTest.java | 2 -- .../dom/spi/ForwardingDOMRpcServiceTest.java | 2 -- .../ForwardingDOMTransactionChainTest.java | 2 -- ...stractDOMStoreTreeChangePublisherTest.java | 3 +-- 28 files changed, 59 insertions(+), 98 deletions(-) diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTree.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTree.java index 6e9c3e4ff7..b891767bdb 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTree.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTree.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.StampedLock; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; /** @@ -50,7 +50,7 @@ public abstract class AbstractRegistrationTree { * @param path Path to find a node for * @return A registration node for the specified path */ - @Nonnull protected final RegistrationTreeNode findNodeFor(@Nonnull final Iterable path) { + protected final @NonNull RegistrationTreeNode findNodeFor(final @NonNull Iterable path) { RegistrationTreeNode walkNode = rootNode; for (final PathArgument arg : path) { walkNode = walkNode.ensureChild(arg); @@ -66,7 +66,7 @@ public abstract class AbstractRegistrationTree { * @param node Tree node * @param registration Registration instance */ - protected final void addRegistration(@Nonnull final RegistrationTreeNode node, @Nonnull final T registration) { + protected final void addRegistration(final @NonNull RegistrationTreeNode node, final @NonNull T registration) { node.addRegistration(registration); } @@ -76,8 +76,8 @@ public abstract class AbstractRegistrationTree { * @param node Tree node * @param registration Registration instance */ - protected final void removeRegistration(@Nonnull final RegistrationTreeNode node, - @Nonnull final T registration) { + protected final void removeRegistration(final @NonNull RegistrationTreeNode node, + final @NonNull T registration) { // Take the write lock writeLock.lock(); try { @@ -95,7 +95,7 @@ public abstract class AbstractRegistrationTree { * * @return A snapshot instance. */ - @Nonnull public final RegistrationTreeSnapshot takeSnapshot() { + public final @NonNull RegistrationTreeSnapshot takeSnapshot() { readLock.lock(); return new RegistrationTreeSnapshot<>(readLock, rootNode); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTable.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTable.java index 87ddefd64a..107b8123c3 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTable.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTable.java @@ -10,9 +10,9 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.annotations.Beta; import java.util.EnumMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.slf4j.Logger; @@ -47,14 +47,9 @@ public final class DOMDataTreePrefixTable { * @param prefix Prefix for lookup * @return closest non-null entry towards root or null if no entry towards root exists. */ - @Nullable - public DOMDataTreePrefixTableEntry lookup(@Nonnull final DOMDataTreeIdentifier prefix) { + public @Nullable DOMDataTreePrefixTableEntry lookup(final @NonNull DOMDataTreeIdentifier prefix) { final DOMDataTreePrefixTableEntry t = roots.get(prefix.getDatastoreType()); - if (t == null) { - return null; - } - - return t.lookup(prefix.getRootIdentifier()); + return t == null ? null : t.lookup(prefix.getRootIdentifier()); } /** @@ -64,7 +59,7 @@ public final class DOMDataTreePrefixTable { * @param value Value to be stored * @throws IllegalStateException If value is already stored for provided prefix */ - public void store(@Nonnull final DOMDataTreeIdentifier prefix, @Nonnull final V value) { + public void store(final @NonNull DOMDataTreeIdentifier prefix, final @NonNull V value) { DOMDataTreePrefixTableEntry domDataTreePrefixTableEntry = roots.get(prefix.getDatastoreType()); if (domDataTreePrefixTableEntry == null) { domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<>(); @@ -81,7 +76,7 @@ public final class DOMDataTreePrefixTable { * * @param prefix to be removed */ - public void remove(@Nonnull final DOMDataTreeIdentifier prefix) { + public void remove(final @NonNull DOMDataTreeIdentifier prefix) { final DOMDataTreePrefixTableEntry t = roots.get(prefix.getDatastoreType()); if (t == null) { LOG.warn("Shard registration {} points to non-existent table", t); @@ -90,5 +85,4 @@ public final class DOMDataTreePrefixTable { t.remove(prefix.getRootIdentifier()); } - } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java index d7277ca140..a2c55e5d18 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Objects; -import javax.annotation.Nonnull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -52,7 +51,7 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria this.errors = requireNonNull(errors); } - public DefaultDOMRpcResult(@Nonnull final Collection errors) { + public DefaultDOMRpcResult(final Collection errors) { this(null, errors); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java index 57543ff244..de38361124 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ForwardingObject; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -25,8 +25,7 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; public abstract class ForwardingDOMDataBroker extends ForwardingObject implements DOMDataBroker { @Override - @Nonnull - protected abstract DOMDataBroker delegate(); + protected abstract @NonNull DOMDataBroker delegate(); @Override public DOMDataTreeReadTransaction newReadOnlyTransaction() { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java index 208ae22b2a..32a4a57dba 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -23,8 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public abstract class ForwardingDOMDataReadOnlyTransaction extends ForwardingObject implements DOMDataTreeReadTransaction { @Override - @Nonnull - protected abstract DOMDataTreeReadTransaction delegate(); + protected abstract @NonNull DOMDataTreeReadTransaction delegate(); @Override public FluentFuture>> read(final LogicalDatastoreType store, diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadWriteTransaction.java index 98136a266c..753313f931 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadWriteTransaction.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; @@ -24,8 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public abstract class ForwardingDOMDataReadWriteTransaction extends ForwardingObject implements DOMDataTreeReadWriteTransaction { @Override - @Nonnull - protected abstract DOMDataTreeReadWriteTransaction delegate(); + protected abstract @NonNull DOMDataTreeReadWriteTransaction delegate(); @Override public FluentFuture>> read(final LogicalDatastoreType store, diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransaction.java index 5064ec45f9..0c79a5bafc 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransaction.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FluentFuture; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; @@ -23,8 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject implements DOMDataTreeWriteTransaction { @Override - @Nonnull - protected abstract DOMDataTreeWriteTransaction delegate(); + protected abstract @NonNull DOMDataTreeWriteTransaction delegate(); @Override public Object getIdentifier() { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementation.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementation.java index ebafae0573..7eb723933b 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementation.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementation.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FluentFuture; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -21,8 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public abstract class ForwardingDOMRpcImplementation extends ForwardingObject implements DOMRpcImplementation { @Override - @Nonnull - protected abstract DOMRpcImplementation delegate(); + protected abstract @NonNull DOMRpcImplementation delegate(); @Override public FluentFuture invokeRpc(final DOMRpcIdentifier type, final NormalizedNode input) { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderService.java index 38fe9132d8..43bc368ebf 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderService.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderService.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import java.util.Set; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; @@ -21,8 +21,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; */ public abstract class ForwardingDOMRpcProviderService extends ForwardingObject implements DOMRpcProviderService { @Override - @Nonnull - protected abstract DOMRpcProviderService delegate(); + protected abstract @NonNull DOMRpcProviderService delegate(); @Override public DOMRpcImplementationRegistration registerRpcImplementation( diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcService.java index 317b3ea13c..dc9b68cca2 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcService.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcService.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; import com.google.common.util.concurrent.FluentFuture; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DOMRpcService; @@ -22,8 +22,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; */ public abstract class ForwardingDOMRpcService extends ForwardingObject implements DOMRpcService { @Override - @Nonnull - protected abstract DOMRpcService delegate(); + protected abstract @NonNull DOMRpcService delegate(); @Override public FluentFuture invokeRpc(final SchemaPath type, final NormalizedNode input) { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChain.java index 8e1d9b8e57..1f6856c2d4 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChain.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChain.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.dom.spi; import com.google.common.collect.ForwardingObject; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; @@ -20,8 +20,7 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChain; */ public abstract class ForwardingDOMTransactionChain extends ForwardingObject implements DOMTransactionChain { @Override - @Nonnull - protected abstract DOMTransactionChain delegate(); + protected abstract @NonNull DOMTransactionChain delegate(); @Override public void close() { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerRegistry.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerRegistry.java index ac11e09714..9eaa622a5d 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerRegistry.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerRegistry.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi.shard; import com.google.common.annotations.Beta; import java.util.Collection; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMDataTreeListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; */ @Beta public interface DOMDataTreeListenerRegistry { - - @Nonnull ListenerRegistration registerListener(@Nonnull T listener, - @Nonnull Collection subtrees, boolean allowRxMerges); + @NonNull ListenerRegistration registerListener(@NonNull T listener, + @NonNull Collection subtrees, boolean allowRxMerges); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardProducer.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardProducer.java index f909769163..cb1f2b1c80 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardProducer.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardProducer.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.dom.spi.shard; import com.google.common.annotations.Beta; import java.util.Collection; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; @Beta @@ -20,7 +20,7 @@ public interface DOMDataTreeShardProducer { * * @return Collection of data tree identifiers. */ - @Nonnull Collection getPrefixes(); + @NonNull Collection getPrefixes(); /** * Create a new write transaction for this producer. Any previous transactions need to be closed either via @@ -29,5 +29,5 @@ public interface DOMDataTreeShardProducer { * @return A new write transaction * @throws IllegalStateException if a previous transaction has not been closed */ - DOMDataTreeShardWriteTransaction createTransaction(); + @NonNull DOMDataTreeShardWriteTransaction createTransaction(); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardWriteTransaction.java index f8e009b1af..493e0744c2 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeShardWriteTransaction.java @@ -5,12 +5,11 @@ * 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.mdsal.dom.spi.shard; import com.google.common.annotations.Beta; import com.google.common.util.concurrent.ListenableFuture; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeCursorProvider; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; @@ -26,7 +25,8 @@ public interface DOMDataTreeShardWriteTransaction extends DOMDataTreeCursorProvi * @throws NullPointerException if prefix is null. */ @Override - @Nonnull DOMDataTreeWriteCursor createCursor(@Nonnull DOMDataTreeIdentifier prefix); + // FIXME: 4.0.0: reconcile @NonNull vs. super @Nullable + @NonNull DOMDataTreeWriteCursor createCursor(@NonNull DOMDataTreeIdentifier prefix); /** * Finish this transaction and submit it for processing. diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableModificationNode.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableModificationNode.java index 76115dd3a8..06f099d6f6 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableModificationNode.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableModificationNode.java @@ -5,12 +5,11 @@ * 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.mdsal.dom.spi.shard; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -25,7 +24,7 @@ public abstract class WriteableModificationNode implements Identifiable getChildrenWithSubshards(); diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java index f45acfee92..63cb45a66c 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration; import org.opendaylight.mdsal.dom.spi.AbstractRegistrationTree; @@ -44,8 +44,8 @@ public abstract class AbstractDOMStoreTreeChangePublisher * @param registration the registration to notify * @param changes the list of DataTreeCandidate changes */ - protected abstract void notifyListener(@Nonnull AbstractDOMDataTreeChangeListenerRegistration registration, - @Nonnull Collection changes); + protected abstract void notifyListener(@NonNull AbstractDOMDataTreeChangeListenerRegistration registration, + @NonNull Collection changes); /** * Callback notifying the subclass that the specified registration is being @@ -59,14 +59,14 @@ public abstract class AbstractDOMStoreTreeChangePublisher * @param registration Registration which is being closed */ protected abstract void registrationRemoved( - @Nonnull AbstractDOMDataTreeChangeListenerRegistration registration); + @NonNull AbstractDOMDataTreeChangeListenerRegistration registration); /** * Process a candidate tree with respect to registered listeners. * * @param candidate candidate three which needs to be processed */ - protected final void processCandidateTree(@Nonnull final DataTreeCandidate candidate) { + protected final void processCandidateTree(final @NonNull DataTreeCandidate candidate) { final DataTreeCandidateNode node = candidate.getRootNode(); if (node.getModificationType() == ModificationType.UNMODIFIED) { LOG.debug("Skipping unmodified candidate {}", candidate); diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTreeChangePublisher.java index 6cde35b27e..cc8994e71a 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTreeChangePublisher.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTreeChangePublisher.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.dom.spi.store; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -48,16 +48,11 @@ public interface DOMStoreTreeChangePublisher { * notifications. This is especially true in OSGi environments, where failure to * do so during bundle shutdown can lead to stale listeners being still registered. * - * @param treeId - * Data tree identifier of the subtree which should be watched for - * changes. - * @param listener - * Listener instance which is being registered - * @return Listener registration object, which may be used to unregister - * your listener using {@link ListenerRegistration#close()} to stop - * delivery of change events. + * @param treeId Data tree identifier of the subtree which should be watched for changes. + * @param listener Listener instance which is being registered + * @return Listener registration object, which may be used to unregister your listener using + * {@link ListenerRegistration#close()} to stop delivery of change events. */ - @Nonnull - ListenerRegistration registerTreeChangeListener( - @Nonnull YangInstanceIdentifier treeId, @Nonnull L listener); + @NonNull ListenerRegistration registerTreeChangeListener( + @NonNull YangInstanceIdentifier treeId, @NonNull L listener); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java index 0d79b65083..926c74618e 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java @@ -15,7 +15,7 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Throwables; import java.util.Optional; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import javax.annotation.Nullable; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderServiceTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderServiceTest.java index cb442fb9cc..60bd739767 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderServiceTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderServiceTest.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.dom.spi; import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; import static org.mockito.MockitoAnnotations.initMocks; import java.util.Set; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; @@ -26,13 +26,13 @@ public class AbstractDOMRpcProviderServiceTest extends AbstractDOMRpcProviderSer @Test public void registerRpcImplementation() throws Exception { initMocks(this); - assertEquals(domRpcImplementationRegistration, this.registerRpcImplementation(null)); + assertEquals(domRpcImplementationRegistration, this.registerRpcImplementation( + mock(DOMRpcImplementation.class))); } - @Nonnull @Override public DOMRpcImplementationRegistration registerRpcImplementation( - @Nonnull T implementation, @Nonnull Set rpcs) { + final T implementation, final Set rpcs) { return domRpcImplementationRegistration; } } \ No newline at end of file diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java index def5dcc7a5..09091db0b3 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBrokerTest.java @@ -13,7 +13,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.collect.ImmutableClassToInstanceMap; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; @@ -45,7 +44,6 @@ public class ForwardingDOMDataBrokerTest extends ForwardingDOMDataBroker { verify(domDataBroker).newWriteOnlyTransaction(); } - @Nonnull @Override protected DOMDataBroker delegate() { return domDataBroker; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransactionTest.java index 8988c858aa..23ce40ab74 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransactionTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransactionTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -43,7 +42,6 @@ public class ForwardingDOMDataReadOnlyTransactionTest extends ForwardingDOMDataR verify(domDataTreeReadTransaction).close(); } - @Nonnull @Override protected DOMDataTreeReadTransaction delegate() { return domDataTreeReadTransaction; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransactionTest.java index caed2264f3..488e530baf 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransactionTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransactionTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; @@ -51,7 +50,6 @@ public class ForwardingDOMDataWriteTransactionTest extends ForwardingDOMDataWrit verify(domDataTreeWriteTransaction).cancel(); } - @Nonnull @Override protected DOMDataTreeWriteTransaction delegate() { return domDataTreeWriteTransaction; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementationTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementationTest.java index f33e8434fa..2781d22be7 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementationTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementationTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; @@ -34,7 +33,6 @@ public class ForwardingDOMRpcImplementationTest extends ForwardingDOMRpcImplemen verify(domRpcImplementation).invokeRpc(domRpcIdentifier, null); } - @Nonnull @Override protected DOMRpcImplementation delegate() { return domRpcImplementation; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderServiceTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderServiceTest.java index 11f9d83eb4..5133050a1d 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderServiceTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderServiceTest.java @@ -13,7 +13,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; import java.util.Collections; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; @@ -40,7 +39,6 @@ public class ForwardingDOMRpcProviderServiceTest extends ForwardingDOMRpcProvide verify(domRpcProviderService).registerRpcImplementation(domRpcImplementation, Collections.EMPTY_SET); } - @Nonnull @Override protected DOMRpcProviderService delegate() { return domRpcProviderService; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResultTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResultTest.java index 85cf8a0cfd..a8a00d7606 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResultTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResultTest.java @@ -11,7 +11,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -34,7 +33,6 @@ public class ForwardingDOMRpcResultTest extends ForwardingDOMRpcResult { verify(domRpcResult).getResult(); } - @Nonnull @Override protected DOMRpcResult delegate() { return domRpcResult; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcServiceTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcServiceTest.java index 8e43ec72e1..cc58aaf116 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcServiceTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcServiceTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener; @@ -39,7 +38,6 @@ public class ForwardingDOMRpcServiceTest extends ForwardingDOMRpcService { verify(domRpcService).registerRpcListener(domRpcAvailabilityListener); } - @Nonnull @Override protected DOMRpcService delegate() { return domRpcService; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChainTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChainTest.java index 14d7c7a96c..cfa21127bb 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChainTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChainTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; -import javax.annotation.Nonnull; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.mdsal.dom.api.DOMTransactionChain; @@ -39,7 +38,6 @@ public class ForwardingDOMTransactionChainTest extends ForwardingDOMTransactionC verify(domTransactionChain).close(); } - @Nonnull @Override protected DOMTransactionChain delegate() { return domTransactionChain; diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java index 4a1f8a261f..e665ff41b8 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java @@ -15,7 +15,6 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableList; import java.lang.reflect.Field; import java.util.Collection; -import javax.annotation.Nonnull; import org.junit.Assert; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; @@ -76,7 +75,7 @@ public class AbstractDOMStoreTreeChangePublisherTest extends AbstractDOMStoreTre } @Override - protected void registrationRemoved(@Nonnull final AbstractDOMDataTreeChangeListenerRegistration registration) { + protected void registrationRemoved(final AbstractDOMDataTreeChangeListenerRegistration registration) { removeInvoked = true; } } -- 2.36.6