Merge "Bug 1446: Add new concurrent classes for tracking stats"

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / NodeModificationBuilderImpl.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
index f1c2a44a03373ee0126595802740b54cff6beb18..2f99ba3dfa58550f7586a48aa57fd5e5dc758234 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java
@@ -20,24 +20,27 @@ import org.opendaylight.yangtools.yang.data.api.MutableNode;
 import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.NodeModificationBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
  * @author michal.rehak
- * 
+ *
+ * @deprecated Use {@link Builders} instead.
  */
+@Deprecated
 public class NodeModificationBuilderImpl implements NodeModificationBuilder {
 
-    private SchemaContext context;
+    private final SchemaContext context;
 
-    private Set<MutableNode<?>> changeLog;
-    private LazyNodeToNodeMap originalToMutable;
+    private final Set<MutableNode<?>> changeLog;
+    private final LazyNodeToNodeMap originalToMutable;
 
     /**
      * @param context
      */
-    public NodeModificationBuilderImpl(SchemaContext context) {
+    public NodeModificationBuilderImpl(final SchemaContext context) {
         this.context = context;
         originalToMutable = new LazyNodeToNodeMap();
         changeLog = new HashSet<>();
@@ -47,55 +50,55 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
      * @param modNode
      * @param action
      */
-    private void addModificationToLog(MutableNode<?> modNode, ModifyAction action) {
+    private void addModificationToLog(final MutableNode<?> modNode, final ModifyAction action) {
         modNode.setModifyAction(action);
         changeLog.add(modNode);
     }
 
     @Override
-    public void addNode(MutableSimpleNode<?> newNode) {
+    public void addNode(final MutableSimpleNode<?> newNode) {
         NodeUtils.fixParentRelation(newNode);
         addModificationToLog(newNode, ModifyAction.CREATE);
     }
 
     @Override
-    public void addNode(MutableCompositeNode newNode) {
+    public void addNode(final MutableCompositeNode newNode) {
         NodeUtils.fixParentRelation(newNode);
         addModificationToLog(newNode, ModifyAction.CREATE);
     }
 
     @Override
-    public void replaceNode(MutableSimpleNode<?> replacementNode) {
+    public void replaceNode(final MutableSimpleNode<?> replacementNode) {
         addModificationToLog(replacementNode, ModifyAction.REPLACE);
     }
 
     @Override
-    public void replaceNode(MutableCompositeNode replacementNode) {
+    public void replaceNode(final MutableCompositeNode replacementNode) {
         addModificationToLog(replacementNode, ModifyAction.REPLACE);
     }
 
     @Override
-    public void deleteNode(MutableCompositeNode deadNode) {
+    public void deleteNode(final MutableCompositeNode deadNode) {
         addModificationToLog(deadNode, ModifyAction.DELETE);
     }
 
     @Override
-    public void deleteNode(MutableSimpleNode<?> deadNode) {
+    public void deleteNode(final MutableSimpleNode<?> deadNode) {
         addModificationToLog(deadNode, ModifyAction.DELETE);
     }
 
     @Override
-    public void removeNode(MutableSimpleNode<?> deadNode) {
+    public void removeNode(final MutableSimpleNode<?> deadNode) {
         addModificationToLog(deadNode, ModifyAction.REMOVE);
     }
 
     @Override
-    public void removeNode(MutableCompositeNode deadNode) {
+    public void removeNode(final MutableCompositeNode deadNode) {
         addModificationToLog(deadNode, ModifyAction.REMOVE);
     }
 
     @Override
-    public void mergeNode(MutableCompositeNode alteredNode) {
+    public void mergeNode(final MutableCompositeNode alteredNode) {
         addModificationToLog(alteredNode, ModifyAction.MERGE);
     }
 
@@ -122,7 +125,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
                         // try to add key subnode to wanted list
                         List<QName> supportedKeys = listSchema.getKeyDefinition();
                         CompositeNode outlawOriginal = ((MutableCompositeNode) outlaw).getOriginal();
-                        for (Node<?> outlawOriginalChild : outlawOriginal.getChildren()) {
+                        for (Node<?> outlawOriginalChild : outlawOriginal.getValue()) {
                             if (supportedKeys.contains(outlawOriginalChild.getNodeType())) {
                                 originalToMutable.getMutableEquivalent(outlawOriginalChild);
                             }
@@ -139,7 +142,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
      * @param focusedDescendant
      * @return set of parents and focusedAncestor itself
      */
-    private static Set<Node<?>> collectSelfAndAllParents(Node<?> focusedDescendant) {
+    private static Set<Node<?>> collectSelfAndAllParents(final Node<?> focusedDescendant) {
         Set<Node<?>> family = new HashSet<>();
         Node<?> tmpNode = focusedDescendant;
         while (tmpNode != null) {
@@ -154,7 +157,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
      * @return mutable version of given node
      */
     @Override
-    public Node<?> getMutableEquivalent(Node<?> originalNode) {
+    public Node<?> getMutableEquivalent(final Node<?> originalNode) {
         return originalToMutable.getMutableEquivalent(originalNode);
     }