From d3ec7354be57c3020fd02229cdb4fa6db76d557a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 25 Apr 2021 17:15:39 +0200
Subject: [PATCH] Move data extensions to data/

A few artifacts were left out during initial population, move tehm now.

JIRA: YANGTOOLS-1145
Change-Id: Ia6c0455f33b5e841985d7fb078eec9e1aa8ac5c5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 data/pom.xml                                              | 8 ++++++++
 {yang => data}/rfc7952-data-api/pom.xml                   | 0
 .../rfc7952-data-api/src/main/java/module-info.java       | 0
 .../rfc7952/data/api/MetadataNormalizedAnydata.java       | 0
 .../yangtools/rfc7952/data/api/NormalizedMetadata.java    | 0
 .../rfc7952/data/api/StreamWriterMetadataExtension.java   | 0
 {yang => data}/rfc7952-data-util/pom.xml                  | 0
 .../rfc7952-data-util/src/main/java/module-info.java      | 0
 .../data/util/ImmutableMetadataNormalizedAnydata.java     | 0
 .../rfc7952/data/util/ImmutableNormalizedMetadata.java    | 0
 .../util/ImmutableNormalizedMetadataStreamWriter.java     | 0
 .../rfc7952/data/util/NormalizedMetadataWriter.java       | 0
 .../util/NormalizedNodeStreamWriterMetadataDecorator.java | 0
 {yang => data}/rfc8528-data-api/pom.xml                   | 0
 .../rfc8528-data-api/src/main/java/module-info.java       | 0
 .../opendaylight/yangtools/rfc8528/data/api/MPIv1.java    | 0
 .../yangtools/rfc8528/data/api/MountPointChild.java       | 0
 .../yangtools/rfc8528/data/api/MountPointContext.java     | 0
 .../rfc8528/data/api/MountPointContextFactory.java        | 0
 .../yangtools/rfc8528/data/api/MountPointIdentifier.java  | 0
 .../yangtools/rfc8528/data/api/MountPointNode.java        | 0
 .../rfc8528/data/api/StreamWriterMountPointExtension.java | 0
 .../yangtools/rfc8528/data/api/YangLibraryConstants.java  | 0
 {yang => data}/rfc8528-data-util/pom.xml                  | 0
 .../rfc8528-data-util/src/main/java/module-info.java      | 0
 .../util/AbstractDynamicMountPointContextFactory.java     | 0
 .../data/util/AbstractMountPointContextFactory.java       | 0
 .../rfc8528/data/util/EmptyMountPointContext.java         | 0
 .../rfc8528/data/util/ImmutableMountPointContext.java     | 0
 .../rfc8528/data/util/ImmutableMountPointNode.java        | 0
 .../rfc8528/data/util/MountPointNormalizedNodeWriter.java | 0
 yang/pom.xml                                              | 8 --------
 32 files changed, 8 insertions(+), 8 deletions(-)
 rename {yang => data}/rfc7952-data-api/pom.xml (100%)
 rename {yang => data}/rfc7952-data-api/src/main/java/module-info.java (100%)
 rename {yang => data}/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java (100%)
 rename {yang => data}/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java (100%)
 rename {yang => data}/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java (100%)
 rename {yang => data}/rfc7952-data-util/pom.xml (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/module-info.java (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java (100%)
 rename {yang => data}/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java (100%)
 rename {yang => data}/rfc8528-data-api/pom.xml (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/module-info.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MPIv1.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContextFactory.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointIdentifier.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/StreamWriterMountPointExtension.java (100%)
 rename {yang => data}/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/YangLibraryConstants.java (100%)
 rename {yang => data}/rfc8528-data-util/pom.xml (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/module-info.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/EmptyMountPointContext.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointNode.java (100%)
 rename {yang => data}/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java (100%)

diff --git a/data/pom.xml b/data/pom.xml
index 690c74d2e2..d77a078a4b 100644
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -33,5 +33,13 @@
         <module>yang-data-spi</module>
         <module>yang-data-transform</module>
         <module>yang-data-util</module>
+
+        <!-- Metadata (annotation) metamodel support -->
+        <module>rfc7952-data-api</module>
+        <module>rfc7952-data-util</module>
+
+        <!-- RFC8528 (mount-point) metamodel support -->
+        <module>rfc8528-data-api</module>
+        <module>rfc8528-data-util</module>
     </modules>
 </project>
diff --git a/yang/rfc7952-data-api/pom.xml b/data/rfc7952-data-api/pom.xml
similarity index 100%
rename from yang/rfc7952-data-api/pom.xml
rename to data/rfc7952-data-api/pom.xml
diff --git a/yang/rfc7952-data-api/src/main/java/module-info.java b/data/rfc7952-data-api/src/main/java/module-info.java
similarity index 100%
rename from yang/rfc7952-data-api/src/main/java/module-info.java
rename to data/rfc7952-data-api/src/main/java/module-info.java
diff --git a/yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java b/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java
similarity index 100%
rename from yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java
rename to data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java
diff --git a/yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java b/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java
similarity index 100%
rename from yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java
rename to data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java
diff --git a/yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java b/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java
similarity index 100%
rename from yang/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java
rename to data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java
diff --git a/yang/rfc7952-data-util/pom.xml b/data/rfc7952-data-util/pom.xml
similarity index 100%
rename from yang/rfc7952-data-util/pom.xml
rename to data/rfc7952-data-util/pom.xml
diff --git a/yang/rfc7952-data-util/src/main/java/module-info.java b/data/rfc7952-data-util/src/main/java/module-info.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/module-info.java
rename to data/rfc7952-data-util/src/main/java/module-info.java
diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java b/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java
rename to data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java
diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java b/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java
rename to data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java
diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java b/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java
rename to data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java
diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java b/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java
rename to data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java
diff --git a/yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java b/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java
similarity index 100%
rename from yang/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java
rename to data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java
diff --git a/yang/rfc8528-data-api/pom.xml b/data/rfc8528-data-api/pom.xml
similarity index 100%
rename from yang/rfc8528-data-api/pom.xml
rename to data/rfc8528-data-api/pom.xml
diff --git a/yang/rfc8528-data-api/src/main/java/module-info.java b/data/rfc8528-data-api/src/main/java/module-info.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/module-info.java
rename to data/rfc8528-data-api/src/main/java/module-info.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MPIv1.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MPIv1.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MPIv1.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MPIv1.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointChild.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContext.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContextFactory.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContextFactory.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContextFactory.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointContextFactory.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointIdentifier.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointIdentifier.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointIdentifier.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointIdentifier.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/MountPointNode.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/StreamWriterMountPointExtension.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/StreamWriterMountPointExtension.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/StreamWriterMountPointExtension.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/StreamWriterMountPointExtension.java
diff --git a/yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/YangLibraryConstants.java b/data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/YangLibraryConstants.java
similarity index 100%
rename from yang/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/YangLibraryConstants.java
rename to data/rfc8528-data-api/src/main/java/org/opendaylight/yangtools/rfc8528/data/api/YangLibraryConstants.java
diff --git a/yang/rfc8528-data-util/pom.xml b/data/rfc8528-data-util/pom.xml
similarity index 100%
rename from yang/rfc8528-data-util/pom.xml
rename to data/rfc8528-data-util/pom.xml
diff --git a/yang/rfc8528-data-util/src/main/java/module-info.java b/data/rfc8528-data-util/src/main/java/module-info.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/module-info.java
rename to data/rfc8528-data-util/src/main/java/module-info.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/EmptyMountPointContext.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/EmptyMountPointContext.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/EmptyMountPointContext.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/EmptyMountPointContext.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointNode.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointNode.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointNode.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointNode.java
diff --git a/yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java b/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
similarity index 100%
rename from yang/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
rename to data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/MountPointNormalizedNodeWriter.java
diff --git a/yang/pom.xml b/yang/pom.xml
index 9bd4aedafd..29b5c7cdc8 100644
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -40,13 +40,5 @@
         <module>yang-repo-api</module>
         <module>yang-repo-spi</module>
         <module>yang-repo-fs</module>
-
-        <!-- Metadata (annotation) metamodel support -->
-        <module>rfc7952-data-api</module>
-        <module>rfc7952-data-util</module>
-
-        <!-- RFC8528 (mount-point) metamodel support -->
-        <module>rfc8528-data-api</module>
-        <module>rfc8528-data-util</module>
     </modules>
 </project>
-- 
2.36.6