Mark deprecated methods for removal

We have a number of methods deprecated, but not marked for removal.
Update them along with the release where they were deprecated.

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

diff --git a/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java b/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
index 19c447166e31cd9ece12deaf8be4d4ee5eb226d3..03bebc4652d3122632c8fb8af7c8c7017435e169 100644 (file)
--- a/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
+++ b/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
@@ -70,7 +70,7 @@ public interface NormalizedNodeDataInput extends QNameAwareDataInput {
 
     PathArgument readPathArgument() throws IOException;
 
-    @Deprecated(forRemoval = true)
+    @Deprecated(since = "5.0.0", forRemoval = true)
     SchemaPath readSchemaPath() throws IOException;
 
     SchemaNodeIdentifier readSchemaNodeIdentifier() throws IOException;
@@ -108,7 +108,7 @@ public interface NormalizedNodeDataInput extends QNameAwareDataInput {
      * @return a new {@link NormalizedNodeDataInput} instance
      * @deprecated Use {@link #newDataInput(DataInput)} instead.
      */
-    @Deprecated(forRemoval = true)
+    @Deprecated(since = "5.0.0", forRemoval = true)
     static @NonNull NormalizedNodeDataInput newDataInputWithoutValidation(final @NonNull DataInput input) {
         return new VersionedNormalizedNodeDataInput(input);
     }

diff --git a/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataOutput.java b/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataOutput.java
index fb2b68a2b664c73bdecd8ff5140e6a9d2acafc8f..d6da68ae805bb9f3db2fcf761dd4a3ee3f9256f5 100644 (file)
--- a/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataOutput.java
+++ b/codec/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataOutput.java
@@ -32,7 +32,7 @@ public interface NormalizedNodeDataOutput extends AutoCloseable, QNameAwareDataO
 
     void writeYangInstanceIdentifier(YangInstanceIdentifier identifier) throws IOException;
 
-    @Deprecated(forRemoval = true)
+    @Deprecated(since = "5.0.0", forRemoval = true)
     void writeSchemaPath(SchemaPath path) throws IOException;
 
     void writeSchemaNodeIdentifier(SchemaNodeIdentifier path) throws IOException;

diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java
index 78640d7b5001a053e682e72021fce67e02cef89a..ecd478dc8ef300d380f72c2ef49af41391638748 100644 (file)
--- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java
+++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java
@@ -101,7 +101,7 @@ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter {
      * @param path root path
      * @deprecated Use either one of the alternative constructors instead.
      */
-    @Deprecated(since = "7.0.11")
+    @Deprecated(since = "7.0.11", forRemoval = true)
     public SchemaOrderedNormalizedNodeWriter(final NormalizedNodeStreamWriter writer,
             final EffectiveModelContext schemaContext, final SchemaPath path) {
         this(writer, SchemaInferenceStack.ofSchemaPath(schemaContext, path));

diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
index dfc838944129073613c5d3a540eebaab3eea6e9b..038e25fbf117aae0c9ea738baf073ee4e0db4d22 100644 (file)
--- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/NormalizedNodeStreamWriterStack.java
@@ -162,7 +162,7 @@ public final class NormalizedNodeStreamWriterStack implements LeafrefResolver {
      * @throws NullPointerException if any argument is null
      * @throws IllegalArgumentException if {@code path} does not point to a valid root
      */
-    @Deprecated
+    @Deprecated(since = "7.0.0", forRemoval = true)
     public static @NonNull NormalizedNodeStreamWriterStack of(final EffectiveModelContext context,
             final SchemaPath path) {
         return new NormalizedNodeStreamWriterStack(SchemaInferenceStack.ofSchemaPath(context, path));

diff --git a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java
index ceda711cfde74fcfb45769649830302b6424b806..3ccc337cc56ab684f59494cb4714c8c595212cd2 100644 (file)
--- a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java
+++ b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaInferenceStack.java
@@ -308,7 +308,7 @@ public final class SchemaInferenceStack implements Mutable, EffectiveModelContex
      * @throws IllegalArgumentException if {@code path} cannot be resolved in the effective model or if it is not an
      *                                  absolute path.
      */
-    @Deprecated
+    @Deprecated(since = "7.0.0", forRemoval = true)
     public static @NonNull SchemaInferenceStack ofInstantiatedPath(final EffectiveModelContext effectiveModel,
             final SchemaPath path) {
         checkArgument(path.isAbsolute(), "Cannot operate on relative path %s", path);
@@ -328,7 +328,7 @@ public final class SchemaInferenceStack implements Mutable, EffectiveModelContex
      * @throws IllegalArgumentException if {@code path} cannot be resolved in the effective model or if it is not an
      *                                  absolute path.
      */
-    @Deprecated
+    @Deprecated(since = "7.0.2", forRemoval = true)
     public static @NonNull SchemaInferenceStack ofSchemaPath(final EffectiveModelContext effectiveModel,
             final SchemaPath path) {
         checkArgument(path.isAbsolute(), "Cannot operate on relative path %s", path);
@@ -765,7 +765,7 @@ public final class SchemaInferenceStack implements Mutable, EffectiveModelContex
      * @throws IllegalStateException if current state is not instantiated
      * @deprecated This method is meant only for interoperation with SchemaPath-based APIs.
      */
-    @Deprecated
+    @Deprecated(since = "5.0.0", forRemoval = true)
     public @NonNull SchemaPath toSchemaPath() {
         return SchemaPath.create(simplePathFromRoot(), true);
     }
@@ -775,8 +775,9 @@ public final class SchemaInferenceStack implements Mutable, EffectiveModelContex
      * {@code toSchemaPath().getPathFromRoot().iterator()}.
      *
      * @return An unmodifiable iterator
+     * @deprecated Use {@link #toSchemaTreeInference()} instead.
      */
-    @Deprecated
+    @Deprecated(since = "5.0.0", forRemoval = true)
     public @NonNull Iterator<QName> schemaPathIterator() {
         return Iterators.unmodifiableIterator(simplePathFromRoot().iterator());
     }