Removed sonar warnings.

Change-Id: I30d1be315d148a3a19809f4b33bfe40cec676e84
Signed-off-by: Dana Kutenicsova <dana.kutenics@gmail.com>

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 41eae94cebce88b10923ac474bf7bc4b1f1c189f..87ddefd64aeb9dfe167c98085f6cb7b384331420 100644 (file)
--- 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<V> {
      * @param prefix Prefix for lookup
      * @return closest non-null entry towards root or null if no entry towards root exists.
      */
-    public @Nullable DOMDataTreePrefixTableEntry<V> lookup(@Nonnull final DOMDataTreeIdentifier prefix) {
+    @Nullable
+    public DOMDataTreePrefixTableEntry<V> lookup(@Nonnull final DOMDataTreeIdentifier prefix) {
         final DOMDataTreePrefixTableEntry<V> t = roots.get(prefix.getDatastoreType());
         if (t == null) {
             return null;
@@ -66,7 +67,7 @@ public final class DOMDataTreePrefixTable<V> {
     public void store(@Nonnull final DOMDataTreeIdentifier prefix, @Nonnull final V value) {
         DOMDataTreePrefixTableEntry<V> domDataTreePrefixTableEntry = roots.get(prefix.getDatastoreType());
         if (domDataTreePrefixTableEntry == null) {
-            domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<V>();
+            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 e4b7739e0cc451c92627bfe1a1b202936b6b3ce4..eaed0b04af8c8dbb62e7ef9b8d42c68035331640 100644 (file)
--- 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<RpcError> errors;
     private final NormalizedNode<?, ?> result;
 
-    private static Collection<RpcError> 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.<RpcError>emptyList());
     }
 
-    public DefaultDOMRpcResult(final NormalizedNode<?, ?> result, final @Nonnull Collection<RpcError> errors) {
+    public DefaultDOMRpcResult(final NormalizedNode<?, ?> result, @Nonnull final Collection<RpcError> errors) {
         this.result = result;
         this.errors = Preconditions.checkNotNull(errors);
     }
 
-    public DefaultDOMRpcResult(final @Nonnull Collection<RpcError> errors) {
+    public DefaultDOMRpcResult(@Nonnull final Collection<RpcError> errors) {
         this(null, errors);
     }
 
+    private static Collection<RpcError> asCollection(final RpcError... errors) {
+        if (errors.length == 0) {
+            return Collections.emptyList();
+        } else {
+            return Arrays.asList(errors);
+        }
+    }
+
     @Override
-    public @Nonnull Collection<RpcError> getErrors() {
+    @Nonnull
+    public Collection<RpcError> 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 f338227701589b09238ec8f7563e67716aed0478..5048f98901bdb56fa718772423a2abf10d29a71d 100644 (file)
--- 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 ad213009c08876656efd36f634bdb928e6c49084..ff2fc61cc851f282761bb57fd986f6bcc51f30a1 100644 (file)
--- 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 7125b79089b28f3992d5e94a1dca9a9724a55bae..af7d305e20ebd0bbb422fecf7e981199052b7eaf 100644 (file)
--- 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<DOMRpcResult, DOMRpcException> 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 0d473477e6574766640e064089b3cd5519c2aa4e..38fe9132d80947f9c7b7fbe2b268cb0fd2c9ceb1 100644 (file)
--- 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 <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> 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 e2761ad5083cb2c73d875ddd380e554a1039d229..741ce0e514d9f047039533e8b96cdfdf5f6c77c5 100644 (file)
--- 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<RpcError> 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 555bbaae0dbc021dc844f6053e252d23e2b7fc04..3f420e7f3f611954d108e708e513e24f7830f221 100644 (file)
--- 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<DOMRpcResult, DOMRpcException> 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 0e67634a9145b1e5a9a03ab313809c5c987a686f..a66bc0a83ec926b9e128e621892715aa4ee82732 100644 (file)
--- 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 ca3da5c7865ad6c80dde2765786bfe92abc6530d..25aa580e998bf274598d5ab1b97546d316aa436d 100644 (file)
--- 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<T> implements Identifiable<PathArgument>
      * @param arg Child identifier
      * @return Collection of children, guaranteed to be non-null.
      */
-    public @Nonnull Collection<RegistrationTreeNode<T>> getInexactChildren(@Nonnull final PathArgument arg) {
+    @Nonnull
+    public Collection<RegistrationTreeNode<T>> getInexactChildren(@Nonnull final PathArgument arg) {
         Preconditions.checkNotNull(arg);
         if (arg instanceof NodeWithValue || arg instanceof NodeIdentifierWithPredicates) {
             /*
@@ -97,7 +98,7 @@ public final class RegistrationTreeNode<T> implements Identifiable<PathArgument>
     RegistrationTreeNode<T> ensureChild(@Nonnull final PathArgument child) {
         RegistrationTreeNode<T> potential = children.get(Preconditions.checkNotNull(child));
         if (potential == null) {
-            potential = new RegistrationTreeNode<T>(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 9058b66e392b0324034223e7baabd95d6c4aa5ef..75eaed9226adfa66bf8b3e479589f6ac0b31917f 100644 (file)
--- 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<DOMService> services;
     private final SchemaContext schemaContext;
 
-    public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier,
-            final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
-        return new SimpleDOMMountPoint(identifier, services, ctx);
-    }
-
     private SimpleDOMMountPoint(final YangInstanceIdentifier identifier,
             final ClassToInstanceMap<DOMService> 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<DOMService> 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 61c88d8a331f983043858c52ee96c3a841abbcf6..9d85559b5f967da2a05b15c71c38e24ddbc80804 100644 (file)
--- 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<T>
     }
 
     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 b58617ad5bf19af0cc62af0f78b51d491e5cbcfa..ccf1f7884da35c59c11bdc1e3d4e6e2bc4eaa0f1 100644 (file)
--- 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 <T> SnapshotBackedReadTransaction<T> newReadTransaction(final T identifier,
             final boolean debug, final DataTreeSnapshot snapshot) {
-        return new SnapshotBackedReadTransaction<T>(identifier, debug, snapshot);
+        return new SnapshotBackedReadTransaction<>(identifier, debug, snapshot);
     }
 
     /**
@@ -41,7 +41,7 @@ public final class SnapshotBackedTransactions {
      */
     public static <T> SnapshotBackedReadWriteTransaction<T> newReadWriteTransaction(final T identifier,
             final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
-        return new SnapshotBackedReadWriteTransaction<T>(identifier, debug, snapshot, readyImpl);
+        return new SnapshotBackedReadWriteTransaction<>(identifier, debug, snapshot, readyImpl);
     }
 
     /**
@@ -54,6 +54,6 @@ public final class SnapshotBackedTransactions {
      */
     public static <T> SnapshotBackedWriteTransaction<T> newWriteTransaction(final T identifier,
             final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
-        return new SnapshotBackedWriteTransaction<T>(identifier, debug, snapshot, readyImpl);
+        return new SnapshotBackedWriteTransaction<>(identifier, debug, snapshot, readyImpl);
     }
 }