From: Robert Varga Date: Sat, 16 Oct 2021 09:05:44 +0000 (+0200) Subject: Deprecate DerivableSchemaNode X-Git-Tag: v8.0.0~191 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6edbe2d43f3b16f8dfdbe70bc4808c23b712f619;p=yangtools.git Deprecate DerivableSchemaNode This interface exposes a single method, which in turn is only used by mdsal-binding-generator. That component should be able to work without this method, hence we deprecate it with the intent to remove as soon as practical. JIRA: YANGTOOLS-1350 Change-Id: Ie7bd65e5301012bcb24703bd36c0a8d149f62d74 Signed-off-by: Robert Varga --- diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java index 3e0c3af3cb..f24b34a3a7 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DerivableSchemaNode.java @@ -11,12 +11,14 @@ import java.util.Optional; /** * Schema Node which may be derived from other schema node using augmentation or uses statement. + * + * @deprecated This interface's sole purpose is to aid MD-SAL binding generator, which is now in a position to provide + * to implement its logic without this interface. */ -// FIXME: 8.0.0: refactor this interface to take into account CopyableNode and AddedByUsesAware +@Deprecated(since = "7.0.9", forRemoval = true) public interface DerivableSchemaNode> extends DataSchemaNode { /** - * If this node is added by uses, returns original node definition from - * grouping where it was defined. + * If this node is added by uses, returns original node definition from grouping where it was defined. * * @return original node definition from grouping if this node is added by uses, absent otherwise */ diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractNonEmptyLeafListEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractNonEmptyLeafListEffectiveStatement.java index 45f69a7037..ad748ba050 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractNonEmptyLeafListEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AbstractNonEmptyLeafListEffectiveStatement.java @@ -31,18 +31,19 @@ abstract class AbstractNonEmptyLeafListEffectiveStatement extends AbstractLeafLi AbstractNonEmptyLeafListEffectiveStatement(final AbstractNonEmptyLeafListEffectiveStatement originalEffecive, final LeafListSchemaNode original, final QName argument, final int flags) { super(originalEffecive, argument, flags); - this.elementCountConstraint = originalEffecive.elementCountConstraint; + elementCountConstraint = originalEffecive.elementCountConstraint; this.original = original; } AbstractNonEmptyLeafListEffectiveStatement(final EmptyLeafListEffectiveStatement originalEffective, final LeafListSchemaNode original, final QName argument, final int flags) { super(originalEffective, argument, flags); - this.elementCountConstraint = null; + elementCountConstraint = null; this.original = original; } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public final Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java index 45dede877c..86c14e4f38 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ChoiceEffectiveStatementImpl.java @@ -50,8 +50,8 @@ public final class ChoiceEffectiveStatementImpl super(origEffective); this.argument = requireNonNull(argument); this.flags = flags; - this.defaultCase = origEffective.defaultCase; - this.original = newOriginal; + defaultCase = origEffective.defaultCase; + original = newOriginal; } @Override @@ -65,6 +65,7 @@ public final class ChoiceEffectiveStatementImpl } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java index 619edfc619..5e8d782f13 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/ContainerEffectiveStatementImpl.java @@ -72,6 +72,7 @@ public final class ContainerEffectiveStatementImpl } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java index 28c829e436..ab0fcc3bb2 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/DeclaredCaseEffectiveStatement.java @@ -56,6 +56,7 @@ public final class DeclaredCaseEffectiveStatement } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java index 9a0adaadc5..03b7b29767 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnydataEffectiveStatement.java @@ -55,6 +55,7 @@ public class EmptyAnydataEffectiveStatement extends Default getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java index a5fca59416..fc213ed807 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyAnyxmlEffectiveStatement.java @@ -54,6 +54,7 @@ public class EmptyAnyxmlEffectiveStatement extends Default getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java index 85acad97a9..898d265a3b 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafEffectiveStatement.java @@ -22,6 +22,7 @@ public final class EmptyLeafEffectiveStatement extends AbstractLeafEffectiveStat } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.empty(); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafListEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafListEffectiveStatement.java index e2ce6228f2..835d45091b 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafListEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyLeafListEffectiveStatement.java @@ -29,6 +29,7 @@ public final class EmptyLeafListEffectiveStatement extends AbstractLeafListEffec } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.empty(); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyListEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyListEffectiveStatement.java index 830c75efe7..ea38ff9886 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyListEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/EmptyListEffectiveStatement.java @@ -28,6 +28,7 @@ public final class EmptyListEffectiveStatement extends AbstractListEffectiveStat } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.empty(); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java index 425d2601f4..d10561719b 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularLeafEffectiveStatement.java @@ -31,6 +31,7 @@ public final class RegularLeafEffectiveStatement extends AbstractLeafEffectiveSt } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularListEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularListEffectiveStatement.java index 4331f797e4..8691a15087 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularListEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/RegularListEffectiveStatement.java @@ -31,18 +31,19 @@ public final class RegularListEffectiveStatement extends AbstractListEffectiveSt public RegularListEffectiveStatement(final RegularListEffectiveStatement originalEffective, final QName argument, final int flags, final ListSchemaNode original) { super(originalEffective, argument, flags); - this.elementCountConstraint = originalEffective.elementCountConstraint; + elementCountConstraint = originalEffective.elementCountConstraint; this.original = original; } public RegularListEffectiveStatement(final EmptyListEffectiveStatement originalEffective, final QName argument, final int flags, final ListSchemaNode original) { super(originalEffective, argument, flags); - this.elementCountConstraint = null; + elementCountConstraint = null; this.original = original; } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java index 4574213ee4..5414cb9191 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/UndeclaredCaseEffectiveStatement.java @@ -55,6 +55,7 @@ public final class UndeclaredCaseEffectiveStatement } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginal() { return Optional.ofNullable(original); }