Revert "Remove support for actions/rpc/notifications"

[controller.git] / opendaylight / blueprint / src / main / java / org / opendaylight / controller / blueprint / ext / ActionServiceMetadata.java

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionServiceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionServiceMetadata.java
index 768d4c00742ce42b6f8bf2637670047c2d7912fc..7498eabe8c23b98e02c25ca39885138ec222b24e 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionServiceMetadata.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionServiceMetadata.java
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.controller.blueprint.ext;
 
+import java.util.Objects;
 import java.util.function.Predicate;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.md.sal.dom.broker.spi.rpc.RpcRoutingStrategy;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.spi.ContentRoutedRpcContext;
 
 /**
  * Factory metadata corresponding to the "action-service" element. It waits for a DOM promise of registration
  * to appear in the {@link DOMRpcService} and then acquires a dynamic proxy via RpcProviderRegistry.
- *
- * @author Robert Varga
  */
 final class ActionServiceMetadata extends AbstractInvokableServiceMetadata {
     /*
@@ -34,9 +33,7 @@ final class ActionServiceMetadata extends AbstractInvokableServiceMetadata {
     }
 
     @Override
-    Predicate<RpcRoutingStrategy> rpcFilter() {
-        // FIXME: BUG-7608: action-service is a no-op for now
-        // return RpcRoutingStrategy::isContextBasedRouted;
-        return (strategy) -> false;
+    Predicate<ContentRoutedRpcContext> rpcFilter() {
+        return Objects::nonNull;
     }
 }