From a06736657fb2d9bdc23951c07b0534b9caccd657 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 1 Mar 2023 16:24:44 +0100 Subject: [PATCH] Integrate rfc7952-data-util into yang-data-util Metadata is very much part of what YANG models, there is no need to keep it in a separate package. This also allows for better integration. JIRA: YANGTOOLS-1489 Change-Id: Ie3440b85621e905bec7bd24573ce7950ce35f790 Signed-off-by: Robert Varga --- artifacts/pom.xml | 5 -- data/pom.xml | 3 -- data/rfc7952-data-util/pom.xml | 50 ------------------- .../src/main/java/module-info.java | 22 -------- data/yang-data-impl/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../schema/AbstractNormalizableAnydata.java | 2 +- ...bleMetadataNormalizedNodeStreamWriter.java | 4 +- .../ImmutableMetadataNormalizedAnydata.java | 3 +- .../util/ImmutableNormalizedMetadata.java | 2 +- ...mutableNormalizedMetadataStreamWriter.java | 4 +- .../data/util/NormalizedMetadataWriter.java | 2 +- ...izedNodeStreamWriterMetadataDecorator.java | 2 +- features/odl-yangtools-data-api/pom.xml | 4 -- 14 files changed, 9 insertions(+), 99 deletions(-) delete mode 100644 data/rfc7952-data-util/pom.xml delete mode 100644 data/rfc7952-data-util/src/main/java/module-info.java rename data/{rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/ImmutableMetadataNormalizedAnydata.java (94%) rename data/{rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/ImmutableNormalizedMetadata.java (98%) rename data/{rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/ImmutableNormalizedMetadataStreamWriter.java (94%) rename data/{rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/NormalizedMetadataWriter.java (99%) rename data/{rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952 => yang-data-util/src/main/java/org/opendaylight/yangtools/yang}/data/util/NormalizedNodeStreamWriterMetadataDecorator.java (99%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 7cb41d5022..37fe3a24cf 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -232,11 +232,6 @@ 11.0.0-SNAPSHOT - - org.opendaylight.yangtools - rfc7952-data-util - 11.0.0-SNAPSHOT - org.opendaylight.yangtools rfc7952-model-api diff --git a/data/pom.xml b/data/pom.xml index 7546564d83..fdf24defcd 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -39,9 +39,6 @@ yang-data-tree-spi yang-data-tree-ri - - rfc7952-data-util - rfc8528-data-api rfc8528-data-util diff --git a/data/rfc7952-data-util/pom.xml b/data/rfc7952-data-util/pom.xml deleted file mode 100644 index cbd0bb3979..0000000000 --- a/data/rfc7952-data-util/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.yangtools - bundle-parent - 11.0.0-SNAPSHOT - ../../bundle-parent - - - rfc7952-data-util - bundle - ${project.artifactId} - RFC7952 data model utilities - - - - com.google.guava - guava - - - org.opendaylight.yangtools - concepts - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-model-api - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-data-util - - - diff --git a/data/rfc7952-data-util/src/main/java/module-info.java b/data/rfc7952-data-util/src/main/java/module-info.java deleted file mode 100644 index 2945c51251..0000000000 --- a/data/rfc7952-data-util/src/main/java/module-info.java +++ /dev/null @@ -1,22 +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 - */ -// 'rfc7952' in the name ends with a digit -@SuppressWarnings("module") -module org.opendaylight.yangtools.rfc7952.data.util { - exports org.opendaylight.yangtools.rfc7952.data.util; - - requires transitive com.google.common; - requires transitive org.opendaylight.yangtools.concepts; - requires transitive org.opendaylight.yangtools.yang.common; - requires transitive org.opendaylight.yangtools.yang.data.api; - requires transitive org.opendaylight.yangtools.yang.data.util; - requires transitive org.opendaylight.yangtools.yang.model.api; - - // Annotations - requires static transitive org.eclipse.jdt.annotation; -} diff --git a/data/yang-data-impl/pom.xml b/data/yang-data-impl/pom.xml index a283ac7ecf..4a5c39721d 100644 --- a/data/yang-data-impl/pom.xml +++ b/data/yang-data-impl/pom.xml @@ -76,10 +76,6 @@ org.opendaylight.yangtools yang-model-util - - org.opendaylight.yangtools - rfc7952-data-util - org.opendaylight.yangtools rfc8528-data-api diff --git a/data/yang-data-impl/src/main/java/module-info.java b/data/yang-data-impl/src/main/java/module-info.java index e2af384da6..99d150471f 100644 --- a/data/yang-data-impl/src/main/java/module-info.java +++ b/data/yang-data-impl/src/main/java/module-info.java @@ -22,7 +22,6 @@ module org.opendaylight.yangtools.yang.data.impl { requires transitive org.opendaylight.yangtools.yang.data.util; requires transitive org.opendaylight.yangtools.yang.model.api; requires transitive org.opendaylight.yangtools.yang.model.spi; - requires transitive org.opendaylight.yangtools.rfc7952.data.util; requires transitive org.opendaylight.yangtools.rfc8528.data.api; requires org.opendaylight.yangtools.rfc8528.data.util; diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java index 8bcd593cd0..9ff22eac7e 100644 --- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java +++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/AbstractNormalizableAnydata.java @@ -12,10 +12,10 @@ import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import java.io.IOException; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.yangtools.rfc7952.data.util.ImmutableMetadataNormalizedAnydata; import org.opendaylight.yangtools.yang.data.api.schema.AnydataNormalizationException; import org.opendaylight.yangtools.yang.data.api.schema.NormalizableAnydata; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.util.ImmutableMetadataNormalizedAnydata; import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedAnydata; import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference; diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMetadataNormalizedNodeStreamWriter.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMetadataNormalizedNodeStreamWriter.java index 36aba0100f..5b66570ede 100644 --- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMetadataNormalizedNodeStreamWriter.java +++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableMetadataNormalizedNodeStreamWriter.java @@ -18,14 +18,14 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.rfc7952.data.util.ImmutableNormalizedMetadata; -import org.opendaylight.yangtools.rfc7952.data.util.ImmutableNormalizedMetadata.Builder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedMetadata; import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriterExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; +import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMetadata; +import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMetadata.Builder; /** * A {@link NormalizedMetadata}-aware {@link ImmutableMetadataNormalizedNodeStreamWriter}. It advertizes the diff --git a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMetadataNormalizedAnydata.java similarity index 94% rename from data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMetadataNormalizedAnydata.java index f979176776..0e46f08162 100644 --- a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableMetadataNormalizedAnydata.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableMetadataNormalizedAnydata.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.rfc7952.data.util; +package org.opendaylight.yangtools.yang.data.util; import static java.util.Objects.requireNonNull; @@ -17,7 +17,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MetadataNormalizedAnydata import org.opendaylight.yangtools.yang.data.api.schema.NormalizedMetadata; 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.ImmutableNormalizedAnydata; import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference; @Beta diff --git a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadata.java similarity index 98% rename from data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadata.java index 2ca49dd042..60c050fc0c 100644 --- a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadata.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadata.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.rfc7952.data.util; +package org.opendaylight.yangtools.yang.data.util; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; diff --git a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadataStreamWriter.java similarity index 94% rename from data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadataStreamWriter.java index a3f2cdc59b..d811023169 100644 --- a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/ImmutableNormalizedMetadataStreamWriter.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ImmutableNormalizedMetadataStreamWriter.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.rfc7952.data.util; +package org.opendaylight.yangtools.yang.data.util; import static com.google.common.base.Preconditions.checkState; @@ -15,11 +15,11 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.Optional; -import org.opendaylight.yangtools.rfc7952.data.util.ImmutableNormalizedMetadata.Builder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedMetadata; import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; +import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedMetadata.Builder; /** * A simple {@link StreamWriterMetadataExtension} implementation, which takes care of building diff --git a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedMetadataWriter.java similarity index 99% rename from data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedMetadataWriter.java index cdcc6758db..f9e52179a4 100644 --- a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedMetadataWriter.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.rfc7952.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/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterMetadataDecorator.java similarity index 99% rename from data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java rename to data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterMetadataDecorator.java index c2ad649d15..2ed27aa962 100644 --- a/data/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedNodeStreamWriterMetadataDecorator.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterMetadataDecorator.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.rfc7952.data.util; +package org.opendaylight.yangtools.yang.data.util; import static java.util.Objects.requireNonNull; diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 58cdc52a9e..73863d28ec 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -62,10 +62,6 @@ org.opendaylight.yangtools yang-data-util - - org.opendaylight.yangtools - rfc7952-data-util - org.opendaylight.yangtools rfc8528-data-api -- 2.36.6