From abb11d1d838a6c19a3f190b677f4a13cf3b33bb0 Mon Sep 17 00:00:00 2001 From: Dana Kutenicsova Date: Thu, 13 Oct 2016 11:37:08 +0200 Subject: [PATCH] Removed sonar warnings. Change-Id: I30d1be315d148a3a19809f4b33bfe40cec676e84 Signed-off-by: Dana Kutenicsova --- .../mdsal/dom/spi/DOMDataTreePrefixTable.java | 5 ++-- .../mdsal/dom/spi/DefaultDOMRpcResult.java | 23 ++++++++++--------- .../dom/spi/ForwardingDOMDataBroker.java | 3 ++- .../ForwardingDOMDataWriteTransaction.java | 3 ++- .../spi/ForwardingDOMRpcImplementation.java | 3 ++- .../spi/ForwardingDOMRpcProviderService.java | 3 ++- .../mdsal/dom/spi/ForwardingDOMRpcResult.java | 3 ++- .../dom/spi/ForwardingDOMRpcService.java | 3 ++- .../spi/ForwardingDOMTransactionChain.java | 3 ++- .../mdsal/dom/spi/RegistrationTreeNode.java | 5 ++-- .../mdsal/dom/spi/SimpleDOMMountPoint.java | 10 ++++---- ...bstractSnapshotBackedTransactionChain.java | 5 ++-- .../spi/store/SnapshotBackedTransactions.java | 6 ++--- 13 files changed, 42 insertions(+), 33 deletions(-) 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 41eae94ceb..87ddefd64a 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 @@ -47,7 +47,8 @@ public final class DOMDataTreePrefixTable { * @param prefix Prefix for lookup * @return closest non-null entry towards root or null if no entry towards root exists. */ - public @Nullable DOMDataTreePrefixTableEntry lookup(@Nonnull final DOMDataTreeIdentifier prefix) { + @Nullable + public DOMDataTreePrefixTableEntry lookup(@Nonnull final DOMDataTreeIdentifier prefix) { final DOMDataTreePrefixTableEntry t = roots.get(prefix.getDatastoreType()); if (t == null) { return null; @@ -66,7 +67,7 @@ public final class DOMDataTreePrefixTable { public void store(@Nonnull final DOMDataTreeIdentifier prefix, @Nonnull final V value) { DOMDataTreePrefixTableEntry domDataTreePrefixTableEntry = roots.get(prefix.getDatastoreType()); if (domDataTreePrefixTableEntry == null) { - domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry(); + domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<>(); roots.put(prefix.getDatastoreType(), domDataTreePrefixTableEntry); } 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 e4b7739e0c..eaed0b04af 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 @@ -29,14 +29,6 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria private final Collection errors; private final NormalizedNode result; - private static Collection asCollection(final RpcError... errors) { - if (errors.length == 0) { - return Collections.emptyList(); - } else { - return Arrays.asList(errors); - } - } - public DefaultDOMRpcResult(final NormalizedNode result, final RpcError... errors) { this(result, asCollection(errors)); } @@ -49,17 +41,26 @@ public final class DefaultDOMRpcResult implements DOMRpcResult, Immutable, Seria this(result, Collections.emptyList()); } - public DefaultDOMRpcResult(final NormalizedNode result, final @Nonnull Collection errors) { + public DefaultDOMRpcResult(final NormalizedNode result, @Nonnull final Collection errors) { this.result = result; this.errors = Preconditions.checkNotNull(errors); } - public DefaultDOMRpcResult(final @Nonnull Collection errors) { + public DefaultDOMRpcResult(@Nonnull final Collection errors) { this(null, errors); } + private static Collection asCollection(final RpcError... errors) { + if (errors.length == 0) { + return Collections.emptyList(); + } else { + return Arrays.asList(errors); + } + } + @Override - public @Nonnull Collection getErrors() { + @Nonnull + public Collection getErrors() { return 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 f338227701..5048f98901 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 @@ -24,7 +24,8 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChain; public abstract class ForwardingDOMDataBroker extends ForwardingObject implements DOMDataBroker { @Override - protected abstract @Nonnull DOMDataBroker delegate(); + @Nonnull + protected abstract DOMDataBroker delegate(); @Override public DOMDataTreeReadTransaction newReadOnlyTransaction() { 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 ad213009c0..ff2fc61cc8 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 @@ -23,7 +23,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject implements DOMDataTreeWriteTransaction { @Override - protected abstract @Nonnull DOMDataTreeWriteTransaction delegate(); + @Nonnull + protected abstract 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 7125b79089..af7d305e20 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 @@ -22,7 +22,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public abstract class ForwardingDOMRpcImplementation extends ForwardingObject implements DOMRpcImplementation { @Override - protected abstract @Nonnull DOMRpcImplementation delegate(); + @Nonnull + protected abstract DOMRpcImplementation delegate(); @Override public CheckedFuture invokeRpc( 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 0d473477e6..38fe9132d8 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 @@ -21,7 +21,8 @@ import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; */ public abstract class ForwardingDOMRpcProviderService extends ForwardingObject implements DOMRpcProviderService { @Override - protected abstract @Nonnull DOMRpcProviderService delegate(); + @Nonnull + protected abstract DOMRpcProviderService delegate(); @Override public DOMRpcImplementationRegistration registerRpcImplementation( diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java index e2761ad508..741ce0e514 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java @@ -20,7 +20,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public abstract class ForwardingDOMRpcResult extends ForwardingObject implements DOMRpcResult { @Override - protected abstract @Nonnull DOMRpcResult delegate(); + @Nonnull + protected abstract DOMRpcResult delegate(); @Override public Collection getErrors() { 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 555bbaae0d..3f420e7f3f 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 @@ -23,7 +23,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; */ public abstract class ForwardingDOMRpcService extends ForwardingObject implements DOMRpcService { @Override - protected abstract @Nonnull DOMRpcService delegate(); + @Nonnull + protected abstract DOMRpcService delegate(); @Override public CheckedFuture invokeRpc( 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 0e67634a91..a66bc0a83e 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 @@ -19,7 +19,8 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChain; */ public abstract class ForwardingDOMTransactionChain extends ForwardingObject implements DOMTransactionChain { @Override - protected abstract @Nonnull DOMTransactionChain delegate(); + @Nonnull + protected abstract DOMTransactionChain delegate(); @Override public void close() { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNode.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNode.java index ca3da5c786..25aa580e99 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNode.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeNode.java @@ -70,7 +70,8 @@ public final class RegistrationTreeNode implements Identifiable * @param arg Child identifier * @return Collection of children, guaranteed to be non-null. */ - public @Nonnull Collection> getInexactChildren(@Nonnull final PathArgument arg) { + @Nonnull + public Collection> getInexactChildren(@Nonnull final PathArgument arg) { Preconditions.checkNotNull(arg); if (arg instanceof NodeWithValue || arg instanceof NodeIdentifierWithPredicates) { /* @@ -97,7 +98,7 @@ public final class RegistrationTreeNode implements Identifiable RegistrationTreeNode ensureChild(@Nonnull final PathArgument child) { RegistrationTreeNode potential = children.get(Preconditions.checkNotNull(child)); if (potential == null) { - potential = new RegistrationTreeNode(this, child); + potential = new RegistrationTreeNode<>(this, child); children.put(child, potential); } return potential; diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java index 9058b66e39..75eaed9226 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java @@ -22,11 +22,6 @@ public class SimpleDOMMountPoint implements DOMMountPoint { private final ClassToInstanceMap services; private final SchemaContext schemaContext; - public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier, - final ClassToInstanceMap services, final SchemaContext ctx) { - return new SimpleDOMMountPoint(identifier, services, ctx); - } - private SimpleDOMMountPoint(final YangInstanceIdentifier identifier, final ClassToInstanceMap services, final SchemaContext ctx) { this.identifier = identifier; @@ -34,6 +29,11 @@ public class SimpleDOMMountPoint implements DOMMountPoint { this.schemaContext = ctx; } + public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier, + final ClassToInstanceMap services, final SchemaContext ctx) { + return new SimpleDOMMountPoint(identifier, services, ctx); + } + @Override public YangInstanceIdentifier getIdentifier() { return identifier; diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java index 61c88d8a33..9d85559b5f 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java @@ -12,7 +12,6 @@ import com.google.common.base.Preconditions; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; - import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; @@ -120,8 +119,8 @@ public abstract class AbstractSnapshotBackedTransactionChain } private boolean recordTransaction(final State expected, final DOMStoreWriteTransaction transaction) { - final State state = new Allocated(transaction); - return STATE_UPDATER.compareAndSet(this, expected, state); + final State real = new Allocated(transaction); + return STATE_UPDATER.compareAndSet(this, expected, real); } @Override diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactions.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactions.java index b58617ad5b..ccf1f7884d 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactions.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactions.java @@ -28,7 +28,7 @@ public final class SnapshotBackedTransactions { */ public static SnapshotBackedReadTransaction newReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot) { - return new SnapshotBackedReadTransaction(identifier, debug, snapshot); + return new SnapshotBackedReadTransaction<>(identifier, debug, snapshot); } /** @@ -41,7 +41,7 @@ public final class SnapshotBackedTransactions { */ public static SnapshotBackedReadWriteTransaction newReadWriteTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype readyImpl) { - return new SnapshotBackedReadWriteTransaction(identifier, debug, snapshot, readyImpl); + return new SnapshotBackedReadWriteTransaction<>(identifier, debug, snapshot, readyImpl); } /** @@ -54,6 +54,6 @@ public final class SnapshotBackedTransactions { */ public static SnapshotBackedWriteTransaction newWriteTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype readyImpl) { - return new SnapshotBackedWriteTransaction(identifier, debug, snapshot, readyImpl); + return new SnapshotBackedWriteTransaction<>(identifier, debug, snapshot, readyImpl); } } -- 2.36.6