BUG-1472: deprecated CompositeNode and friends

These APIs are deprecated in favor of NormalizedNode and friends. Mark
them as such, so the code that needs to be migrated gets highlighted.

Change-Id: I9d5b903d54dd295f4111f6832bf023b2685c0291
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
index 21e9d52917b79a9730a193aef6119af5305614fe..4b96bdc2031179ba5a68ae18f644b960508ed7a7 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java
@@ -11,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 
 /**
  * Composite node represents a branch in the data tree, which could contain
@@ -28,12 +29,10 @@ import org.opendaylight.yangtools.yang.common.QName;
  * <li><b>anyxml</b></li>
  * </ul>
  *
- *
+ * @deprecated Use {@link NormalizedNodeContainer} instead.
  */
-public interface CompositeNode extends //
-    Node<List<Node<?>>>, //
-    NodeModification, //
-    Map<QName,List<Node<?>>> {
+@Deprecated
+public interface CompositeNode extends Node<List<Node<?>>>, NodeModification, Map<QName,List<Node<?>>> {
 
     /**
      * Returns a list of children as seens in resulting XML serialization

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
index f14cba12e4ab66365203da4ad76c16782d501117..9aa3a4adc11025f1f81990ced522aed16852f8a8 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java
@@ -9,11 +9,15 @@ package org.opendaylight.yangtools.yang.data.api;
 
 import java.util.List;
 
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
+
 
 /**
  * @author michal.rehak
  *
+ * @deprecated Deprecated in favor of {@link NormalizedNodeContainer} classes.
  */
+@Deprecated
 public interface MutableCompositeNode extends MutableNode<List<Node<?>>>, CompositeNode {
 
     /**

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
index f775c2e99f65987bf6870b5907fd6f9e1a67b118..4713eacd18b27feb4feb8e28d2588d2a70d625ea 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.data.api;
 
 import org.opendaylight.yangtools.concepts.Mutable;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 
 /**
@@ -16,7 +17,10 @@ import org.opendaylight.yangtools.concepts.Mutable;
  *
  *
  * @param <T>
+ *
+ * @deprecated Use {@link NormalizedNode} instead.
  */
+@Deprecated
 public interface MutableNode<T> extends Node<T>,Mutable {
 
     /**

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
index 504c0256f35fd60431a4c18c6fe0972b9c5de589..2dcd0a2d5a07fb682d3cdcc6ebb9b810804306a3 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java
@@ -7,17 +7,21 @@
  */
 package org.opendaylight.yangtools.yang.data.api;
 
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+
 
 /**
  * @author michal.rehak
  * @param <T> node value type
  *
+ * @deprecated Use {@link NormalizedNode} instead.
  */
+@Deprecated
 public interface MutableSimpleNode<T> extends MutableNode<T>, SimpleNode<T> {
-    
+
     /**
      * @return original node, if available
      */
     SimpleNode<T> getOriginal();
-    
+
 }

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
index 1d349b82ad1c67d267803f2f628edbc220c2edff..b8b6d14d1b84a4fc1d8320290105f27005590209 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.data.api;
 
+
 /**
  * @author michal.rehak
- * 
+ *
+ * @deprecated Use {@link NormalizedNodeUtils} instead.
  */
+@Deprecated
 public interface NodeModificationBuilder {
 
     abstract Node<?> getMutableEquivalent(Node<?> originalNode);

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
index 46e34c3eb7e9cf148ba2f8cc9b85f9f5bdcae5ae..59bb53d5e837dc814333c06302ccc9de68fa7e18 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.data.api;
 
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+
 /**
  * Simple node represents a leaf in the data tree, which does not contain any
  * nested nodes, but the value of node. In the terms of the XML the simple node
@@ -17,14 +19,17 @@ package org.opendaylight.yangtools.yang.data.api;
  * the empty type, which in XML form is similar to the empty container.</li>
  * <li><b>item</b> in <b>leaf-list</b></li>
  * </ul>
- * 
- * 
+ *
+ *
  * @param <T>
+ *
+ * @deprecated Use {@link NormalizedNode} instead.
  */
+@Deprecated
 public interface SimpleNode<T> extends Node<T>, NodeModification {
 
     /**
-     * @return cast self to mutable, if possible 
+     * @return cast self to mutable, if possible
      */
     MutableSimpleNode<T> asMutable();
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
index 0b194bcc8632498ab547602acc97551855f1dacb..307bf1216997b97ee0d8ff7985679b7d7fcfef2f 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java
@@ -8,14 +8,19 @@
 package org.opendaylight.yangtools.yang.data.impl;
 
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.*;
+import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;
+import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.api.NodeModification;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder;
 
 /**
  * @author michal.rehak
  * @param <T>
  *            type of node value
- *
+ * @deprecated Use one of the {@link NormalizedNodeBuilder} implementations.
  */
+@Deprecated
 public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
 
     private QName qName;
@@ -33,7 +38,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
      * @param parent
      * @param value
      */
-    public AbstractNodeTO(QName qname, CompositeNode parent, T value) {
+    public AbstractNodeTO(final QName qname, final CompositeNode parent, final T value) {
         this(qname, parent, value, null);
     }
 
@@ -43,7 +48,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
      * @param value
      * @param modifyAction
      */
-    public AbstractNodeTO(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) {
+    public AbstractNodeTO(final QName qname, final CompositeNode parent, final T value, final ModifyAction modifyAction) {
         this.qName = qname;
         this.parent = parent;
         this.value = value;
@@ -71,7 +76,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
      * @param parent
      *            the parent to set
      */
-    public void setParent(CompositeNode parent) {
+    public void setParent(final CompositeNode parent) {
         this.parent = parent;
     }
 
@@ -79,7 +84,8 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
      * @param value
      *            the value to set
      */
-    public T setValue(T value) {
+    @Override
+    public T setValue(final T value) {
         T oldValue = this.value;
         this.value = value;
         return oldValue;
@@ -103,7 +109,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
      * @param modifyAction
      *            the modifyAction to set
      */
-    protected void setModificationAction(ModifyAction modifyAction) {
+    protected void setModificationAction(final ModifyAction modifyAction) {
         this.modifyAction = modifyAction;
     }
 
@@ -132,7 +138,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
@@ -172,7 +178,7 @@ public abstract class AbstractNodeTO<T> implements Node<T>, NodeModification {
 
     //Serialization related
 
-    protected final void init(QName qName, CompositeNode parent, T value, ModifyAction modifyAction){
+    protected final void init(final QName qName, final CompositeNode parent, final T value, final ModifyAction modifyAction){
         this.qName = qName;
         this.modifyAction = modifyAction;
         this.parent = parent;

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
index 66546003b4e8fc0fa05cee516caef7ca256e13d5..5026db535384f9aac02ddf49adcca8c175694cb7 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java
@@ -13,11 +13,14 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
  * @author michal.rehak
  *
+ * @deprecated Use one of the {@link NormalizedNode} implementations.
  */
+@Deprecated
 public class CompositeNodeModificationTOImpl extends CompositeNodeTOImpl {
     private static final long serialVersionUID = 1L;
 
@@ -27,8 +30,8 @@ public class CompositeNodeModificationTOImpl extends CompositeNodeTOImpl {
      * @param value
      * @param modifyAction
      */
-    public CompositeNodeModificationTOImpl(QName qname, CompositeNode parent,
-            List<Node<?>> value, ModifyAction modifyAction) {
+    public CompositeNodeModificationTOImpl(final QName qname, final CompositeNode parent,
+            final List<Node<?>> value, final ModifyAction modifyAction) {
         super(qname, parent, value);
         super.setModificationAction(modifyAction);
     }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
index 9fc19d70f6a73b73e995ff95e9e6fcf65155b246..7d5b8bb330e8cd46966d4213ab62e1f0b58dbfc4 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java
@@ -25,11 +25,14 @@ import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 
 /**
  * @author michal.rehak
  *
+ * @deprecated Use one of the {@link NormalizedNodeContainer} implementations.
  */
+@Deprecated
 public class CompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>> implements CompositeNode, Serializable {
 
     private static final long serialVersionUID = 100L;

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/ImmutableCompositeNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/ImmutableCompositeNode.java
index 5ff579a9d60d89dca7d03501d9fb144718f15fd9..1d56fd660104b4cdb6fef0b244194e0380d49b29 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/ImmutableCompositeNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/ImmutableCompositeNode.java
@@ -30,14 +30,15 @@ import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 import org.opendaylight.yangtools.yang.data.impl.util.AbstractCompositeNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder;
 
-public final class ImmutableCompositeNode extends AbstractNodeTO<List<Node<?>>> implements //
-Immutable, //
-CompositeNode, //
-AttributesContainer, //
-Serializable {
+/**
+ * @deprecated Use one of the {@link NormalizedNodeContainer} implementations.
+ */
+@Deprecated
+public final class ImmutableCompositeNode extends AbstractNodeTO<List<Node<?>>> implements Immutable, CompositeNode, AttributesContainer, Serializable {
 
     private static final long serialVersionUID = 100L;
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
index 430d7009f265ae595f7874813864d7367e59fee7..4eae5649cf363981ff465c31a02b9631b8178813 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.data.api.SimpleNode;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class LazyNodeToNodeMap {
 
     private final Map<Node<?>, Node<?>> node2node = new HashMap<>();

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
index c470a80e3c97bb7df335f0a039824b35d859cef6..45aabc3c579195e642d1f4aec168d05fe0eb5031 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java
@@ -25,11 +25,14 @@ import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 
 /**
  * @author michal.rehak
  *
+ * @deprecated Use one of the {@link NormalizedNodeContainer} implementations instead.
  */
+@Deprecated
 public class MutableCompositeNodeTOImpl extends AbstractNodeTO<List<Node<?>>> implements MutableCompositeNode, Serializable {
 
     private static final long serialVersionUID = 100L;

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
index d79ccf0d1546dc0b218ab08e67bf5ec029189ca3..a51b446592cf7713aef0dd985cdefea79a710e19 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java
@@ -12,13 +12,16 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
  * @author michal.rehak
  * @param <T>
  *            type of simple node value
  *
+ * @deprecated Use one of the {@link NormalizedNode} implementation packages.
  */
+@Deprecated
 public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T> implements MutableSimpleNode<T> {
     private static final long serialVersionUID = 1L;
     private SimpleNode<T> original;
@@ -29,12 +32,12 @@ public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T> implements M
      * @param value
      * @param modifyAction
      */
-    public MutableSimpleNodeTOImpl(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) {
+    public MutableSimpleNodeTOImpl(final QName qname, final CompositeNode parent, final T value, final ModifyAction modifyAction) {
         super(qname, parent, value, modifyAction);
     }
 
     @Override
-    public void setModifyAction(ModifyAction action) {
+    public void setModifyAction(final ModifyAction action) {
         super.setModificationAction(action);
     }
 
@@ -52,7 +55,7 @@ public class MutableSimpleNodeTOImpl<T> extends SimpleNodeTOImpl<T> implements M
      * @param original
      *            the original to set
      */
-    public void setOriginal(SimpleNode<T> original) {
+    public void setOriginal(final SimpleNode<T> original) {
         this.original = original;
     }
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
index 1e977552e8d3941f3be0a1c9281b19162e1be950..ee1dda9bdeda3f31b451aa0051d80ffa98e33120 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java
@@ -24,11 +24,14 @@ import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.NodeModification;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 /**
  * @author michal.rehak
  *
+ * @deprecated Use {@link Builders} instead.
  */
+@Deprecated
 public abstract class NodeFactory {
 
     /**

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 65b7608c166a167d05b6fa1e802db9eb7ef2e07c..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,13 +20,16 @@ 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 final SchemaContext context;

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
index bc05425c9aa46c607297bc996749d7a7141f8d61..f3a0d7b2db38d3873254c2954fa38ce98adc6a1f 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java
@@ -36,6 +36,7 @@ import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.NodeModification;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeUtils;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
@@ -47,7 +48,9 @@ import org.w3c.dom.Element;
 /**
  * @author michal.rehak
  *
+ * @deprecated Use {@link NormalizedNodeUtils} instead.
  */
+@Deprecated
 public abstract class NodeUtils {
     private static final Joiner DOT_JOINER = Joiner.on(".");
     private static final Logger LOG = LoggerFactory.getLogger(NodeUtils.class);

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
index f73ccf96aa1d94c20fac51f346c650a48d846989..bc98ad5f5c5c460512d059c78ebd0008f1f0a681 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java
@@ -10,12 +10,15 @@ package org.opendaylight.yangtools.yang.data.impl;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
  * @author michal.rehak
  * @param <T> type of node value
  *
+ * @deprecated Use one of the {@link NormalizedNode} implementation packages.
  */
+@Deprecated
 public class SimpleNodeModificationTOImpl<T> extends SimpleNodeTOImpl<T> {
     private static final long serialVersionUID = 1L;
 
@@ -25,8 +28,8 @@ public class SimpleNodeModificationTOImpl<T> extends SimpleNodeTOImpl<T> {
      * @param value
      * @param modifyAction
      */
-    public SimpleNodeModificationTOImpl(QName qname, CompositeNode parent,
-            T value, ModifyAction modifyAction) {
+    public SimpleNodeModificationTOImpl(final QName qname, final CompositeNode parent,
+            final T value, final ModifyAction modifyAction) {
         super(qname, parent, value);
         setModificationAction(modifyAction);
     }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
index 68d0cd871aa2042eef16ceff727eca186c82132b..3b6d371782fb589314aac0cf7a61782e08c586ee 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java
@@ -7,24 +7,26 @@
  */
 package org.opendaylight.yangtools.yang.data.impl;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
  * @author michal.rehak
  * @param <T> type of simple node value
  *
+ * @deprecated Use one of the {@link NormalizedNode} implementation packages.
  */
-public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
-        SimpleNode<T>, Serializable {
+@Deprecated
+public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements SimpleNode<T>, Serializable {
 
     private static final long serialVersionUID = 100L;
 
@@ -33,7 +35,7 @@ public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
      * @param parent
      * @param value
      */
-    public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value) {
+    public SimpleNodeTOImpl(final QName qname, final CompositeNode parent, final T value) {
         super(qname, parent, value);
     }
 
@@ -43,7 +45,7 @@ public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
      * @param value
      * @param modifyAction
      */
-    public SimpleNodeTOImpl(QName qname, CompositeNode parent, T value, ModifyAction modifyAction) {
+    public SimpleNodeTOImpl(final QName qname, final CompositeNode parent, final T value, final ModifyAction modifyAction) {
         super(qname, parent, value, modifyAction);
     }
 
@@ -58,9 +60,9 @@ public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
         return super.toString() + ", value = "+getValue();
     }
 
-  // Serialization related
+    // Serialization related
 
-    private void readObject(ObjectInputStream aStream) throws IOException, ClassNotFoundException {
+    private void readObject(final ObjectInputStream aStream) throws IOException, ClassNotFoundException {
         aStream.defaultReadObject();
         QName qName = (QName)aStream.readObject();
         CompositeNode parent = (CompositeNode) aStream.readObject();
@@ -70,7 +72,7 @@ public class SimpleNodeTOImpl<T> extends AbstractNodeTO<T> implements
         init(qName, parent, value, modifyAction);
     }
 
-    private void writeObject(ObjectOutputStream aStream) throws IOException {
+    private void writeObject(final ObjectOutputStream aStream) throws IOException {
         aStream.defaultWriteObject();
         //manually serialize superclass
         aStream.writeObject(getQName());

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/AbstractCompositeNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/AbstractCompositeNodeBuilder.java
index e69bf3ca789dc4e7ad3c94e9cb6f5f88958a3eeb..e22e200b1253d5b8f081d4a203f4afaff3373e9a 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/AbstractCompositeNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/AbstractCompositeNodeBuilder.java
@@ -7,6 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.util;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.collect.Iterables;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -14,14 +18,13 @@ import java.util.Map;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
 
-import com.google.common.collect.Iterables;
-
-import static com.google.common.base.Preconditions.*;
-
-public abstract class AbstractCompositeNodeBuilder<P extends CompositeNode> //
-        extends AbstractNodeBuilder<P, CompositeNodeBuilder<P>> //
-        implements CompositeNodeBuilder<P> {
+/**
+ * @deprecated Use one of the {@link NormalizedNodeContainerBuilder} implementations.
+ */
+@Deprecated
+public abstract class AbstractCompositeNodeBuilder<P extends CompositeNode> extends AbstractNodeBuilder<P, CompositeNodeBuilder<P>> implements CompositeNodeBuilder<P> {
 
     final List<Node<?>> childNodes;
 
@@ -30,30 +33,30 @@ public abstract class AbstractCompositeNodeBuilder<P extends CompositeNode> //
         childNodes = new ArrayList<>();
     }
 
-    public AbstractCompositeNodeBuilder(QName nodeType, Map<QName, String> attributes) {
+    public AbstractCompositeNodeBuilder(final QName nodeType, final Map<QName, String> attributes) {
         super(nodeType, attributes);
         childNodes = new ArrayList<>();
     }
 
-    public AbstractCompositeNodeBuilder(QName nodeType, Iterable<? extends Node<?>> nodes) {
+    public AbstractCompositeNodeBuilder(final QName nodeType, final Iterable<? extends Node<?>> nodes) {
         super(nodeType);
         childNodes = new ArrayList<>();
     }
 
     @Override
-    public AbstractCompositeNodeBuilder<P> add(Node<?> node) {
+    public AbstractCompositeNodeBuilder<P> add(final Node<?> node) {
         childNodes.add(checkNotNull(node, "Node should not be null"));
         return this;
     }
 
     @Override
-    public AbstractCompositeNodeBuilder<P> addAll(Iterable<? extends Node<?>> nodes) {
+    public AbstractCompositeNodeBuilder<P> addAll(final Iterable<? extends Node<?>> nodes) {
         Iterables.addAll(childNodes, checkNotNull(nodes, "Node should not be null"));
         return this;
     }
 
     @Override
-    public CompositeNodeBuilder<P> addLeaf(String leafLocalName, String leafValue) {
+    public CompositeNodeBuilder<P> addLeaf(final String leafLocalName, final String leafValue) {
         return addLeaf(QName.create(getQName(), leafLocalName), leafValue);
     }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/CompositeNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/CompositeNodeBuilder.java
index b16a9cd4bfcd50e811728955d65b29533af3f38c..9a2ed544cb40e3d3e08235a46e03858ea72c35b9 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/CompositeNodeBuilder.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/util/CompositeNodeBuilder.java
@@ -11,6 +11,10 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 
+/*
+ * @deprecated Use one of the NormalizedNode builders instead.
+ */
+@Deprecated
 public interface CompositeNodeBuilder<P extends CompositeNode> extends NodeBuilder<P,CompositeNodeBuilder<P>> {
 
     CompositeNodeBuilder<P> addLeaf(QName leafName,Object leafValue);

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImplTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImplTest.java
index 148e7dd7fdde16ce7e0ad4ae60d750e6c7c6df7b..7e06c8439e404b157288b2297a6ad498a3ae3a97 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImplTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImplTest.java
@@ -7,19 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.data.impl;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang.SerializationUtils;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.Node;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
+@Deprecated
 public class CompositeNodeTOImplTest {
     @Test
     public void testSerialization() throws Exception{

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
index 9c1e6585b635466b4fea9cf82eb32c24e34418b2..0824d8b010b0fe9b0cdbe9059c81d526714155ba 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java
@@ -22,6 +22,7 @@ import org.opendaylight.yangtools.yang.data.api.Node;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class LazyNodeToNodeMapTest {
 
     private LazyNodeToNodeMap lazyN2N;

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
index 9c58b9f92bfe5f813424d85fd9c342af6b5ad458..b0a4573f6aeedbcc214ca8f1e5fa2792288fbe3c 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java
@@ -26,12 +26,11 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author michal.rehak
- *
  */
+@Deprecated
 public class MyNodeBuilder extends BuilderSupport {
 
-    private static final Logger LOG = LoggerFactory
-            .getLogger(MyNodeBuilder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MyNodeBuilder.class);
 
     private URI qnNamespace;
     private final String qnPrefix;
@@ -39,33 +38,33 @@ public class MyNodeBuilder extends BuilderSupport {
 
     private CompositeNode rootNode;
 
-       /**
-        * @param baseQName
-        */
-       private MyNodeBuilder(final QName baseQName) {
-               qnNamespace = baseQName.getNamespace();
-               qnPrefix = baseQName.getPrefix();
-               qnRevision = baseQName.getRevision();
+    /**
+     * @param baseQName
+     */
+    private MyNodeBuilder(final QName baseQName) {
+        qnNamespace = baseQName.getNamespace();
+        qnPrefix = baseQName.getPrefix();
+        qnRevision = baseQName.getRevision();
     }
 
-       /**
-        * @return initialized singleton instance
-        */
-       public static MyNodeBuilder newInstance() {
-       QName qName = null;
-       try {
-                       qName = new QName(
-                       new URI("urn:opendaylight:controller:network"),
-                       new Date(42), "yang-data-impl-groovyTest_", "node");
+    /**
+     * @return initialized singleton instance
+     */
+    public static MyNodeBuilder newInstance() {
+        QName qName = null;
+        try {
+            qName = new QName(
+                    new URI("urn:opendaylight:controller:network"),
+                    new Date(42), "yang-data-impl-groovyTest_", "node");
         } catch (URISyntaxException e) {
-               LOG.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
         return new MyNodeBuilder(qName);
     }
 
     @Override
     protected void setParent(final Object parent, final Object child) {
-       // do nothing
+        // do nothing
         if (child instanceof AbstractNodeTO<?>) {
             ((AbstractNodeTO<?>) child).setParent((CompositeNode) parent);
         } else {
@@ -138,53 +137,53 @@ public class MyNodeBuilder extends BuilderSupport {
     }
 
     private QName createQName(final Object localName) {
-       LOG.debug("qname for: "+localName);
-           return new QName(qnNamespace, qnRevision, qnPrefix, (String) localName);
+        LOG.debug("qname for: "+localName);
+        return new QName(qnNamespace, qnRevision, qnPrefix, (String) localName);
     }
 
-       protected CompositeNode getCurrentNode() {
-           if (getCurrent() != null) {
-               if (getCurrent() instanceof CompositeNode) {
-                   return (CompositeNode) getCurrent();
+    protected CompositeNode getCurrentNode() {
+        if (getCurrent() != null) {
+            if (getCurrent() instanceof CompositeNode) {
+                return (CompositeNode) getCurrent();
 
-               } else {
-                   throw new IllegalAccessError("current node is not of type CompositeNode, but: "
-                       +getCurrent().getClass().getSimpleName());
-               }
-           }
+            } else {
+                throw new IllegalAccessError("current node is not of type CompositeNode, but: "
+                        +getCurrent().getClass().getSimpleName());
+            }
+        }
 
-           return null;
+        return null;
     }
 
-       @Override
-       protected Object postNodeCompletion(final Object parent, final Object node) {
-           Node<?> nodeRevisited = (Node<?>) node;
-           LOG.debug("postNodeCompletion at: \n  "+ nodeRevisited+"\n  "+parent);
-           if (nodeRevisited instanceof MutableCompositeNode) {
-               MutableCompositeNode mutant = (MutableCompositeNode) nodeRevisited;
-               if (mutant.getValue().isEmpty()) {
-                   LOG.error("why is it having empty value? -- " + mutant);
-               }
-               nodeRevisited = NodeFactory.createImmutableCompositeNode(
-                       mutant.getNodeType(), mutant.getParent(), mutant.getValue(), mutant.getModificationAction());
-               NodeUtils.fixChildrenRelation((CompositeNode) nodeRevisited);
-
-               if (parent == null) {
-                   rootNode = (CompositeNode) nodeRevisited;
-               } else {
-                   NodeUtils.fixParentRelation(nodeRevisited);
-                   nodeRevisited.getParent().getValue().remove(mutant);
-               }
-           }
-
-
-           return nodeRevisited;
-       }
-
-       /**
-        * @return tree root
-        */
-       public CompositeNode getRootNode() {
+    @Override
+    protected Object postNodeCompletion(final Object parent, final Object node) {
+        Node<?> nodeRevisited = (Node<?>) node;
+        LOG.debug("postNodeCompletion at: \n  "+ nodeRevisited+"\n  "+parent);
+        if (nodeRevisited instanceof MutableCompositeNode) {
+            MutableCompositeNode mutant = (MutableCompositeNode) nodeRevisited;
+            if (mutant.getValue().isEmpty()) {
+                LOG.error("why is it having empty value? -- " + mutant);
+            }
+            nodeRevisited = NodeFactory.createImmutableCompositeNode(
+                    mutant.getNodeType(), mutant.getParent(), mutant.getValue(), mutant.getModificationAction());
+            NodeUtils.fixChildrenRelation((CompositeNode) nodeRevisited);
+
+            if (parent == null) {
+                rootNode = (CompositeNode) nodeRevisited;
+            } else {
+                NodeUtils.fixParentRelation(nodeRevisited);
+                nodeRevisited.getParent().getValue().remove(mutant);
+            }
+        }
+
+
+        return nodeRevisited;
+    }
+
+    /**
+     * @return tree root
+     */
+    public CompositeNode getRootNode() {
         return rootNode;
     }
 }
\ No newline at end of file

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
index 4cf32cd0a4a7e46fb625deac494c517cefd82659..cafc14c38f1b208dab164aa176efcce49b414872 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java
@@ -30,6 +30,7 @@ import org.w3c.dom.Document;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class NodeFactoryTest {
 
     private QName qName;

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
index 74e9e8ed1b1c918af7d5953d9954b8b647d6fd22..65ec09204be9f30e59aca16ad6705e3712413d5a 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
@@ -37,6 +37,7 @@ import org.junit.Assert;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeUtils;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
@@ -49,7 +50,9 @@ import org.xml.sax.SAXException;
 /**
  * @author michal.rehak
  *
+ * @deprecated Use {@link NormalizedNodeUtils} instead.
  */
+@Deprecated
 public abstract class NodeHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(NodeHelper.class);

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
index 79be9fa96ec63ebc2a4d070dca7d54edc3f45bda..5c1d53bc50460bdddc4493bd9807fa42524e939d 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class NodeModificationBuilderImplTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(NodeModificationBuilderImplTest.class);

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
index eeac30bf99d704e220db41c12a98dda0bb279fdf..6afd46f2dd6c3e7ae7b3f12d8fd1e0a85c245088 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java
@@ -10,10 +10,10 @@ package org.opendaylight.yangtools.yang.data.impl;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.Deque;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -32,6 +32,7 @@ import org.w3c.dom.Document;
  * @author michal.rehak
  *
  */
+@Deprecated
 public class NodeUtilsTest {
 
     private static final Logger LOG = LoggerFactory

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 d8ce08667c288b748db0cce47926099236112bac..d97b2fb4215180af6d2e77cfdffcbda0022e6eaf 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
@@ -16,7 +16,12 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 
+/**
+ * @deprecated Use one of the {@link NormalizedNodeContainer} implementation packages.
+ */
+@Deprecated
 public abstract class AbstractContainerNode extends AbstractNode<List<Node<?>>> implements CompositeNode {
 
     @Override

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
index 72b8bbc8127829158b1cd95db5dc14a28b6643df..35a959e29b8e8a2843b9401078be0eade537e77d 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java
@@ -11,21 +11,28 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.opendaylight.yangtools.yang.data.api.Node;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
+/**
+ * @deprecated Use one of the {@link NormalizedNode} implementation packages.
+ */
+@Deprecated
 public abstract class AbstractNode<T> implements Node<T> {
 
     private final QName nodeName;
     private final CompositeNode parent;
 
-    protected AbstractNode(QName name, CompositeNode parent) {
+    protected AbstractNode(final QName name, final CompositeNode parent) {
         nodeName = name;
         this.parent = parent;
     }
 
+    @Override
     public QName getNodeType() {
         return this.nodeName;
     }
 
+    @Override
     public CompositeNode getParent() {
         return parent;
     }

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
index 42e28f00341a065b614b4cc4fff833adff01f693..c26447374c743295c651dd3f8243cf41e3a6614c 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java
@@ -20,25 +20,30 @@ import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode;
 import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
+/**
+ * @deprecated Use one of the {@link NormalizedNode} implementation packages.
+ */
+@Deprecated
 public final class Nodes {
 
     private Nodes() {
     }
 
-    public static <T> SimpleNode<T> leafNode(QName name, T value) {
+    public static <T> SimpleNode<T> leafNode(final QName name, final T value) {
         return new SimpleNodeTO<T>(name, value, null);
     }
 
-    public static CompositeNode containerNode(QName name, List<Node<?>> children) {
+    public static CompositeNode containerNode(final QName name, final List<Node<?>> children) {
         return containerNode(name, children, null);
     }
 
-    public static CompositeNode containerNode(QName name, List<Node<?>> children, CompositeNode parent) {
+    public static CompositeNode containerNode(final QName name, final List<Node<?>> children, final CompositeNode parent) {
         return new ContainerNodeTO(name, parent, nodeMapFromList(children));
     }
 
-    public static Map<QName, List<Node<?>>> nodeMapFromList(List<Node<?>> children) {
+    public static Map<QName, List<Node<?>>> nodeMapFromList(final List<Node<?>> children) {
         Map<QName, List<Node<?>>> map = new HashMap<QName, List<Node<?>>>();
         for (Node<?> node : children) {
 
@@ -53,16 +58,20 @@ public final class Nodes {
         return map;
     }
 
+    /**
+     * @deprecated Use one of the {@link NormalizedNode} implementation packages.
+     */
+    @Deprecated
     private static class ContainerNodeTO extends AbstractContainerNode {
 
         private final Map<QName, List<Node<?>>> nodeMap;
 
-        public ContainerNodeTO(QName name, Map<QName, List<Node<?>>> nodeMap) {
+        public ContainerNodeTO(final QName name, final Map<QName, List<Node<?>>> nodeMap) {
             super(name);
             this.nodeMap = nodeMap;
         }
 
-        public ContainerNodeTO(QName name, CompositeNode parent, Map<QName, List<Node<?>>> nodeMap) {
+        public ContainerNodeTO(final QName name, final CompositeNode parent, final Map<QName, List<Node<?>>> nodeMap) {
             super(name, parent);
             this.nodeMap = nodeMap;
         }
@@ -75,7 +84,7 @@ public final class Nodes {
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * org.opendaylight.yangtools.yang.data.api.CompositeNode#asMutable()
          */
@@ -91,7 +100,7 @@ public final class Nodes {
         }
 
         @Override
-        public List<Node<?>> setValue(List<Node<?>> value) {
+        public List<Node<?>> setValue(final List<Node<?>> value) {
             return null;
         }
 
@@ -106,32 +115,32 @@ public final class Nodes {
         }
 
         @Override
-        public boolean containsKey(Object key) {
+        public boolean containsKey(final Object key) {
             return nodeMap.containsKey(key);
         }
 
         @Override
-        public boolean containsValue(Object value) {
+        public boolean containsValue(final Object value) {
             return nodeMap.containsValue(value);
         }
 
         @Override
-        public List<Node<?>> get(Object key) {
+        public List<Node<?>> get(final Object key) {
             return nodeMap.get(key);
         }
 
         @Override
-        public List<Node<?>> put(QName key, List<Node<?>> value) {
+        public List<Node<?>> put(final QName key, final List<Node<?>> value) {
             return nodeMap.put(key, value);
         }
 
         @Override
-        public List<Node<?>> remove(Object key) {
+        public List<Node<?>> remove(final Object key) {
             return nodeMap.remove(key);
         }
 
         @Override
-        public void putAll(Map<? extends QName, ? extends List<Node<?>>> m) {
+        public void putAll(final Map<? extends QName, ? extends List<Node<?>>> m) {
             nodeMap.putAll(m);
         }
 
@@ -152,17 +161,21 @@ public final class Nodes {
 
         @Override
         public Set<java.util.Map.Entry<QName, List<Node<?>>>> entrySet() {
-            
+
             return nodeMap.entrySet();
         }
 
     }
 
+    /**
+     * @deprecated Use one of the {@link NormalizedNode} implementation packages.
+     */
+    @Deprecated
     private static class SimpleNodeTO<T> extends AbstractNode<T> implements SimpleNode<T> {
 
         private final T value;
 
-        protected SimpleNodeTO(QName name, T val, CompositeNode parent) {
+        protected SimpleNodeTO(final QName name, final T val, final CompositeNode parent) {
             super(name, parent);
             value = val;
 
@@ -175,7 +188,7 @@ public final class Nodes {
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see org.opendaylight.yangtools.yang.data.api.SimpleNode#asMutable()
          */
         @Override
@@ -183,12 +196,12 @@ public final class Nodes {
             // TODO Auto-generated method stub
             return null;
         }
-        
+
         @Override
-        public T setValue(T value) {
+        public T setValue(final T value) {
             return null;
         }
-        
+
         @Override
         public QName getKey() {
             return getNodeType();