From 71f126ac45554a85a5b82547716ee03a410b53de Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 12 Dec 2021 07:47:41 +0100 Subject: [PATCH] Deprecate AddedByUsesAware for removal Strenghten deprecation to indicate removal in the next major release. Change-Id: I5dd08db5ac5ef0cc02284f2ea725913e6430617a Signed-off-by: Robert Varga --- .../yangtools/yang/data/util/AbstractAsContainer.java | 2 +- .../yangtools/yang/data/util/ContainerSchemaNodes.java | 4 ++-- .../yangtools/yang/model/api/AddedByUsesAware.java | 2 +- .../model/spi/meta/AbstractEffectiveUnknownSchmemaNode.java | 2 +- .../yang/model/spi/meta/EffectiveStatementMixins.java | 6 +++--- .../yang/parser/stmt/reactor/StatementContextBase.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractAsContainer.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractAsContainer.java index 1fcdd5c560..57e9b963bf 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractAsContainer.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractAsContainer.java @@ -52,8 +52,8 @@ abstract class AbstractAsContainer extends ForwardingObject implements Container return false; } - @Deprecated @Override + @Deprecated(forRemoval = true) public final boolean isAddedByUses() { return false; } diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java index 0dd693a4a7..c318081ea8 100644 --- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java +++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java @@ -160,8 +160,8 @@ public final class ContainerSchemaNodes { } } - @Deprecated @Override + @Deprecated(forRemoval = true) public boolean isAddedByUses() { return false; } @@ -219,7 +219,7 @@ public final class ContainerSchemaNodes { } @Override - @Deprecated + @Deprecated(forRemoval = true) public boolean isAddedByUses() { //FIXME: reference to https://bugs.opendaylight.org/show_bug.cgi?id=6897 return false; diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java index e73318ab32..a52e87e03c 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AddedByUsesAware.java @@ -16,7 +16,7 @@ import com.google.common.annotations.Beta; * EffectiveStatement tree to reconstruct this information. */ @Beta -@Deprecated(since = "7.0.9") +@Deprecated(since = "7.0.9", forRemoval = true) public interface AddedByUsesAware { /** * Returns {@code true} if this node was added by uses statement, otherwise returns {@code false}. diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveUnknownSchmemaNode.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveUnknownSchmemaNode.java index 52a2ebf2a4..dcf43a26fc 100644 --- a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveUnknownSchmemaNode.java +++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/AbstractEffectiveUnknownSchmemaNode.java @@ -73,7 +73,7 @@ public abstract class AbstractEffectiveUnknownSchmemaNode Class representing declared version of this statement. * @deprecated See deprecation notice in {@link AddedByUsesAware} */ - @Deprecated(since = "7.0.9") + @Deprecated(since = "7.0.9", forRemoval = true) public interface AddedByUsesMixin> extends EffectiveStatementWithFlags, AddedByUsesAware { @Override - @Deprecated(since = "7.0.9") + @Deprecated(since = "7.0.9", forRemoval = true) default boolean isAddedByUses() { return (flags() & FlagsBuilder.ADDED_BY_USES) != 0; } @@ -457,7 +457,7 @@ public final class EffectiveStatementMixins { static final int MANDATORY = 0x0004; static final int AUGMENTING = 0x0010; - @Deprecated(since = "7.0.9") + @Deprecated(since = "7.0.9", forRemoval = true) static final int ADDED_BY_USES = 0x0020; private static final int MASK_HISTORY = 0x0030; diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index 2e67e62634..2455bfe6b4 100644 --- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -99,7 +99,7 @@ public abstract class StatementContextBase, E // Bottom 4 bits, encoding a CopyHistory, aight? private static final byte COPY_ORIGINAL = 0x00; private static final byte COPY_LAST_TYPE_MASK = 0x03; - @Deprecated(since = "7.0.9") + @Deprecated(since = "7.0.9", forRemoval = true) private static final byte COPY_ADDED_BY_USES = 0x04; private static final byte COPY_ADDED_BY_AUGMENTATION = 0x08; @@ -221,7 +221,7 @@ public abstract class StatementContextBase, E } @Override - @Deprecated(since = "7.0.9") + @Deprecated(since = "7.0.9", forRemoval = true) public final boolean isAddedByUses() { return (bitsAight & COPY_ADDED_BY_USES) != 0; } -- 2.36.6