Merge "Bug 1331 - Generate SPIs and yangs to target/generated-sources/ subfolders"

[yangtools.git] / yang / yang-data-util / src / main / java / org / opendaylight / yangtools / yang / data / util / AbstractContainerNode.java

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
index 7b3649a504ec7a597906f9f214823374f3455977..d8ce08667c288b748db0cce47926099236112bac 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java
@@ -17,32 +17,36 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 
-public abstract class AbstractContainerNode extends AbstractNode<List<Node<?>>>
-        implements CompositeNode {
+public abstract class AbstractContainerNode extends AbstractNode<List<Node<?>>> implements CompositeNode {
 
-    public SimpleNode<?> getFirstSimpleByName(QName leaf) {
+    @Override
+    public SimpleNode<?> getFirstSimpleByName(final QName leaf) {
         List<SimpleNode<?>> list = getSimpleNodesByName(leaf);
-        if (list.size() == 0)
+        if (list.size() == 0) {
             return null;
+        }
         return list.get(0);
     }
 
-    protected AbstractContainerNode(QName name, CompositeNode parent) {
+    protected AbstractContainerNode(final QName name, final CompositeNode parent) {
         super(name, parent);
     }
 
-    public AbstractContainerNode(QName name) {
+    public AbstractContainerNode(final QName name) {
         super(name, null);
     }
 
+    @Override
     public List<Node<?>> getChildren() {
         return getValue();
     }
 
+    @Override
     public List<Node<?>> getValue() {
         Map<QName, List<Node<?>>> map = getNodeMap();
-        if (map == null)
+        if (map == null) {
             throw new IllegalStateException("nodeMap should not be null");
+        }
         List<Node<?>> ret = new ArrayList<Node<?>>();
         Collection<List<Node<?>>> values = map.values();
         for (List<Node<?>> list : values) {
@@ -53,56 +57,67 @@ public abstract class AbstractContainerNode extends AbstractNode<List<Node<?>>>
 
     protected abstract Map<QName, List<Node<?>>> getNodeMap();
 
-    public List<CompositeNode> getCompositesByName(QName children) {
+    @Override
+    public List<CompositeNode> getCompositesByName(final QName children) {
         Map<QName, List<Node<?>>> map = getNodeMap();
-        if (map == null)
+        if (map == null) {
             throw new IllegalStateException("nodeMap should not be null");
+        }
         List<Node<?>> toFilter = map.get(children);
         List<CompositeNode> list = new ArrayList<CompositeNode>();
         for (Node<?> node : toFilter) {
-            if (node instanceof CompositeNode)
+            if (node instanceof CompositeNode) {
                 list.add((CompositeNode) node);
+            }
         }
         return list;
     }
 
-    public List<SimpleNode<?>> getSimpleNodesByName(QName children) {
+    @Override
+    public List<SimpleNode<?>> getSimpleNodesByName(final QName children) {
         Map<QName, List<Node<?>>> map = getNodeMap();
-        if (map == null)
+        if (map == null) {
             throw new IllegalStateException("nodeMap should not be null");
+        }
         List<Node<?>> toFilter = map.get(children);
         List<SimpleNode<?>> list = new ArrayList<SimpleNode<?>>();
 
         for (Node<?> node : toFilter) {
-            if (node instanceof SimpleNode<?>)
+            if (node instanceof SimpleNode<?>) {
                 list.add((SimpleNode<?>) node);
+            }
         }
         return list;
     }
 
-    public CompositeNode getFirstCompositeByName(QName container) {
+    @Override
+    public CompositeNode getFirstCompositeByName(final QName container) {
         List<CompositeNode> list = getCompositesByName(container);
-        if (list.size() == 0)
+        if (list.size() == 0) {
             return null;
+        }
         return list.get(0);
     }
 
-    public SimpleNode<?> getFirstLeafByName(QName leaf) {
+    public SimpleNode<?> getFirstLeafByName(final QName leaf) {
         List<SimpleNode<?>> list = getSimpleNodesByName(leaf);
-        if (list.size() == 0)
+        if (list.size() == 0) {
             return null;
+        }
         return list.get(0);
     }
 
-    public List<CompositeNode> getCompositesByName(String children) {
+    @Override
+    public List<CompositeNode> getCompositesByName(final String children) {
         return getCompositesByName(localQName(children));
     }
 
-    public List<SimpleNode<?>> getSimpleNodesByName(String children) {
+    @Override
+    public List<SimpleNode<?>> getSimpleNodesByName(final String children) {
         return getSimpleNodesByName(localQName(children));
     }
 
-    private QName localQName(String str) {
-        return new QName(getNodeType(), str);
+    private QName localQName(final String str) {
+        return QName.create(getNodeType(), str);
     }
 }