Deprecate AddedByUsesAware for removal

Strenghten deprecation to indicate removal in the next major release.

Change-Id: I5dd08db5ac5ef0cc02284f2ea725913e6430617a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 1fcdd5c560cd18eea3457e6841d5a2c86c78a3a4..57e9b963bf26df4684614814f9957f7812b668a8 100644 (file)
--- 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 0dd693a4a74a8a8e922ee0d39ab0a0f50a07a6fa..c318081ea8797d109d24afbefed526c143d932e2 100644 (file)
--- 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 e73318ab327db1cd3b46543d027848c7b12af371..a52e87e03c2805f5995cb1b45aa6e9435ae6c1b2 100644 (file)
--- 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 52a2ebf2a42339a644713b2a66125dca76bfc793..dcf43a26fc0f3ba4b216802375d4ac3d85d16889 100644 (file)
--- 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<A, D extends UnknownSt
         return rawArgument == null ? "" : rawArgument;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Override
     public final boolean isAddedByUses() {
         return addedByUses;

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
index 20c88f7bd3aac1dbda3d8d32fa5cca58ca501591..80cffe88789c76183663c82f187e4b29b0c30ca2 100644 (file)
--- a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/EffectiveStatementMixins.java
@@ -93,11 +93,11 @@ public final class EffectiveStatementMixins {
      * @param <D> 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<A, D extends DeclaredStatement<A>>
             extends EffectiveStatementWithFlags<A, D>, 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 2e67e62634e1786d8ae273c585f52b7a5ae5ab4d..2455bfe6b4e56f0e5db822ce30626721124214f4 100644 (file)
--- 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<A, D extends DeclaredStatement<A>, 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<A, D extends DeclaredStatement<A>, 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;
     }