From: Robert Varga Date: Tue, 3 May 2022 21:51:59 +0000 (+0200) Subject: Deprecate getSemanticVersion() for removal X-Git-Tag: v9.0.0~93 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=c0d06277f302d4febde802d92008434f53fb6216 Deprecate getSemanticVersion() for removal NETMOD WG has a versioning proposal which will supersede OpenConfig, deprecate API elements which are tied to OpenConfig versioning. Change-Id: I2bbe1a8e6be78ecc5e911a367b0893515beaa836 Signed-off-by: Robert Varga --- diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java index 4a135bb4a2..3e353cd079 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java @@ -43,7 +43,9 @@ public interface ModuleImport extends DocumentedNode, EffectiveStatementEquivale * Returns the semantic version to import. * * @return Semantic version of module to import + * @deprecated Semantic version imports are deprecated. */ + @Deprecated(since = "8.0.4", forRemoval = true) Optional getSemanticVersion(); /** diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java index 09892dfe1e..b275b1a845 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleLike.java @@ -34,7 +34,9 @@ public interface ModuleLike extends DataNodeContainer, DocumentedNode, Immutable * * @return SemVer semantic version of YANG module which is specified as argument of * {@code (urn:opendaylight:yang:extension:semantic-version?revision=2016-02-02)semantic-version} statement + * @deprecated Semantic version imports are deprecated. */ + @Deprecated(since = "8.0.4", forRemoval = true) Optional getSemanticVersion(); /** diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java index c7147dddb0..0a0818b75f 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ImportEffectiveStatementImpl.java @@ -43,6 +43,7 @@ public final class ImportEffectiveStatementImpl extends WithSubstatements getSemanticVersion() { return Optional.ofNullable(semVer); } diff --git a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java index ab75d70bec..0acdbfe81c 100644 --- a/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java +++ b/model/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java @@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableSet; import java.net.URI; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -369,8 +368,8 @@ public class SchemaContextProxyTest { SchemaContext schemaContext = mockSchema(module2, module3, module4, module5); - FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - Collections.singleton(module2), null); + FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(module2), + null); assertProxyContext(filteringSchemaContextProxy, module2, module3, module4, module5); } @@ -397,8 +396,8 @@ public class SchemaContextProxyTest { SchemaContext schemaContext = mockSchema(moduleConfig, module2, module3, module4, module5); - FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - Collections.singleton(module3), moduleConfig); + FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(module3), + moduleConfig); assertProxyContext(filteringSchemaContextProxy, moduleConfig, module2, module3, module4); } @@ -406,12 +405,11 @@ public class SchemaContextProxyTest { public void testGetDataDefinitions() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class); - final Set childNodes = Collections.singleton(mockedContainer); - doReturn(childNodes).when(moduleConfig).getChildNodes(); + doReturn(Set.of(mockedContainer)).when(moduleConfig).getChildNodes(); final Collection dataDefinitions = filteringSchemaContextProxy.getDataDefinitions(); @@ -422,12 +420,11 @@ public class SchemaContextProxyTest { public void testGetNotifications() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final NotificationDefinition mockedNotification = mock(NotificationDefinition.class); - final Set notifications = Collections.singleton(mockedNotification); - doReturn(notifications).when(moduleConfig).getNotifications(); + doReturn(Set.of(mockedNotification)).when(moduleConfig).getNotifications(); final Collection schemaContextProxyNotifications = filteringSchemaContextProxy.getNotifications(); @@ -438,12 +435,11 @@ public class SchemaContextProxyTest { public void testGetOperations() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final RpcDefinition mockedRpc = mock(RpcDefinition.class); - final Set rpcs = Collections.singleton(mockedRpc); - doReturn(rpcs).when(moduleConfig).getRpcs(); + doReturn(Set.of(mockedRpc)).when(moduleConfig).getRpcs(); final Collection operations = filteringSchemaContextProxy.getOperations(); assertTrue(operations.contains(mockedRpc)); @@ -453,12 +449,11 @@ public class SchemaContextProxyTest { public void testGetExtensions() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final ExtensionDefinition mockedExtension = mock(ExtensionDefinition.class); - final List extensions = Collections.singletonList(mockedExtension); - doReturn(extensions).when(moduleConfig).getExtensionSchemaNodes(); + doReturn(List.of(mockedExtension)).when(moduleConfig).getExtensionSchemaNodes(); final Collection schemaContextProxyExtensions = filteringSchemaContextProxy.getExtensions(); @@ -469,12 +464,11 @@ public class SchemaContextProxyTest { public void testGetUnknownSchemaNodes() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final UnknownSchemaNode mockedUnknownSchemaNode = mock(UnknownSchemaNode.class); - final List unknownSchemaNodes = Collections.singletonList(mockedUnknownSchemaNode); - doReturn(unknownSchemaNodes).when(moduleConfig).getUnknownSchemaNodes(); + doReturn(List.of(mockedUnknownSchemaNode)).when(moduleConfig).getUnknownSchemaNodes(); final Collection schemaContextProxyUnknownSchemaNodes = filteringSchemaContextProxy.getUnknownSchemaNodes(); @@ -485,12 +479,11 @@ public class SchemaContextProxyTest { public void testGetTypeDefinitions() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final TypeDefinition mockedTypeDefinition = mock(TypeDefinition.class); - final Set> typeDefinitions = Collections.singleton(mockedTypeDefinition); - doReturn(typeDefinitions).when(moduleConfig).getTypeDefinitions(); + doReturn(Set.of(mockedTypeDefinition)).when(moduleConfig).getTypeDefinitions(); final Collection> schemaContextProxyTypeDefinitions = filteringSchemaContextProxy .getTypeDefinitions(); @@ -501,12 +494,11 @@ public class SchemaContextProxyTest { public void testGetChildNodes() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class); - final Set childNodes = Collections.singleton(mockedContainer); - doReturn(childNodes).when(moduleConfig).getChildNodes(); + doReturn(Set.of(mockedContainer)).when(moduleConfig).getChildNodes(); final Collection schemaContextProxyChildNodes = filteringSchemaContextProxy.getChildNodes(); @@ -517,12 +509,11 @@ public class SchemaContextProxyTest { public void testGetGroupings() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final GroupingDefinition mockedGrouping = mock(GroupingDefinition.class); - final Set groupings = Collections.singleton(mockedGrouping); - doReturn(groupings).when(moduleConfig).getGroupings(); + doReturn(Set.of(mockedGrouping)).when(moduleConfig).getGroupings(); final Collection schemaContextProxyGroupings = filteringSchemaContextProxy.getGroupings(); @@ -533,8 +524,8 @@ public class SchemaContextProxyTest { public void testGetDataChildByName() { final Module moduleConfig = mockModule(CONFIG_NAME); final SchemaContext schemaContext = mockSchema(moduleConfig); - final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, - new HashSet<>(), moduleConfig); + final FilteringSchemaContextProxy filteringSchemaContextProxy = createProxySchemaCtx(schemaContext, Set.of(), + moduleConfig); final QName qname = QName.create("config-namespace", "2016-08-11", "cont"); final ContainerSchemaNode mockedContainer = mock(ContainerSchemaNode.class); @@ -547,7 +538,7 @@ public class SchemaContextProxyTest { private static void assertProxyContext(final FilteringSchemaContextProxy filteringSchemaContextProxy, final Module... expected) { - final Set modSet = expected != null ? ImmutableSet.copyOf(expected) : new HashSet<>(); + final Set modSet = expected != null ? ImmutableSet.copyOf(expected) : Set.of(); Set modSetFiltering = filteringSchemaContextProxy.getModules(); assertEquals(modSet, modSetFiltering); @@ -568,11 +559,7 @@ public class SchemaContextProxyTest { private static FilteringSchemaContextProxy createProxySchemaCtx(final SchemaContext schemaContext, final Set additionalModules, final Module... modules) { - Set modulesSet = new HashSet<>(); - if (modules != null) { - modulesSet = ImmutableSet.copyOf(modules); - } - + Set modulesSet = modules != null ? ImmutableSet.copyOf(modules) : Set.of(); return new FilteringSchemaContextProxy(schemaContext, createModuleIds(modulesSet), createModuleIds(additionalModules)); } @@ -589,10 +576,7 @@ public class SchemaContextProxyTest { } private static void mockSubmodules(final Module mainModule, final Submodule... submodules) { - Set submodulesSet = new HashSet<>(); - submodulesSet.addAll(Arrays.asList(submodules)); - - doReturn(submodulesSet).when(mainModule).getSubmodules(); + doReturn(Set.of(submodules)).when(mainModule).getSubmodules(); } private static void mockModuleImport(final ModuleLike importer, final Module... imports) { @@ -615,6 +599,7 @@ public class SchemaContextProxyTest { } @Override + @Deprecated(since = "8.0.4", forRemoval = true) public Optional getSemanticVersion() { return module.getSemanticVersion(); } @@ -674,7 +659,7 @@ public class SchemaContextProxyTest { final XMLNamespace newNamespace = XMLNamespace.of(NAMESPACE.toString() + ":" + name); doReturn(newNamespace).when(mockedModule).getNamespace(); doReturn(QNameModule.create(newNamespace, REVISION)).when(mockedModule).getQNameModule(); - doReturn(new HashSet<>()).when(mockedModule).getSubmodules(); + doReturn(Set.of()).when(mockedModule).getSubmodules(); doReturn(mockedModule.getQNameModule().toString()).when(mockedModule).toString(); mockModuleImport(mockedModule); } diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java index 42b9e38a0b..043ca62d4f 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java @@ -131,7 +131,9 @@ public abstract class YangModelDependencyInfo { * Returns semantic version of module. * * @return semantic version + * @deprecated Semantic versioning is deprecated */ + @Deprecated(since = "8.0.4", forRemoval = true) public Optional getSemanticVersion() { return Optional.ofNullable(semVer); } @@ -407,6 +409,7 @@ public abstract class YangModelDependencyInfo { } @Override + @Deprecated(forRemoval = true) public Optional getSemanticVersion() { return Optional.ofNullable(semVer); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java index d645e185f2..399e5d4cdd 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionBorderCaseTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java index c500b43cb8..11272046de 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java @@ -21,6 +21,7 @@ import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionComplexTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java index 1f1e23ceb2..65e60945dd 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionDefaultsTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java index e85b1ec31c..9cffcd4237 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java @@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionIgnoringRevisionTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java index d9ea7a976e..520f0242be 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java @@ -23,6 +23,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionImportTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java index a9febc3c41..97ba3cd935 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java @@ -24,6 +24,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionMultipleImportTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java index 2b872b95fb..6a39042df6 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java @@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionPositionTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java index 639c36a1e1..11f83b9fcf 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java @@ -29,6 +29,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +@Deprecated(since = "8.0.4", forRemoval = true) public class OpenconfigVersionTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java index 99ef806473..375fb185ad 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java @@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; import org.xml.sax.SAXException; +@Deprecated(since = "8.0.4", forRemoval = true) public class YinOpenconfigVersionTest { private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER)