Deprecate old MD-SAL APIs for removal

[controller.git] / opendaylight / md-sal / sal-dom-compat / src / main / java / org / opendaylight / controller / sal / core / compat / RpcAvailabilityListenerAdapter.java

diff --git a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/RpcAvailabilityListenerAdapter.java b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/RpcAvailabilityListenerAdapter.java
index d5d472a57bb0df441d9275fe6eaa529428032849..adcd27e7cfd8700758f9b579e0768d477a200e5a 100644 (file)
--- a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/RpcAvailabilityListenerAdapter.java
+++ b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/RpcAvailabilityListenerAdapter.java
@@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
 
-@Deprecated
+@Deprecated(forRemoval = true)
 public class RpcAvailabilityListenerAdapter<T extends DOMRpcAvailabilityListener> extends ForwardingObject
         implements org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener {
     private final @NonNull T delegate;
@@ -42,10 +42,6 @@ public class RpcAvailabilityListenerAdapter<T extends DOMRpcAvailabilityListener
 
     private static @NonNull Collection<DOMRpcIdentifier> convert(
             final Collection<org.opendaylight.mdsal.dom.api.DOMRpcIdentifier> from) {
-        return from.stream().map(RpcAvailabilityListenerAdapter::convert).collect(Collectors.toList());
-    }
-
-    private static @NonNull DOMRpcIdentifier convert(final org.opendaylight.mdsal.dom.api.DOMRpcIdentifier from) {
-        return DOMRpcIdentifier.create(from.getType(), from.getContextReference());
+        return from.stream().map(DOMRpcIdentifier::fromMdsal).collect(Collectors.toList());
     }
 }