Move MountPointChild to rfc8528-data-api

This concept encapsulates a potential NormalizedNode and is needed
for mount point schema resolution. Move it to data-api.

Change-Id: I26917007488070dbb664eaaf82d11eeae62ae425
JIRA: YANGTOOLS-1007
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointChild.java b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
similarity index 91%
rename from yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointChild.java
rename to yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
index 6bee66f0a9a790b509ec10f086e13b90a5392b45..75c8ca2d10edc19382d25d5b7ff7ba0bee2bce41 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointChild.java
+++ b/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.data.util;
+package org.opendaylight.yangtools.rfc8528.data.api;
 
 import com.google.common.annotations.Beta;
 import java.io.IOException;
@@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
- * A raw child of {@link MountPointData}. This is similar in functionality to {@link NormalizableAnydata}, but
+ * An unresolved child within a mount point. This is similar in functionality to {@link NormalizableAnydata}, but
  * rather than normalizing, the data is fed into a combination of a SchemaContext and NormalizedNodeStreamWriter.
  */
 @Beta

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractMountPointChild.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractMountPointChild.java
index 56fb0f755e550fec06bebd2889278ba61f96f8c0..45aedc9f26cb45b2cf912b866e8cfaac90e167dc 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractMountPointChild.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractMountPointChild.java
@@ -9,9 +9,9 @@ package org.opendaylight.yangtools.yang.data.impl.schema;
 
 import com.google.common.annotations.Beta;
 import java.io.IOException;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointChild;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.util.MountPointChild;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
index f60a23ba46cf403e7de2793ab86a3df1c3cf3900..1c20cfe8720b8c4ba48278a1294121b1dd9c441c 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/MountPointData.java
@@ -20,6 +20,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.AbstractIdentifiable;
+import org.opendaylight.yangtools.rfc8528.data.api.MountPointChild;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointIdentifier;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointNodeFactory;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointNodeFactoryResolver;