From 22607565dbc6d2dfb0c53b5db368d5944f4bde94 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 19 Feb 2023 11:54:47 +0100 Subject: [PATCH] Integrate rfc7952-data-api into yang-data-api Having a separate component is not really useful and we do want to provide a unified model for data/metadata and mountpoints. This takes the first step of integrating the API-level interfaces. JIRA: YANGTOOLS-1489 Change-Id: I49952adf3ae2a26f09ac3a34e8406ca96d8c23f1 Signed-off-by: Robert Varga --- artifacts/pom.xml | 5 --- .../src/main/java/module-info.java | 1 - codec/yang-data-codec-xml/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../XMLStreamNormalizedNodeStreamWriter.java | 2 +- data/pom.xml | 1 - data/rfc7952-data-api/pom.xml | 42 ------------------- .../src/main/java/module-info.java | 20 --------- data/rfc7952-data-util/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../ImmutableMetadataNormalizedAnydata.java | 4 +- .../util/ImmutableNormalizedMetadata.java | 2 +- ...mutableNormalizedMetadataStreamWriter.java | 4 +- .../data/util/NormalizedMetadataWriter.java | 4 +- ...izedNodeStreamWriterMetadataDecorator.java | 4 +- .../schema}/MetadataNormalizedAnydata.java | 3 +- .../data/api/schema}/NormalizedMetadata.java | 6 +-- .../StreamWriterMetadataExtension.java | 4 +- data/yang-data-impl/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - ...bleMetadataNormalizedNodeStreamWriter.java | 4 +- .../schema/NormalizedNodeMetadataResult.java | 2 +- data/yang-data-util/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../AbstractMountPointDataWithSchema.java | 2 +- .../data/util/AbstractNodeDataWithSchema.java | 2 +- .../data/util/AnyXmlNodeDataWithSchema.java | 2 +- .../data/util/AnydataNodeDataWithSchema.java | 2 +- .../data/util/ChoiceNodeDataWithSchema.java | 2 +- .../util/CompositeNodeDataWithSchema.java | 2 +- .../util/ContainerNodeDataWithSchema.java | 2 +- .../util/LeafListEntryNodeDataWithSchema.java | 2 +- .../data/util/LeafListNodeDataWithSchema.java | 2 +- .../data/util/LeafNodeDataWithSchema.java | 2 +- .../util/ListEntryNodeDataWithSchema.java | 2 +- .../data/util/ListNodeDataWithSchema.java | 2 +- features/odl-yangtools-data-api/pom.xml | 4 -- 37 files changed, 28 insertions(+), 128 deletions(-) delete mode 100644 data/rfc7952-data-api/pom.xml delete mode 100644 data/rfc7952-data-api/src/main/java/module-info.java rename data/{rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api => yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema}/MetadataNormalizedAnydata.java (83%) rename data/{rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api => yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema}/NormalizedMetadata.java (86%) rename data/{rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api => yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream}/StreamWriterMetadataExtension.java (90%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index b4d15656c5..7cb41d5022 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -232,11 +232,6 @@ 11.0.0-SNAPSHOT - - org.opendaylight.yangtools - rfc7952-data-api - 11.0.0-SNAPSHOT - org.opendaylight.yangtools rfc7952-data-util diff --git a/codec/yang-data-codec-gson/src/main/java/module-info.java b/codec/yang-data-codec-gson/src/main/java/module-info.java index 1352b35b23..3d3da91d0c 100644 --- a/codec/yang-data-codec-gson/src/main/java/module-info.java +++ b/codec/yang-data-codec-gson/src/main/java/module-info.java @@ -10,7 +10,6 @@ module org.opendaylight.yangtools.yang.data.codec.gson { requires transitive com.google.gson; requires transitive org.opendaylight.yangtools.yang.data.api; - requires transitive org.opendaylight.yangtools.rfc7952.data.api; requires transitive org.opendaylight.yangtools.rfc8528.data.api; requires com.google.common; diff --git a/codec/yang-data-codec-xml/pom.xml b/codec/yang-data-codec-xml/pom.xml index 1f57d14e03..a1977bfe3b 100644 --- a/codec/yang-data-codec-xml/pom.xml +++ b/codec/yang-data-codec-xml/pom.xml @@ -30,10 +30,6 @@ org.opendaylight.yangtools yang-data-api - - org.opendaylight.yangtools - rfc7952-data-api - org.opendaylight.yangtools yang-data-impl diff --git a/codec/yang-data-codec-xml/src/main/java/module-info.java b/codec/yang-data-codec-xml/src/main/java/module-info.java index 4ed5b34809..50f7e74c2e 100644 --- a/codec/yang-data-codec-xml/src/main/java/module-info.java +++ b/codec/yang-data-codec-xml/src/main/java/module-info.java @@ -11,7 +11,6 @@ module org.opendaylight.yangtools.yang.data.codec.xml { requires transitive org.opendaylight.yangtools.yang.data.api; requires transitive org.opendaylight.yangtools.yang.data.util; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.rfc7952.data.api; requires transitive org.opendaylight.yangtools.rfc8528.data.api; requires java.xml; diff --git a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index aa4c5d1a50..d8197b1092 100644 --- a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -21,7 +21,6 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -31,6 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.NormalizedAnydata; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; 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.NormalizedNodeStreamWriterStack; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference; diff --git a/data/pom.xml b/data/pom.xml index 97d06399c6..7546564d83 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -40,7 +40,6 @@ yang-data-tree-ri - rfc7952-data-api rfc7952-data-util diff --git a/data/rfc7952-data-api/pom.xml b/data/rfc7952-data-api/pom.xml deleted file mode 100644 index 4ee2984473..0000000000 --- a/data/rfc7952-data-api/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.yangtools - bundle-parent - 11.0.0-SNAPSHOT - ../../bundle-parent - - - rfc7952-data-api - bundle - ${project.artifactId} - RFC7952 data model extensions - - - - com.google.guava - guava - - - org.opendaylight.yangtools - concepts - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-data-api - - - diff --git a/data/rfc7952-data-api/src/main/java/module-info.java b/data/rfc7952-data-api/src/main/java/module-info.java deleted file mode 100644 index ee30803af7..0000000000 --- a/data/rfc7952-data-api/src/main/java/module-info.java +++ /dev/null @@ -1,20 +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.api { - exports org.opendaylight.yangtools.rfc7952.data.api; - - requires transitive org.opendaylight.yangtools.concepts; - requires transitive org.opendaylight.yangtools.yang.common; - requires transitive org.opendaylight.yangtools.yang.data.api; - requires com.google.common; - - // Annotations - requires static transitive org.eclipse.jdt.annotation; -} diff --git a/data/rfc7952-data-util/pom.xml b/data/rfc7952-data-util/pom.xml index 6f8d48cef5..cbd0bb3979 100644 --- a/data/rfc7952-data-util/pom.xml +++ b/data/rfc7952-data-util/pom.xml @@ -46,9 +46,5 @@ org.opendaylight.yangtools yang-data-util - - org.opendaylight.yangtools - rfc7952-data-api - diff --git a/data/rfc7952-data-util/src/main/java/module-info.java b/data/rfc7952-data-util/src/main/java/module-info.java index dc31a1d691..2945c51251 100644 --- a/data/rfc7952-data-util/src/main/java/module-info.java +++ b/data/rfc7952-data-util/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc7952.data.util { requires transitive com.google.common; requires transitive org.opendaylight.yangtools.concepts; - requires transitive org.opendaylight.yangtools.rfc7952.data.api; requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.data.api; requires transitive org.opendaylight.yangtools.yang.data.util; diff --git a/data/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 index 6d6e41e065..f979176776 100644 --- a/data/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 @@ -13,8 +13,8 @@ import com.google.common.annotations.Beta; import java.io.IOException; import java.util.Optional; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.yangtools.rfc7952.data.api.MetadataNormalizedAnydata; -import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadata; +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; diff --git a/data/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 index 60427d8294..2ca49dd042 100644 --- a/data/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 @@ -18,9 +18,9 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.AbstractSimpleIdentifiable; import org.opendaylight.yangtools.concepts.Mutable; -import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadata; 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; /** * Immutable implementation of {@link NormalizedMetadata}. diff --git a/data/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 index 2d9c7965e6..a3f2cdc59b 100644 --- a/data/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 @@ -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.api.NormalizedMetadata; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; 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; /** * 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/rfc7952-data-util/src/main/java/org/opendaylight/yangtools/rfc7952/data/util/NormalizedMetadataWriter.java index 80ae0d6b12..cdcc6758db 100644 --- a/data/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 @@ -15,12 +15,12 @@ import java.io.Closeable; import java.io.Flushable; import java.io.IOException; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadata; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; 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.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; /** * A utility class to attach {@link NormalizedMetadata} into a NormalizedNode stream, such as the one produced by diff --git a/data/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 index cf8b61fd68..c2ad649d15 100644 --- a/data/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 @@ -14,16 +14,16 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; import java.util.Map; -import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadata; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; 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.ForwardingNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; /** * A simple decorator on top of a NormalizedNodeStreamWriter, which attaches NormalizedMetadata to the event stream, diff --git a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MetadataNormalizedAnydata.java similarity index 83% rename from data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java rename to data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MetadataNormalizedAnydata.java index 8d476d93c3..cf26fb0ef0 100644 --- a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/MetadataNormalizedAnydata.java +++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/MetadataNormalizedAnydata.java @@ -5,11 +5,10 @@ * 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.api; +package org.opendaylight.yangtools.yang.data.api.schema; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedAnydata; /** * A piece of {@link NormalizedAnydata} with a corresponding piece of {@link NormalizedMetadata}. diff --git a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedMetadata.java similarity index 86% rename from data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java rename to data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedMetadata.java index 988436d592..07d263897e 100644 --- a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/NormalizedMetadata.java +++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedMetadata.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.api; +package org.opendaylight.yangtools.yang.data.api.schema; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; @@ -15,10 +15,6 @@ import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; /** * RFC7952 metadata counterpart to a {@link NormalizedNode}. This interface is meant to be used as a companion to diff --git a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/StreamWriterMetadataExtension.java similarity index 90% rename from data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java rename to data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/StreamWriterMetadataExtension.java index 48a495cba8..104bd1e17e 100644 --- a/data/rfc7952-data-api/src/main/java/org/opendaylight/yangtools/rfc7952/data/api/StreamWriterMetadataExtension.java +++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/StreamWriterMetadataExtension.java @@ -5,14 +5,12 @@ * 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.api; +package org.opendaylight.yangtools.yang.data.api.schema.stream; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; import java.io.IOException; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriterExtension; /** * Extension to the NormalizedNodeStreamWriter with metadata support. Semantically this extends the event model of diff --git a/data/yang-data-impl/pom.xml b/data/yang-data-impl/pom.xml index 3f1cd75dcf..a283ac7ecf 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-api - org.opendaylight.yangtools rfc7952-data-util 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 8bf4273b55..e2af384da6 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.api; requires transitive org.opendaylight.yangtools.rfc7952.data.util; requires transitive org.opendaylight.yangtools.rfc8528.data.api; 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 b117d86da8..36aba0100f 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.api.NormalizedMetadata; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; 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; /** * A {@link NormalizedMetadata}-aware {@link ImmutableMetadataNormalizedNodeStreamWriter}. It advertizes the diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeMetadataResult.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeMetadataResult.java index 84424ed54d..d0935aee2e 100644 --- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeMetadataResult.java +++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeMetadataResult.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import com.google.common.annotations.Beta; import java.util.Optional; -import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadata; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedMetadata; /** * A NormalizedNodeResult which also holds NormalizedMetadata structure. diff --git a/data/yang-data-util/pom.xml b/data/yang-data-util/pom.xml index 08bffad8ca..bf9706aa7e 100644 --- a/data/yang-data-util/pom.xml +++ b/data/yang-data-util/pom.xml @@ -62,10 +62,6 @@ org.opendaylight.yangtools yang-xpath-api - - org.opendaylight.yangtools - rfc7952-data-api - org.opendaylight.yangtools rfc8528-data-api diff --git a/data/yang-data-util/src/main/java/module-info.java b/data/yang-data-util/src/main/java/module-info.java index 2e22ee9422..f654c3019d 100644 --- a/data/yang-data-util/src/main/java/module-info.java +++ b/data/yang-data-util/src/main/java/module-info.java @@ -17,7 +17,6 @@ module org.opendaylight.yangtools.yang.data.util { requires transitive org.opendaylight.yangtools.yang.model.spi; requires transitive org.opendaylight.yangtools.yang.model.util; requires transitive org.opendaylight.yangtools.yang.xpath.api; - requires transitive org.opendaylight.yangtools.rfc7952.data.api; requires transitive org.opendaylight.yangtools.rfc8528.data.api; requires java.xml; diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointDataWithSchema.java index 94f18ef4a7..7f73ef74f6 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractMountPointDataWithSchema.java @@ -11,10 +11,10 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.Beta; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.rfc8528.data.api.MountPointContextFactory; import org.opendaylight.yangtools.rfc8528.data.api.MountPointIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java index 2dc4291d17..4052a1ed9d 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java @@ -16,10 +16,10 @@ import java.io.IOException; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java index 962076588d..f261fcf808 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java @@ -9,8 +9,8 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; import javax.xml.transform.dom.DOMSource; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java index 762b08437e..0d68ef1603 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java @@ -14,8 +14,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import java.io.IOException; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; @Beta diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java index 3c22d88497..6c535bba6f 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java @@ -10,8 +10,8 @@ package org.opendaylight.yangtools.yang.data.util; import static com.google.common.base.Verify.verify; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java index 0456134333..3f65490b13 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java @@ -19,8 +19,8 @@ import java.util.Deque; import java.util.List; import java.util.Map.Entry; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java index 2557d8cda5..bc222e0c0d 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.ContainerLike; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java index 48ab63395d..8a806bf373 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java @@ -8,9 +8,9 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java index ceb4d661af..2de3ddad2f 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java index 8af9143f12..2f5ed7e6cf 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; /** diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java index 4c1605a0e8..feeaf0f604 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java @@ -14,11 +14,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.util.ImmutableMapTemplate; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java index 65f967d4af..a3c399a4e8 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.rfc7952.data.api.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.StreamWriterMetadataExtension; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; /** diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 6886828579..58cdc52a9e 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-api - org.opendaylight.yangtools rfc7952-data-util -- 2.36.6