Terminally-deprecate with-parent put()/merge() operations

These have been deprecated for some time now, schedule them for
removal.

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

diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/WriteOperations.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/WriteOperations.java
index da346e2d710b0799df9c5e8953348134a4423fb5..956b9b4beba40226b7e405ea7a9b95667483387d 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/WriteOperations.java
+++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/WriteOperations.java
@@ -61,7 +61,7 @@ public interface WriteOperations {
      *             {@link #mergeParentStructurePut(LogicalDatastoreType, InstanceIdentifier, DataObject)}
      *             instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default <T extends DataObject> void put(@NonNull LogicalDatastoreType store, @NonNull InstanceIdentifier<T> path,
             @NonNull T data, boolean createMissingParents) {
         if (createMissingParents) {
@@ -134,7 +134,7 @@ public interface WriteOperations {
      *             {@link #mergeParentStructureMerge(LogicalDatastoreType, InstanceIdentifier, DataObject)}
      *             instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default <T extends DataObject> void merge(@NonNull LogicalDatastoreType store, @NonNull InstanceIdentifier<T> path,
             @NonNull T data, boolean createMissingParents) {
         if (createMissingParents) {
@@ -190,7 +190,7 @@ public interface WriteOperations {
      * @deprecated To be removed with {@link #merge(LogicalDatastoreType, InstanceIdentifier, DataObject, boolean)}
      *             and {@link #put(LogicalDatastoreType, InstanceIdentifier, DataObject, boolean)}.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     boolean CREATE_MISSING_PARENTS = true;
 
     /**
@@ -199,6 +199,6 @@ public interface WriteOperations {
      * @deprecated To be removed with {@link #merge(LogicalDatastoreType, InstanceIdentifier, DataObject, boolean)}
      *             and {@link #put(LogicalDatastoreType, InstanceIdentifier, DataObject, boolean)}.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     boolean FAIL_ON_MISSING_PARENTS = false;
 }