From cca8f2d7d2e6b2bfecdb925ff7e8da462cee6371 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 2 Jan 2024 09:33:14 +0100 Subject: [PATCH] Do not provide SourceIdentifiers from extensions These constants are artificially holding down yang-repo-api and are not used anywhere. remove them and clean up dependencies. JIRA: YANGTOOLS-1150 Change-Id: I7a7b3cb410e815257bd8949ba2a948a39512551d Signed-off-by: Robert Varga --- model/odlext-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../api/OpenDaylightExtensionsConstants.java | 28 +++-------- model/openconfig-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../model/api/OpenConfigConstants.java | 50 +++---------------- model/rfc6241-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../rfc6241/model/api/NetconfConstants.java | 25 ++-------- model/rfc6536-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../rfc6536/model/api/NACMConstants.java | 38 ++++---------- model/rfc6643-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../model/api/IetfYangSmiv2Constants.java | 28 +++-------- model/rfc7952-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../rfc7952/model/api/MetadataConstants.java | 30 +++-------- model/rfc8040-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../rfc8040/model/api/YangDataConstants.java | 26 +++------- model/rfc8528-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../model/api/SchemaMountConstants.java | 30 +++-------- model/rfc8639-model-api/pom.xml | 4 -- .../src/main/java/module-info.java | 1 - .../api/SubscribedNotificationsConstants.java | 28 +++-------- parser/odlext-parser-support/pom.xml | 4 -- parser/rfc6241-parser-support/pom.xml | 4 -- parser/rfc6536-parser-support/pom.xml | 4 -- parser/rfc6643-parser-support/pom.xml | 4 -- parser/rfc7952-parser-support/pom.xml | 4 -- parser/rfc8040-parser-support/pom.xml | 4 -- .../OperationsValidateModuleAction.java | 5 +- parser/rfc8528-parser-support/pom.xml | 4 -- parser/rfc8639-parser-support/pom.xml | 4 -- parser/rfc8819-parser-support/pom.xml | 4 -- 37 files changed, 64 insertions(+), 305 deletions(-) diff --git a/model/odlext-model-api/pom.xml b/model/odlext-model-api/pom.xml index d5eac14ba5..ad85c6208c 100644 --- a/model/odlext-model-api/pom.xml +++ b/model/odlext-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/odlext-model-api/src/main/java/module-info.java b/model/odlext-model-api/src/main/java/module-info.java index 3e9b40f38c..f1e5e8a810 100644 --- a/model/odlext-model-api/src/main/java/module-info.java +++ b/model/odlext-model-api/src/main/java/module-info.java @@ -10,7 +10,6 @@ module org.opendaylight.yangtools.odlext.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java index 545535a36a..558d172267 100644 --- a/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java +++ b/model/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/OpenDaylightExtensionsConstants.java @@ -7,45 +7,29 @@ */ package org.opendaylight.yangtools.odlext.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with OpenDaylight extension in yang-ext.yang. - * - * @author Robert Varga */ public final class OpenDaylightExtensionsConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("yang-ext").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("yang-ext").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:opendaylight:yang:extension:yang-ext").intern(); - private static final Revision ORIGINAL_REVISION = Revision.of("2013-07-09"); - /** - * Runtime baseline identity. + * Baseline revision. */ - public static final QNameModule ORIGINAL_MODULE = QNameModule.create(MODULE_NAMESPACE, ORIGINAL_REVISION).intern(); + public static final Revision ORIGINAL_REVISION = Revision.of("2013-07-09"); /** - * Baseline model source name. + * Runtime baseline identity. */ - public static final SourceIdentifier ORIGINAL_SOURCE = new SourceIdentifier(MODULE_NAME, ORIGINAL_REVISION); + public static final QNameModule ORIGINAL_MODULE = QNameModule.create(MODULE_NAMESPACE, ORIGINAL_REVISION).intern(); private OpenDaylightExtensionsConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(ORIGINAL_SOURCE); - } } diff --git a/model/openconfig-model-api/pom.xml b/model/openconfig-model-api/pom.xml index d7839c4a48..be9484cb67 100644 --- a/model/openconfig-model-api/pom.xml +++ b/model/openconfig-model-api/pom.xml @@ -47,9 +47,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/openconfig-model-api/src/main/java/module-info.java b/model/openconfig-model-api/src/main/java/module-info.java index ff906e3002..6dead7dd5c 100644 --- a/model/openconfig-model-api/src/main/java/module-info.java +++ b/model/openconfig-model-api/src/main/java/module-info.java @@ -11,7 +11,6 @@ module org.opendaylight.yangtools.openconfig.model.api { requires transitive org.opendaylight.yangtools.concepts; requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java index 447062ad5f..3141e5fd9d 100644 --- a/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java +++ b/model/openconfig-model-api/src/main/java/org/opendaylight/yangtools/openconfig/model/api/OpenConfigConstants.java @@ -7,38 +7,34 @@ */ package org.opendaylight.yangtools.openconfig.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with OpenDaylight extension in yang-ext.yang. - * - * @author Robert Varga */ @NonNullByDefault public final class OpenConfigConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("openconfig-extensions").intern(); + public static final Unqualified MODULE_NAME = Unqualified.of("openconfig-extensions").intern(); // Package-visible, because openconfig-version applies across all known revisions and needs to bind to all of them - static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("http://openconfig.net/yang/openconfig-ext").intern(); + public static final XMLNamespace MODULE_NAMESPACE = + XMLNamespace.of("http://openconfig.net/yang/openconfig-ext").intern(); // Initial revision, defining semantic-version - private static final Revision SEMVER_REVISION = Revision.of("2015-10-09"); + public static final Revision SEMVER_REVISION = Revision.of("2015-10-09"); // Revised extension, adds openconfig-encrypted-value - private static final Revision ENCRYPTED_VALUE_REVISION = Revision.of("2017-01-29"); + public static final Revision ENCRYPTED_VALUE_REVISION = Revision.of("2017-01-29"); // Revised extension, renames openconfig-encrypted-value to openconfig-hashed-value - private static final Revision HASHED_VALUE_REVISION = Revision.of("2017-04-11"); + public static final Revision HASHED_VALUE_REVISION = Revision.of("2017-04-11"); // Revised extension, adds extension for POSIX pattern statements - private static final Revision REGEXP_POSIX_REVISION = Revision.of("2020-06-16"); + public static final Revision REGEXP_POSIX_REVISION = Revision.of("2020-06-16"); /** * Runtime identity of model which exposed regexp-posix. @@ -63,41 +59,11 @@ public final class OpenConfigConstants { .intern(); /** - * Original model source name. - */ - public static final SourceIdentifier SEMVER_SOURCE = new SourceIdentifier(MODULE_NAME, SEMVER_REVISION); - - /** - * Original model source name. - */ - public static final SourceIdentifier ENCRYPTED_VALUE_SOURCE = new SourceIdentifier(MODULE_NAME, - ENCRYPTED_VALUE_REVISION); - - /** - * Original model source name. - */ - public static final SourceIdentifier HASHED_VALUE_SOURCE = new SourceIdentifier(MODULE_NAME, HASHED_VALUE_REVISION); - - /** - * Original model source name. - */ - public static final SourceIdentifier REGEXP_POSIX_SOURCE = new SourceIdentifier(MODULE_NAME, REGEXP_POSIX_REVISION); - - /** - * Normative prefix to use when importing {@link #SEMVER_SOURCE} and later. + * Normative prefix to use when importing {@link #MODULE_NAME} and later. */ public static final String MODULE_PREFIX = "oc-ext"; private OpenConfigConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(HASHED_VALUE_SOURCE, ENCRYPTED_VALUE_SOURCE, SEMVER_SOURCE); - } } diff --git a/model/rfc6241-model-api/pom.xml b/model/rfc6241-model-api/pom.xml index 1f6d2dd6c6..95ce8520d9 100644 --- a/model/rfc6241-model-api/pom.xml +++ b/model/rfc6241-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc6241-model-api/src/main/java/module-info.java b/model/rfc6241-model-api/src/main/java/module-info.java index 304ff175e6..24d192cc09 100644 --- a/model/rfc6241-model-api/src/main/java/module-info.java +++ b/model/rfc6241-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc6241.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java index 031f9836f7..08fbc4f247 100644 --- a/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java +++ b/model/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/NetconfConstants.java @@ -7,24 +7,21 @@ */ package org.opendaylight.yangtools.rfc6241.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC6241. */ @NonNullByDefault public final class NetconfConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:netconf:base:1.0").intern(); - private static final Revision RFC6241_REVISION = Revision.of("2011-06-01"); + public static final Revision RFC6241_REVISION = Revision.of("2011-06-01"); /** * Runtime RFC6241 identity. @@ -32,25 +29,11 @@ public final class NetconfConstants { public static final QNameModule RFC6241_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6241_REVISION).intern(); /** - * RFC6241 model source name. - */ - public static final SourceIdentifier RFC6241_SOURCE = new SourceIdentifier(MODULE_NAME, RFC6241_REVISION); - - /** - * Normative prefix to use when importing {@link #RFC6241_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "nc"; private NetconfConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define NACM extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC6241_SOURCE); - } } diff --git a/model/rfc6536-model-api/pom.xml b/model/rfc6536-model-api/pom.xml index eaa149af7d..8c19fa8eec 100644 --- a/model/rfc6536-model-api/pom.xml +++ b/model/rfc6536-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc6536-model-api/src/main/java/module-info.java b/model/rfc6536-model-api/src/main/java/module-info.java index 13af943c59..e81a4ae04c 100644 --- a/model/rfc6536-model-api/src/main/java/module-info.java +++ b/model/rfc6536-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc6536.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java index 79e8f31298..69517b41d9 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java @@ -7,61 +7,45 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC6536. */ @NonNullByDefault public final class NACMConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf-acm").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-netconf-acm").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-netconf-acm").intern(); - private static final Revision RFC6536_REVISION = Revision.of("2012-02-22"); - private static final Revision RFC8341_REVISION = Revision.of("2018-02-14"); - /** - * Runtime RFC6536 identity. + * RFC6536 model revision. */ - public static final QNameModule RFC6536_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6536_REVISION).intern(); - + public static final Revision RFC6536_REVISION = Revision.of("2012-02-22"); /** - * Runtime RFC8341 identity. + * RFC8341 model revision.. */ - public static final QNameModule RFC8341_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8341_REVISION).intern(); + public static final Revision RFC8341_REVISION = Revision.of("2018-02-14"); /** - * RFC6536 model source name. + * Runtime RFC6536 identity. */ - public static final SourceIdentifier RFC6536_SOURCE = new SourceIdentifier(MODULE_NAME, RFC6536_REVISION); + public static final QNameModule RFC6536_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6536_REVISION).intern(); /** - * RFC8341 model source name. + * Runtime RFC8341 identity. */ - public static final SourceIdentifier RFC8341_SOURCE = new SourceIdentifier(MODULE_NAME, RFC8341_REVISION); + public static final QNameModule RFC8341_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8341_REVISION).intern(); /** - * Normative prefix to use when importing {@link #RFC6536_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "nacm"; private NACMConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define NACM extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC6536_SOURCE, RFC8341_SOURCE); - } } diff --git a/model/rfc6643-model-api/pom.xml b/model/rfc6643-model-api/pom.xml index 430d2cdf1b..9d92aa2b82 100644 --- a/model/rfc6643-model-api/pom.xml +++ b/model/rfc6643-model-api/pom.xml @@ -42,9 +42,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc6643-model-api/src/main/java/module-info.java b/model/rfc6643-model-api/src/main/java/module-info.java index 7f433d1f55..821fcae980 100644 --- a/model/rfc6643-model-api/src/main/java/module-info.java +++ b/model/rfc6643-model-api/src/main/java/module-info.java @@ -13,7 +13,6 @@ module org.opendaylight.yangtools.rfc6643.model.api { requires transitive org.opendaylight.yangtools.concepts; requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java index 797a042d1e..c1f1aa359a 100644 --- a/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java +++ b/model/rfc6643-model-api/src/main/java/org/opendaylight/yangtools/rfc6643/model/api/IetfYangSmiv2Constants.java @@ -8,45 +8,31 @@ package org.opendaylight.yangtools.rfc6643.model.api; import com.google.common.annotations.Beta; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; @Beta public final class IetfYangSmiv2Constants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-smiv2").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-smiv2").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-yang-smiv2").intern(); - private static final Revision RFC6643_REVISION = Revision.of("2012-06-22"); - /** - * Runtime RFC6643 identity. + * RFC6643 revision. */ - public static final QNameModule RFC6643_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6643_REVISION).intern(); + public static final Revision RFC6643_REVISION = Revision.of("2012-06-22"); /** - * RFC6643 model source name. + * Runtime RFC6643 identity. */ - public static final SourceIdentifier RFC6643_SOURCE = new SourceIdentifier(MODULE_NAME, RFC6643_REVISION); + public static final QNameModule RFC6643_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC6643_REVISION).intern(); /** - * Normative prefix to use when importing {@link #RFC6643_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "smiv2"; - /** - * Return identifiers of all sources known to define NACM extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC6643_SOURCE); - } - private IetfYangSmiv2Constants() { // Hidden on purpose } diff --git a/model/rfc7952-model-api/pom.xml b/model/rfc7952-model-api/pom.xml index d133131e33..a88324a76c 100644 --- a/model/rfc7952-model-api/pom.xml +++ b/model/rfc7952-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc7952-model-api/src/main/java/module-info.java b/model/rfc7952-model-api/src/main/java/module-info.java index ed55d4c149..a5fe2844ad 100644 --- a/model/rfc7952-model-api/src/main/java/module-info.java +++ b/model/rfc7952-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc7952.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java index 9b4adf35eb..3879552329 100644 --- a/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java +++ b/model/rfc7952-model-api/src/main/java/org/opendaylight/yangtools/rfc7952/model/api/MetadataConstants.java @@ -7,52 +7,36 @@ */ package org.opendaylight.yangtools.rfc7952.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC7952. - * - * @author Robert Varga */ @NonNullByDefault public final class MetadataConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-metadata").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-metadata").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-yang-metadata").intern(); - private static final Revision RFC7952_REVISION = Revision.of("2016-08-05"); - /** - * Runtime RFC7952 identity. + * RFC7952 revision. */ - public static final QNameModule RFC7952_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC7952_REVISION).intern(); + public static final Revision RFC7952_REVISION = Revision.of("2016-08-05"); /** - * RFC7952 model source name. + * Runtime RFC7952 identity. */ - public static final SourceIdentifier RFC7952_SOURCE = new SourceIdentifier(MODULE_NAME, RFC7952_REVISION); + public static final QNameModule RFC7952_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC7952_REVISION).intern(); /** - * Normative prefix to use when importing {@link #RFC7952_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "md"; private MetadataConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC7952_SOURCE); - } } diff --git a/model/rfc8040-model-api/pom.xml b/model/rfc8040-model-api/pom.xml index 73ccd04e98..5689d8febd 100644 --- a/model/rfc8040-model-api/pom.xml +++ b/model/rfc8040-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc8040-model-api/src/main/java/module-info.java b/model/rfc8040-model-api/src/main/java/module-info.java index ac02561d8d..e43de6facf 100644 --- a/model/rfc8040-model-api/src/main/java/module-info.java +++ b/model/rfc8040-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc8040.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java index 50eb03e773..534848987d 100644 --- a/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java +++ b/model/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java @@ -7,23 +7,23 @@ */ package org.opendaylight.yangtools.rfc8040.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC8040. */ @NonNullByDefault public final class YangDataConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-restconf").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-restconf").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-restconf").intern(); + /** + * RFC8040 revision. + */ private static final Revision RFC8040_REVISION = Revision.of("2017-01-26"); /** @@ -32,25 +32,11 @@ public final class YangDataConstants { public static final QNameModule RFC8040_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8040_REVISION).intern(); /** - * RFC8040 model source name. - */ - public static final SourceIdentifier RFC8040_SOURCE = new SourceIdentifier(MODULE_NAME, RFC8040_REVISION); - - /** - * Normative prefix to use when importing {@link #RFC8040_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "rc"; private YangDataConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC8040_SOURCE); - } } diff --git a/model/rfc8528-model-api/pom.xml b/model/rfc8528-model-api/pom.xml index 574862d1b7..0be88b6d42 100644 --- a/model/rfc8528-model-api/pom.xml +++ b/model/rfc8528-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc8528-model-api/src/main/java/module-info.java b/model/rfc8528-model-api/src/main/java/module-info.java index 91c7084b14..11317d1400 100644 --- a/model/rfc8528-model-api/src/main/java/module-info.java +++ b/model/rfc8528-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc8528.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java index 072f1b4ef2..4389516143 100644 --- a/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java +++ b/model/rfc8528-model-api/src/main/java/org/opendaylight/yangtools/rfc8528/model/api/SchemaMountConstants.java @@ -7,52 +7,36 @@ */ package org.opendaylight.yangtools.rfc8528.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC8528. - * - * @author Robert Varga */ @NonNullByDefault public final class SchemaMountConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-schema-mount").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-yang-schema-mount").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-yang-schema-mount").intern(); - private static final Revision RFC8528_REVISION = Revision.of("2019-01-14"); - /** - * Runtime RFC8528 identity. + * RFC8528 revision. */ - public static final QNameModule RFC8528_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8528_REVISION).intern(); + public static final Revision RFC8528_REVISION = Revision.of("2019-01-14"); /** - * RFC8528 model source name. + * Runtime RFC8528 identity. */ - public static final SourceIdentifier RFC8528_SOURCE = new SourceIdentifier(MODULE_NAME, RFC8528_REVISION); + public static final QNameModule RFC8528_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8528_REVISION).intern(); /** - * Normative prefix to use when importing {@link #RFC8528_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "yangmnt"; private SchemaMountConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC8528_SOURCE); - } } diff --git a/model/rfc8639-model-api/pom.xml b/model/rfc8639-model-api/pom.xml index 0fb864856d..30214687a2 100644 --- a/model/rfc8639-model-api/pom.xml +++ b/model/rfc8639-model-api/pom.xml @@ -38,9 +38,5 @@ org.opendaylight.yangtools yang-model-api - - org.opendaylight.yangtools - yang-repo-api - diff --git a/model/rfc8639-model-api/src/main/java/module-info.java b/model/rfc8639-model-api/src/main/java/module-info.java index ba94130753..b6d74e5bbe 100644 --- a/model/rfc8639-model-api/src/main/java/module-info.java +++ b/model/rfc8639-model-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc8639.model.api { requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.yang.repo.api; requires com.google.common; // Annotations diff --git a/model/rfc8639-model-api/src/main/java/org/opendaylight/yangtools/rfc8639/model/api/SubscribedNotificationsConstants.java b/model/rfc8639-model-api/src/main/java/org/opendaylight/yangtools/rfc8639/model/api/SubscribedNotificationsConstants.java index b46de022fe..c280682817 100644 --- a/model/rfc8639-model-api/src/main/java/org/opendaylight/yangtools/rfc8639/model/api/SubscribedNotificationsConstants.java +++ b/model/rfc8639-model-api/src/main/java/org/opendaylight/yangtools/rfc8639/model/api/SubscribedNotificationsConstants.java @@ -7,50 +7,36 @@ */ package org.opendaylight.yangtools.rfc8639.model.api; -import com.google.common.collect.ImmutableList; -import java.util.Collection; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC8639. */ @NonNullByDefault public final class SubscribedNotificationsConstants { - private static final Unqualified MODULE_NAME = Unqualified.of("ietf-subscribed-notifications").intern(); - private static final XMLNamespace MODULE_NAMESPACE = + public static final Unqualified MODULE_NAME = Unqualified.of("ietf-subscribed-notifications").intern(); + public static final XMLNamespace MODULE_NAMESPACE = XMLNamespace.of("urn:ietf:params:xml:ns:yang:ietf-subscribed-notifications").intern(); - private static final Revision RFC8639_REVISION = Revision.of("2019-09-09"); - /** - * Runtime RFC8639 identity. + * RFC8639 revision. */ - public static final QNameModule RFC8639_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8639_REVISION).intern(); + public static final Revision RFC8639_REVISION = Revision.of("2019-09-09"); /** - * RFC8639 model source name. + * Runtime RFC8639 identity. */ - public static final SourceIdentifier RFC8639_SOURCE = new SourceIdentifier(MODULE_NAME, RFC8639_REVISION); + public static final QNameModule RFC8639_MODULE = QNameModule.create(MODULE_NAMESPACE, RFC8639_REVISION).intern(); /** - * Normative prefix to use when importing {@link #RFC8639_SOURCE}. + * Normative prefix to use when importing {@link #MODULE_NAME}. */ public static final String MODULE_PREFIX = "sn"; private SubscribedNotificationsConstants() { // Hidden on purpose } - - /** - * Return identifiers of all sources known to define the metadata extension. - * - * @return Collection of identifiers. - */ - public static Collection knownModelSources() { - return ImmutableList.of(RFC8639_SOURCE); - } } diff --git a/parser/odlext-parser-support/pom.xml b/parser/odlext-parser-support/pom.xml index a4be6a6d5c..65dce48f3d 100644 --- a/parser/odlext-parser-support/pom.xml +++ b/parser/odlext-parser-support/pom.xml @@ -50,10 +50,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools odlext-model-api diff --git a/parser/rfc6241-parser-support/pom.xml b/parser/rfc6241-parser-support/pom.xml index ebecf011c5..a1b2bcb908 100644 --- a/parser/rfc6241-parser-support/pom.xml +++ b/parser/rfc6241-parser-support/pom.xml @@ -46,10 +46,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc6241-model-api diff --git a/parser/rfc6536-parser-support/pom.xml b/parser/rfc6536-parser-support/pom.xml index bd6be47e1b..789cc7342a 100644 --- a/parser/rfc6536-parser-support/pom.xml +++ b/parser/rfc6536-parser-support/pom.xml @@ -46,10 +46,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc6536-model-api diff --git a/parser/rfc6643-parser-support/pom.xml b/parser/rfc6643-parser-support/pom.xml index d153be93cc..261a18dd8c 100644 --- a/parser/rfc6643-parser-support/pom.xml +++ b/parser/rfc6643-parser-support/pom.xml @@ -46,10 +46,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc6643-model-api diff --git a/parser/rfc7952-parser-support/pom.xml b/parser/rfc7952-parser-support/pom.xml index 3f55210cb1..8d2fc1827f 100644 --- a/parser/rfc7952-parser-support/pom.xml +++ b/parser/rfc7952-parser-support/pom.xml @@ -50,10 +50,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc7952-model-api diff --git a/parser/rfc8040-parser-support/pom.xml b/parser/rfc8040-parser-support/pom.xml index 55368806ab..232a17a844 100644 --- a/parser/rfc8040-parser-support/pom.xml +++ b/parser/rfc8040-parser-support/pom.xml @@ -54,10 +54,6 @@ org.opendaylight.yangtools rfc8040-model-api - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools diff --git a/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/OperationsValidateModuleAction.java b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/OperationsValidateModuleAction.java index ee6f141999..63675c4af2 100644 --- a/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/OperationsValidateModuleAction.java +++ b/parser/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/OperationsValidateModuleAction.java @@ -13,7 +13,6 @@ import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.rfc8040.model.api.YangDataConstants; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; @@ -28,8 +27,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; * An {@link InferenceAction} tasked with identifying when we are dealing with {@link YangDataConstants#RFC8040_SOURCE}. */ final class OperationsValidateModuleAction implements InferenceAction { - private static final Unqualified IETF_RESTCONF = YangDataConstants.RFC8040_SOURCE.name(); - private final Prerequisite> prereq; private OperationsValidateModuleAction(final Prerequisite> prereq) { @@ -38,7 +35,7 @@ final class OperationsValidateModuleAction implements InferenceAction { static void applyTo(@NonNull final Mutable module) { // Quick checks we can - if (module.producesDeclared(ModuleStatement.class) && IETF_RESTCONF.equals(module.argument())) { + if (module.producesDeclared(ModuleStatement.class) && YangDataConstants.MODULE_NAME.equals(module.argument())) { // This is 'yang-api' definition within a 'ietf-restconf' module, but we are not certain about revisions // and its structure. Next up we require the module to be fully declared, hence an inference action is // needed to continue this process. diff --git a/parser/rfc8528-parser-support/pom.xml b/parser/rfc8528-parser-support/pom.xml index 11ad223213..35a2a69599 100644 --- a/parser/rfc8528-parser-support/pom.xml +++ b/parser/rfc8528-parser-support/pom.xml @@ -46,10 +46,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc8528-model-api diff --git a/parser/rfc8639-parser-support/pom.xml b/parser/rfc8639-parser-support/pom.xml index 58f0b69704..f7758d2365 100644 --- a/parser/rfc8639-parser-support/pom.xml +++ b/parser/rfc8639-parser-support/pom.xml @@ -46,10 +46,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc8639-model-api diff --git a/parser/rfc8819-parser-support/pom.xml b/parser/rfc8819-parser-support/pom.xml index 06a7b8fc3c..f1f80fd677 100644 --- a/parser/rfc8819-parser-support/pom.xml +++ b/parser/rfc8819-parser-support/pom.xml @@ -42,10 +42,6 @@ org.opendaylight.yangtools yang-parser-spi - - org.opendaylight.yangtools - yang-repo-api - org.opendaylight.yangtools rfc8819-model-api -- 2.36.6