From 7f46d29aac16a602c4679067c24540c1898e184a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 17 May 2023 19:49:06 +0200
Subject: [PATCH] Eliminate rfc8528-data-util

Move the remaining classes to yang-data-util, completing the baseline
integration.

JIRA: YANGTOOLS-1172
Change-Id: I946b41a6ff200576578cce25386646433e2e8a8d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |  5 --
 data/pom.xml                                  |  3 -
 data/rfc8528-data-util/pom.xml                | 62 -------------------
 .../src/main/java/module-info.java            | 28 ---------
 ...stractDynamicMountPointContextFactory.java |  2 +-
 .../AbstractMountPointContextFactory.java     |  2 +-
 .../data/util/ImmutableMountPointContext.java |  4 +-
 docs/pom.xml                                  |  4 --
 features/odl-yangtools-data-api/pom.xml       |  4 --
 9 files changed, 4 insertions(+), 110 deletions(-)
 delete mode 100644 data/rfc8528-data-util/pom.xml
 delete mode 100644 data/rfc8528-data-util/src/main/java/module-info.java
 rename data/{rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/AbstractDynamicMountPointContextFactory.java (98%)
 rename data/{rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/AbstractMountPointContextFactory.java (99%)
 rename data/{rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/ImmutableMountPointContext.java (93%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 73d19ea49a..2154f5ad01 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -254,11 +254,6 @@
                 <version>11.0.0-SNAPSHOT</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8528-data-util</artifactId>
-                <version>11.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>rfc8528-model-api</artifactId>
diff --git a/data/pom.xml b/data/pom.xml
index 3561ea6f20..9d733866f5 100644
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -38,8 +38,5 @@
         <module>yang-data-tree-api</module>
         <module>yang-data-tree-spi</module>
         <module>yang-data-tree-ri</module>
-
-        <!-- RFC8528 (mount-point) metamodel support -->
-        <module>rfc8528-data-util</module>
     </modules>
 </project>
diff --git a/data/rfc8528-data-util/pom.xml b/data/rfc8528-data-util/pom.xml
deleted file mode 100644
index adf5bb7e8f..0000000000
--- a/data/rfc8528-data-util/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2019 PANTHEON.tech, s.r.o. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>11.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
-    </parent>
-
-    <artifactId>rfc8528-data-util</artifactId>
-    <packaging>bundle</packaging>
-    <name>${project.artifactId}</name>
-    <description>RFC8528 data model utilities</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>concepts</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>rfc8528-model-api</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/data/rfc8528-data-util/src/main/java/module-info.java b/data/rfc8528-data-util/src/main/java/module-info.java
deleted file mode 100644
index 7e512cb129..0000000000
--- a/data/rfc8528-data-util/src/main/java/module-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-// 'rfc8528' in the name ends with a digit
-@SuppressWarnings("module")
-module org.opendaylight.yangtools.rfc8528.data.util {
-    exports org.opendaylight.yangtools.rfc8528.data.util;
-
-    requires transitive com.google.common;
-    requires transitive org.opendaylight.yangtools.concepts;
-    requires transitive org.opendaylight.yangtools.yang.data.api;
-    requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.model.spi;
-    requires transitive org.opendaylight.yangtools.yang.parser.api;
-
-    requires org.opendaylight.yangtools.rfc8528.model.api;
-    requires org.opendaylight.yangtools.yang.common;
-    requires org.opendaylight.yangtools.yang.data.spi;
-    requires org.slf4j;
-
-    // Annotations
-    requires static transitive org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
-}
diff --git a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractDynamicMountPointContextFactory.java
similarity index 98%
rename from data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java
rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractDynamicMountPointContextFactory.java
index 260eed6b55..a67cf02e00 100644
--- a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractDynamicMountPointContextFactory.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractDynamicMountPointContextFactory.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.rfc8528.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
 import com.google.common.annotations.Beta;
 import java.io.IOException;
diff --git a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointContextFactory.java
similarity index 99%
rename from data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java
rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointContextFactory.java
index 3995e68f65..de3a1a821f 100644
--- a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/AbstractMountPointContextFactory.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointContextFactory.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.rfc8528.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
diff --git a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMountPointContext.java
similarity index 93%
rename from data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java
rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMountPointContext.java
index c8d593428c..9891326b17 100644
--- a/data/rfc8528-data-util/src/main/java/org/opendaylight/yangtools/rfc8528/data/util/ImmutableMountPointContext.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMountPointContext.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.rfc8528.data.util;
+package org.opendaylight.yangtools.yang.data.util;
 
 import static java.util.Objects.requireNonNull;
 
@@ -15,10 +15,10 @@ import com.google.common.collect.Maps;
 import java.util.Optional;
 import java.util.function.Function;
 import org.opendaylight.yangtools.concepts.Immutable;
-import org.opendaylight.yangtools.rfc8528.data.util.AbstractMountPointContextFactory.MountPointDefinition;
 import org.opendaylight.yangtools.rfc8528.model.api.MountPointLabel;
 import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext;
 import org.opendaylight.yangtools.yang.data.api.schema.MountPointContextFactory;
+import org.opendaylight.yangtools.yang.data.util.AbstractMountPointContextFactory.MountPointDefinition;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.spi.AbstractEffectiveModelContextProvider;
 
diff --git a/docs/pom.xml b/docs/pom.xml
index b6a5d4caf5..3076a9b5c5 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -186,10 +186,6 @@
             <artifactId>rfc8040-parser-support</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>rfc8528-data-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc8528-model-api</artifactId>
diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 7e61b0316f..9dd4d4e9c0 100644
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -62,9 +62,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>rfc8528-data-util</artifactId>
-        </dependency>
     </dependencies>
 </project>
-- 
2.36.6