Fixed some major sonar issues in yang-data-api, yang-data-operations

Change-Id: Ic099300378a864e119c10958f721efdfde81599d
Signed-off-by: Igor Foltin <igor.foltin@pantheon.sk>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
index 7084c42876dddaa1c0aec36841be56644d311f02..7d7a4eeb7d7b73db5cc21fe5892f1e5a29b16c9c 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
@@ -117,7 +117,7 @@ public final class LoggingNormalizedNodeStreamWriter implements NormalizedNodeSt
     }
 
     @Override
-    public void endNode() throws IllegalStateException {
+    public void endNode() {
         decIndent();
         LOG.debug("{}(end)", ind());
     }

diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java
index 41af22664daa2e4515963af7a4431f0a94cd1e21..e653818bc20dcc29dc0983053675d9bd8fa5f662 100644 (file)
--- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java
+++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/AbstractContainerNodeModification.java
@@ -180,6 +180,10 @@ abstract class AbstractContainerNodeModification<S, N extends DataContainerNode<
         private static final ContainerNodeModification CONTAINER_NODE_MODIFICATION = new ContainerNodeModification();
         private static final ChoiceNodeModification CHOICE_NODE_MODIFICATION = new ChoiceNodeModification();
 
+        private NodeDispatcher() {
+            throw new UnsupportedOperationException("Utility class should not be instantiated!");
+        }
+
         static Optional<? extends DataContainerChild<?, ?>> dispatchChildModification(final Object schemaChild,
                 final Optional<DataContainerChild<?, ?>> actual, final Optional<DataContainerChild<?, ?>> modification,
                 final OperationStack operations) throws DataModificationException {

diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java
index ff239a136fb505b286ae1b5c4283b08d2769f246..561a93af2e23ba02d7809588213f7c21dfcfaab7 100644 (file)
--- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java
+++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/UnkeyedListNodeModification.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.operations;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import java.util.List;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
@@ -32,21 +31,18 @@ public class UnkeyedListNodeModification implements Modification<ListSchemaNode,
         }
 
         List<UnkeyedListEntryNode> resultNodes = Lists.newArrayList();
-        if (actual.isPresent())
+        if (actual.isPresent()) {
             resultNodes = unkeyedListEntries(actual.get());
-
+        }
         // TODO implement ordering for modification nodes
 
         for (UnkeyedListEntryNode unkeyedListEntryModification : modification.get().getValue()) {
 
             operationStack.enteringNode(unkeyedListEntryModification);
 
-            YangInstanceIdentifier.NodeIdentifier entryKey = unkeyedListEntryModification.getIdentifier();
-
             switch (operationStack.getCurrentOperation()) {
             case NONE:
                 break;
-            // DataModificationException.DataMissingException.check(schema.getQName(), actual, mapEntryModification);
             case MERGE:
             case CREATE: {
                 DataModificationException.DataExistsException.check(schema.getQName(), actual,
@@ -57,8 +53,6 @@ public class UnkeyedListNodeModification implements Modification<ListSchemaNode,
                 break;
             }
             case DELETE: {
-                // DataModificationException.DataMissingException.check(schema.getQName(), actual,
-                // unkeyedListEntryModification);
                 break;
             }
             case REMOVE: {