Hide CompositeNodeDataWithSchema.addChild()

These methods have been deprecated and are no longer used from
the outside world, hide them.

Change-Id: I5d2281d1e287363fcd2751bcde79fb8c367cdb2c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
index 8df6b03e380cb402a6809162688ae932dc5729f9..de6654b7baf98a6376d66211e4d97261f2dd4e46 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
@@ -37,6 +37,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre
 import org.opendaylight.yangtools.yang.data.util.AbstractNodeDataWithSchema;
 import org.opendaylight.yangtools.yang.data.util.AnyXmlNodeDataWithSchema;
 import org.opendaylight.yangtools.yang.data.util.CompositeNodeDataWithSchema;
+import org.opendaylight.yangtools.yang.data.util.CompositeNodeDataWithSchema.ChildReusePolicy;
 import org.opendaylight.yangtools.yang.data.util.LeafListNodeDataWithSchema;
 import org.opendaylight.yangtools.yang.data.util.LeafNodeDataWithSchema;
 import org.opendaylight.yangtools.yang.data.util.ListNodeDataWithSchema;
@@ -306,7 +307,7 @@ public final class JsonParserStream implements Closeable, Flushable {
 
 
                     final AbstractNodeDataWithSchema<?> newChild = ((CompositeNodeDataWithSchema<?>) parent)
-                            .addChild(childDataSchemaNodes);
+                            .addChild(childDataSchemaNodes, ChildReusePolicy.NOOP);
                     if (newChild instanceof AnyXmlNodeDataWithSchema) {
                         readAnyXmlValue(in, (AnyXmlNodeDataWithSchema) newChild, jsonElementName);
                     } else {

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
index 2735afef023e7611e3c5105c977a2cdeb0f96719..8db7ecd89f09e12db9c4ce95bafdfdd7e615a749 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java
@@ -117,17 +117,12 @@ public class CompositeNodeDataWithSchema<T extends DataSchemaNode> extends Abstr
         super(schema);
     }
 
-    @Deprecated
-    public void addChild(final AbstractNodeDataWithSchema<?> newChild) {
+    void addChild(final AbstractNodeDataWithSchema<?> newChild) {
         children.add(newChild);
     }
 
-    @Deprecated
-    public AbstractNodeDataWithSchema<?> addChild(final Deque<DataSchemaNode> schemas) {
-        return addChild(schemas, ChildReusePolicy.NOOP);
-    }
-
-    public AbstractNodeDataWithSchema<?> addChild(final Deque<DataSchemaNode> schemas, final ChildReusePolicy policy) {
+    public final AbstractNodeDataWithSchema<?> addChild(final Deque<DataSchemaNode> schemas,
+            final ChildReusePolicy policy) {
         checkArgument(!schemas.isEmpty(), "Expecting at least one schema");
 
         // Pop the first node...

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java
index 7e584408dfae3dc0fc88843012a00bf546764aa1..4c1605a0e84dd1cacdba1a942af6a8a930ce7512 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java
@@ -42,7 +42,7 @@ public abstract class ListEntryNodeDataWithSchema extends AbstractMountPointData
         }
 
         @Override
-        public void addChild(final AbstractNodeDataWithSchema<?> newChild) {
+        void addChild(final AbstractNodeDataWithSchema<?> newChild) {
             final DataSchemaNode childSchema = newChild.getSchema();
             if (childSchema instanceof LeafSchemaNode) {
                 final QName childName = childSchema.getQName();
@@ -87,9 +87,7 @@ public abstract class ListEntryNodeDataWithSchema extends AbstractMountPointData
         super(schema);
     }
 
-    // FIXME: 6.0.0: hide this method
-    @Deprecated
-    public static @NonNull ListEntryNodeDataWithSchema forSchema(final ListSchemaNode schema) {
+    static @NonNull ListEntryNodeDataWithSchema forSchema(final ListSchemaNode schema) {
         final List<QName> keyDef = schema.getKeyDefinition();
         return keyDef.isEmpty() ? new Unkeyed(schema) :  new Keyed(schema, keyDef);
     }