From d5157ccadb64f033dcf875b8f4ddcf7e1eabc07b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 21 Oct 2021 11:15:40 +0200 Subject: [PATCH] Move OpenConfigVersion support We are no longer using semantic versions to resolve linkage. Move statement support to openconfig-parser-support. JIRA: YANGTOOLS-1432 Change-Id: I144cd2a1040c264b9c6bfafceb95ef5a77e09d90 Signed-off-by: Robert Varga --- ...enConfigVersionEffectiveStatementImpl.java | 2 +- .../OpenConfigVersionStatementImpl.java | 2 +- .../parser}/OpenConfigVersionSupport.java | 10 +- .../RefOpenConfigVersionStatement.java | 2 +- .../yang/parser/impl/DefaultReactors.java | 91 +++++++++---------- parser/yang-parser-rfc7950/pom.xml | 4 - .../src/main/java/module-info.java | 1 - .../rfc7950/reactor/RFC7950Reactors.java | 14 +-- .../extension/ExtensionStatementSupport.java | 8 +- .../stmt/import_/ImportStatementSupport.java | 3 - .../stmt/module/ModuleStatementSupport.java | 3 - .../spi/meta/SemanticVersionNamespace.java | 23 ----- .../yang/parser/spi/meta/NamespaceTest.java | 1 - 13 files changed, 50 insertions(+), 114 deletions(-) rename parser/{yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt => openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser}/OpenConfigVersionEffectiveStatementImpl.java (96%) rename parser/{yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt => openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser}/OpenConfigVersionStatementImpl.java (93%) rename parser/{yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt => openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser}/OpenConfigVersionSupport.java (85%) rename parser/{yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt => openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser}/RefOpenConfigVersionStatement.java (93%) delete mode 100644 parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionEffectiveStatementImpl.java similarity index 96% rename from parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionEffectiveStatementImpl.java index 3cde2e8f1a..e1ac792888 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionEffectiveStatementImpl.java +++ b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionEffectiveStatementImpl.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.yang.parser.openconfig.stmt; +package org.opendaylight.yangtools.openconfig.parser; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.concepts.SemVer; diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionStatementImpl.java similarity index 93% rename from parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionStatementImpl.java index 2dca0a844e..a2e89a04f6 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionStatementImpl.java +++ b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionStatementImpl.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.yang.parser.openconfig.stmt; +package org.opendaylight.yangtools.openconfig.parser; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.concepts.SemVer; diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionSupport.java similarity index 85% rename from parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionSupport.java index 7c9b3afc75..9eac7c1cfa 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java +++ b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/OpenConfigVersionSupport.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.yang.parser.openconfig.stmt; +package org.opendaylight.yangtools.openconfig.parser; import com.google.common.collect.ImmutableList; import org.opendaylight.yangtools.concepts.SemVer; @@ -19,9 +19,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.BoundStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; public final class OpenConfigVersionSupport @@ -38,12 +36,6 @@ public final class OpenConfigVersionSupport return SemVer.valueOf(value); } - @Override - public void onLinkageDeclared( - final Mutable stmt) { - stmt.addToNs(SemanticVersionNamespace.class, stmt.getParentContext(), stmt.argument()); - } - @Override protected OpenConfigVersionStatement createDeclared(final BoundStmtCtx ctx, final ImmutableList> substatements) { diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigVersionStatement.java similarity index 93% rename from parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java rename to parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigVersionStatement.java index 76172beb82..880482ecb6 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/RefOpenConfigVersionStatement.java +++ b/parser/openconfig-parser-support/src/main/java/org/opendaylight/yangtools/openconfig/parser/RefOpenConfigVersionStatement.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.yang.parser.openconfig.stmt; +package org.opendaylight.yangtools.openconfig.parser; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.openconfig.model.api.OpenConfigVersionStatement; diff --git a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java index 3255c36cec..292e711d20 100644 --- a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java +++ b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java @@ -16,6 +16,7 @@ import org.opendaylight.yangtools.odlext.parser.InstanceTargetStatementSupport; import org.opendaylight.yangtools.odlext.parser.RpcContextReferenceStatementSupport; import org.opendaylight.yangtools.openconfig.parser.EncryptedValueStatementSupport; import org.opendaylight.yangtools.openconfig.parser.HashedValueStatementSupport; +import org.opendaylight.yangtools.openconfig.parser.OpenConfigVersionSupport; import org.opendaylight.yangtools.rfc6241.parser.GetFilterElementAttributesStatementSupport; import org.opendaylight.yangtools.rfc6536.parser.DefaultDenyAllStatementSupport; import org.opendaylight.yangtools.rfc6536.parser.DefaultDenyWriteStatementSupport; @@ -120,53 +121,47 @@ public final class DefaultReactors { private static @NonNull CustomCrossSourceStatementReactorBuilder addExtensions( final @NonNull CustomCrossSourceStatementReactorBuilder builder, final YangParserConfiguration config) { return builder - // OpenDaylight extensions - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new AugmentIdentifierStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new ContextInstanceStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new ContextReferenceStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new InstanceTargetStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new RpcContextReferenceStatementSupport(config)) - - // RFC6241 get-filter-element-attributes support - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new GetFilterElementAttributesStatementSupport(config)) - - // RFC6536 default-deny-{all,write} support - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new DefaultDenyAllStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new DefaultDenyWriteStatementSupport(config)) - - // RFC6643 extensions - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DisplayHintStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new MaxAccessStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DefValStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new ImpliedStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new AliasStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new OidStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new SubIdStatementSupport(config)) - - // RFC7952 annotation support - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new AnnotationStatementSupport(config)) - - // RFC8040 yang-data support - .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION, YangDataArgumentNamespace.BEHAVIOUR) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new YangDataStatementSupport(config)) - - // RFC8528 mount-point support - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new MountPointStatementSupport(config)) - - // RFC8639 subscription-state-notification support - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new SubscriptionStateNotificationStatementSupport(config)) - - // OpenConfig extensions support (except openconfig-version) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new EncryptedValueStatementSupport(config)) - .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, - new HashedValueStatementSupport(config)); + // OpenDaylight extensions + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new AugmentIdentifierStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new ContextInstanceStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new ContextReferenceStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new InstanceTargetStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new RpcContextReferenceStatementSupport(config)) + + // RFC6241 get-filter-element-attributes support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, + new GetFilterElementAttributesStatementSupport(config)) + + // RFC6536 default-deny-{all,write} support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DefaultDenyAllStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DefaultDenyWriteStatementSupport(config)) + + // RFC6643 extensions + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DisplayHintStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new MaxAccessStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new DefValStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new ImpliedStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new AliasStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new OidStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new SubIdStatementSupport(config)) + + // RFC7952 annotation support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new AnnotationStatementSupport(config)) + + // RFC8040 yang-data support + .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION, YangDataArgumentNamespace.BEHAVIOUR) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new YangDataStatementSupport(config)) + + // RFC8528 mount-point support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new MountPointStatementSupport(config)) + + // RFC8639 subscription-state-notification support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, + new SubscriptionStateNotificationStatementSupport(config)) + + // OpenConfig extensions support + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new EncryptedValueStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new HashedValueStatementSupport(config)) + .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, new OpenConfigVersionSupport(config)); } } diff --git a/parser/yang-parser-rfc7950/pom.xml b/parser/yang-parser-rfc7950/pom.xml index a23780c7fe..7daa3fde36 100644 --- a/parser/yang-parser-rfc7950/pom.xml +++ b/parser/yang-parser-rfc7950/pom.xml @@ -78,10 +78,6 @@ org.opendaylight.yangtools yang-xpath-api - - org.opendaylight.yangtools - openconfig-model-api - ch.qos.logback diff --git a/parser/yang-parser-rfc7950/src/main/java/module-info.java b/parser/yang-parser-rfc7950/src/main/java/module-info.java index 572340c878..c08ecb7ab2 100644 --- a/parser/yang-parser-rfc7950/src/main/java/module-info.java +++ b/parser/yang-parser-rfc7950/src/main/java/module-info.java @@ -29,7 +29,6 @@ module org.opendaylight.yangtools.yang.parser.rfc7950 { requires transitive org.opendaylight.yangtools.yang.xpath.api; requires org.antlr.antlr4.runtime; - requires org.opendaylight.yangtools.openconfig.model.api; requires org.opendaylight.yangtools.yang.model.ri; requires org.opendaylight.yangtools.util; requires org.slf4j; diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java index e58b043333..e756825b2c 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java @@ -16,7 +16,6 @@ import com.google.common.collect.Sets; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.openconfig.stmt.OpenConfigVersionSupport; import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ModuleQNameToPrefix; import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.YangNamespaceContextNamespace; import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment.AugmentImplicitHandlingNamespace; @@ -111,7 +110,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SchemaTreeNamespace; import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace; import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementDefinitionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle; import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToModuleContext; @@ -283,7 +281,7 @@ public final class RFC7950Reactors { public static @NonNull CustomCrossSourceStatementReactorBuilder defaultReactorBuilder( final YangParserConfiguration config) { - return addExtensions(vanillaReactorBuilder(config), config); + return vanillaReactorBuilder(config); } public static @NonNull CustomCrossSourceStatementReactorBuilder defaultReactorBuilder( @@ -293,15 +291,7 @@ public final class RFC7950Reactors { public static @NonNull CustomCrossSourceStatementReactorBuilder defaultReactorBuilder( final YangXPathParserFactory xpathFactory, final YangParserConfiguration config) { - return addExtensions(vanillaReactorBuilder(xpathFactory, config), config); - } - - private static @NonNull CustomCrossSourceStatementReactorBuilder addExtensions( - final @NonNull CustomCrossSourceStatementReactorBuilder builder, final YangParserConfiguration config) { - return builder - // Semantic version support - .addStatementSupport(ModelProcessingPhase.SOURCE_LINKAGE, new OpenConfigVersionSupport(config)) - .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, SemanticVersionNamespace.BEHAVIOUR); + return vanillaReactorBuilder(xpathFactory, config); } /** diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java index fac074a8a6..f082e97dbf 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.model.api.meta.DeclarationReference; @@ -61,12 +60,7 @@ public final class ExtensionStatementSupport final Mutable stmt) { super.onStatementDefinitionDeclared(stmt); - QName stmtName = stmt.getArgument(); - if (OpenConfigStatements.OPENCONFIG_VERSION.getStatementName().isEqualWithoutRevision(stmtName)) { - stmtName = stmtName.withoutRevision(); - } - - stmt.addContext(ExtensionNamespace.class, stmtName, stmt); + stmt.addContext(ExtensionNamespace.class, stmt.getArgument(), stmt); final StmtContext argument = StmtContextUtils.findFirstDeclaredSubstatement(stmt, ArgumentStatement.class); diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java index c33333204b..11e4daa2cf 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java @@ -16,7 +16,6 @@ import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; import java.util.Collection; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.common.YangVersion; @@ -56,13 +55,11 @@ public final class ImportStatementSupport SubstatementValidator.builder(YangStmtMapping.IMPORT) .addMandatory(YangStmtMapping.PREFIX) .addOptional(YangStmtMapping.REVISION_DATE) - .addOptional(OpenConfigStatements.OPENCONFIG_VERSION) .build(); private static final SubstatementValidator RFC7950_VALIDATOR = SubstatementValidator.builder(YangStmtMapping.IMPORT) .addMandatory(YangStmtMapping.PREFIX) .addOptional(YangStmtMapping.REVISION_DATE) - .addOptional(OpenConfigStatements.OPENCONFIG_VERSION) .addOptional(YangStmtMapping.DESCRIPTION) .addOptional(YangStmtMapping.REFERENCE) .build(); diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java index fee56063cf..2b290c1278 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; @@ -96,7 +95,6 @@ public final class ModuleStatementSupport .addAny(YangStmtMapping.TYPEDEF) .addAny(YangStmtMapping.USES) .addOptional(YangStmtMapping.YANG_VERSION) - .addOptional(OpenConfigStatements.OPENCONFIG_VERSION) .build(); private static final SubstatementValidator RFC7950_VALIDATOR = SubstatementValidator.builder(YangStmtMapping.MODULE) .addAny(YangStmtMapping.ANYDATA) @@ -126,7 +124,6 @@ public final class ModuleStatementSupport .addAny(YangStmtMapping.TYPEDEF) .addAny(YangStmtMapping.USES) .addMandatory(YangStmtMapping.YANG_VERSION) - .addOptional(OpenConfigStatements.OPENCONFIG_VERSION) .build(); private ModuleStatementSupport(final YangParserConfiguration config, final SubstatementValidator validator) { diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java deleted file mode 100644 index 72114dfc87..0000000000 --- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionNamespace.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. 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 - */ -package org.opendaylight.yangtools.yang.parser.spi.meta; - -import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.SemVer; - -/** - * Namespace class for storing semantic version of yang modules. - */ -@Beta -@Deprecated(since = "7.0.11", forRemoval = true) -public interface SemanticVersionNamespace extends ParserNamespace, SemVer> { - NamespaceBehaviour, SemVer, @NonNull SemanticVersionNamespace> BEHAVIOUR = - NamespaceBehaviour.global(SemanticVersionNamespace.class); - -} diff --git a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java index 58f17e7ca3..5c4479bf7e 100644 --- a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java +++ b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java @@ -16,7 +16,6 @@ public class NamespaceTest { public void testNamespaces() { // Touch behaviors // FIXME: add more checks/split this up when behaviours are testable - assertNotNull(SemanticVersionNamespace.BEHAVIOUR); assertNotNull(StatementDefinitionNamespace.BEHAVIOUR); } } -- 2.36.6