Bug 868: Removed Composite Nodes from Yangtools

[yangtools.git] / yang / yang-data-operations / src / main / java / org / opendaylight / yangtools / yang / data / operations / DataModificationException.java

diff --git a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java
index cc6653518c6f37b9dbcd10c015a36ed6fb0e4336..c8cbe545ce0f57f1522edf5479114966e0d49301 100644 (file)
--- a/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java
+++ b/yang/yang-data-operations/src/main/java/org/opendaylight/yangtools/yang/data/operations/DataModificationException.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.data.operations;
 
+import com.google.common.base.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
@@ -16,8 +16,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-import com.google.common.base.Optional;
-
 public class DataModificationException extends Exception {
     // TODO replace QName as identifier for node with schema or NodeIdentifier,
     // Augmentation does not have a QName
@@ -25,7 +23,7 @@ public class DataModificationException extends Exception {
     private static final long serialVersionUID = 1L;
     private final QName node;
 
-    public DataModificationException(String message, QName node) {
+    public DataModificationException(final String message, final QName node) {
         super(message);
         this.node = node;
     }
@@ -37,30 +35,30 @@ public class DataModificationException extends Exception {
     public static final class DataMissingException extends DataModificationException {
         private static final long serialVersionUID = 1L;
 
-        public DataMissingException(QName nodeType) {
+        public DataMissingException(final QName nodeType) {
             super(String.format("Data missing for node: %s", nodeType), nodeType);
         }
 
-        public DataMissingException(QName nodeType, Node<?> modificationNode) {
+        public DataMissingException(final QName nodeType, final NormalizedNode<?, ?> modificationNode) {
             super(String.format("Data missing for node: %s, %s", nodeType, modificationNode), nodeType);
         }
 
-        static void check(QName nodeQName, Optional<? extends NormalizedNode<?, ?>> actualNode) throws DataMissingException {
-            if (actualNode.isPresent() == false) {
+        static void check(final QName nodeQName, final Optional<? extends NormalizedNode<?, ?>> actualNode) throws DataMissingException {
+            if (!actualNode.isPresent()) {
                 throw new DataMissingException(nodeQName);
             }
         }
 
-        static void check(QName nodeQName, Optional<LeafSetNode<?>> actualNodes, LeafSetEntryNode<?> modificationNode)
+        static void check(final QName nodeQName, final Optional<LeafSetNode<?>> actualNodes, final LeafSetEntryNode<?> modificationNode)
                 throws DataMissingException {
-            if (actualNodes.isPresent()==false || actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent() == false) {
+            if (!actualNodes.isPresent() || !actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
                 throw new DataMissingException(nodeQName, modificationNode);
             }
         }
 
-        static void check(QName nodeQName, Optional<MapNode> actualNodes, MapEntryNode modificationNode)
+        static void check(final QName nodeQName, final Optional<MapNode> actualNodes, final MapEntryNode modificationNode)
                 throws DataModificationException {
-            if (actualNodes.isPresent()==false || actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent() == false) {
+            if (!actualNodes.isPresent() || !actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
                 throw new DataMissingException(nodeQName, modificationNode);
             }
         }
@@ -69,26 +67,26 @@ public class DataModificationException extends Exception {
     public static final class DataExistsException extends DataModificationException {
         private static final long serialVersionUID = 1L;
 
-        public DataExistsException(QName nodeType, NormalizedNode<?, ?> actualNode, NormalizedNode<?, ?> modificationNode) {
+        public DataExistsException(final QName nodeType, final NormalizedNode<?, ?> actualNode, final NormalizedNode<?, ?> modificationNode) {
             super(String
                     .format("Data already exists for node: %s, current value: %s. modification value: %s", nodeType, actualNode, modificationNode),
                     nodeType);
         }
 
-        static void check(QName nodeQName, Optional<? extends NormalizedNode<?, ?>> actualNode, NormalizedNode<?, ?> modificationNode) throws DataExistsException {
+        static void check(final QName nodeQName, final Optional<? extends NormalizedNode<?, ?>> actualNode, final NormalizedNode<?, ?> modificationNode) throws DataExistsException {
             if (actualNode.isPresent()) {
                 throw new DataExistsException(nodeQName, actualNode.get(), modificationNode);
             }
         }
 
-        static void check(QName nodeQName, Optional<LeafSetNode<?>> actualNodes, LeafSetEntryNode<?> modificationNode)
+        static void check(final QName nodeQName, final Optional<LeafSetNode<?>> actualNodes, final LeafSetEntryNode<?> modificationNode)
                 throws DataExistsException {
             if (actualNodes.isPresent() && actualNodes.get().getChild(modificationNode.getIdentifier()).isPresent()) {
                 throw new DataExistsException(nodeQName, actualNodes.get(), modificationNode);
             }
         }
 
-        public static void check(QName qName, Optional<MapNode> actualNodes, MapEntryNode listModification)
+        public static void check(final QName qName, final Optional<MapNode> actualNodes, final MapEntryNode listModification)
                 throws DataModificationException {
             if (actualNodes.isPresent() && actualNodes.get().getChild(listModification.getIdentifier()).isPresent()) {
                 throw new DataExistsException(qName, actualNodes.get(), listModification);
@@ -99,18 +97,18 @@ public class DataModificationException extends Exception {
     public static final class IllegalChoiceValuesException extends DataModificationException {
         private static final long serialVersionUID = 1L;
 
-        public IllegalChoiceValuesException(String message, QName node) {
+        public IllegalChoiceValuesException(final String message, final QName node) {
             super(message, node);
         }
 
-        public static void throwMultipleCasesReferenced(QName choiceQName, ChoiceNode modification,
-                QName case1QName, QName case2QName) throws IllegalChoiceValuesException {
+        public static void throwMultipleCasesReferenced(final QName choiceQName, final ChoiceNode modification,
+                final QName case1QName, final QName case2QName) throws IllegalChoiceValuesException {
             throw new IllegalChoiceValuesException(String.format(
                     "Child nodes from multiple cases present in modification: %s, choice: %s, case1: %s, case2: %s",
                     modification, choiceQName, case1QName, case2QName), choiceQName);
         }
 
-        public static void throwUnknownChild(QName choiceQName, QName nodeQName) throws IllegalChoiceValuesException {
+        public static void throwUnknownChild(final QName choiceQName, final QName nodeQName) throws IllegalChoiceValuesException {
             throw new IllegalChoiceValuesException(String.format(
                     "Unknown child node detected, choice: %s, child node: %s",
                     choiceQName, nodeQName), choiceQName);