Reduce ObjectRegistration use

[mdsal.git] / binding / mdsal-binding-api / src / main / java / org / opendaylight / mdsal / binding / api / ActionService.java

diff --git a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ActionService.java b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ActionService.java
index 6642c34e6e7de0e6575cc1cdc1154a9d29ab541e..9ee19f7b71e24bf28c83e36e485f0e76641f7452 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ActionService.java
+++ b/binding/mdsal-binding-api/src/main/java/org/opendaylight/mdsal/binding/api/ActionService.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.api;
 
-import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -20,10 +19,7 @@ import org.opendaylight.yangtools.yang.binding.RpcInput;
 /**
  * Provides access to registered {@code action} implementations. Each action is defined in a YANG model,
  * and implementations are added dynamically at runtime, via {@link ActionProviderService}.
- *
- * @author Robert Varga
  */
-@Beta
 @NonNullByDefault
 public interface ActionService extends BindingService {
     /**
@@ -47,32 +43,32 @@ public interface ActionService extends BindingService {
      * The returned proxy is automatically updated with the most recent registered implementation, hence there is no
      * guarantee that multiple consecutive invocations will be handled by the same implementation.
      *
-     * @param actionInterface Generated Action interface
+     * @param spec Action instance specification
      * @param validNodes Set of nodes this service will be constrained to, empty if no constraints are known
      * @return A proxy implementation of the generated interface
      * @throws NullPointerException if {@code actionInterface} is null
      * @throws IllegalArgumentException when {@code actionInterface} does not conform to the Binding Specification
      */
-    <O extends DataObject, T extends Action<?, ?, ?>> T getActionHandle(Class<T> actionInterface,
-            Set<DataTreeIdentifier<O>> validNodes);
+    <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>> A getActionHandle(
+        ActionSpec<A, P> spec, Set<DataTreeIdentifier<P>> validNodes);
 
-    default <O extends DataObject, P extends InstanceIdentifier<O>, T extends Action<P, ?, ?>> T getActionHandle(
-            final Class<T> actionInterface) {
-        return getActionHandle(actionInterface, ImmutableSet.of());
+    default <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>> A getActionHandle(
+            final ActionSpec<A, P> spec) {
+        return getActionHandle(spec, ImmutableSet.of());
     }
 
-    default <O extends DataObject, P extends InstanceIdentifier<O>, T extends Action<P, ?, ?>> T getActionHandle(
-            final Class<T> actionInterface, final LogicalDatastoreType dataStore, final P path) {
-        return getActionHandle(actionInterface, ImmutableSet.of(DataTreeIdentifier.create(dataStore, path)));
+    default <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>> A getActionHandle(
+            final ActionSpec<A, P> spec, final LogicalDatastoreType dataStore, final InstanceIdentifier<P> path) {
+        return getActionHandle(spec, ImmutableSet.of(DataTreeIdentifier.of(dataStore, path)));
     }
 
-    default <O extends DataObject, P extends InstanceIdentifier<O>, T extends Action<P, ?, ?>> T getActionHandle(
-            final Class<T> actionInterface, final P path) {
-        return getActionHandle(actionInterface, LogicalDatastoreType.OPERATIONAL, path);
+    default <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>> A getActionHandle(
+            final ActionSpec<A, P> spec, final InstanceIdentifier<P> path) {
+        return getActionHandle(spec, LogicalDatastoreType.OPERATIONAL, path);
     }
 
-    default <O extends DataObject, P extends InstanceIdentifier<O>, T extends Action<P, ?, ?>> T getActionHandle(
-            final Class<T> actionInterface, @SuppressWarnings("unchecked") final DataTreeIdentifier<O>... nodes) {
-        return getActionHandle(actionInterface, ImmutableSet.copyOf(nodes));
+    default <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>> A getActionHandle(
+            final ActionSpec<A, P> spec, @SuppressWarnings("unchecked") final DataTreeIdentifier<P>... nodes) {
+        return getActionHandle(spec, ImmutableSet.copyOf(nodes));
     }
 }