Correct ActionService generics

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / osgi / OSGiActionProviderService.java

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiActionProviderService.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiActionProviderService.java
index 1226faabcf9a0c634aeace8663b3c56b69638da9..d04182e9dc03e2c4d022dbb49723f42de85104ae 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiActionProviderService.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiActionProviderService.java
@@ -10,9 +10,8 @@ package org.opendaylight.mdsal.binding.dom.adapter.osgi;
 import com.google.common.annotations.Beta;
 import java.util.Map;
 import java.util.Set;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.ActionProviderService;
-import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.ActionSpec;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.Action;
@@ -34,11 +33,10 @@ public final class OSGiActionProviderService extends AbstractAdaptedService<Acti
     }
 
     @Override
-    public <O extends @NonNull DataObject, P extends @NonNull InstanceIdentifier<O>,
-            T extends @NonNull Action<P, ?, ?>, S extends T> @NonNull ObjectRegistration<S> registerImplementation(
-                    final Class<T> actionInterface, final S implementation, final LogicalDatastoreType datastore,
-                    final Set<@NonNull DataTreeIdentifier<O>> validNodes) {
-        return delegate().registerImplementation(actionInterface, implementation, datastore, validNodes);
+    public <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>, S extends A>
+        ObjectRegistration<S> registerImplementation(final ActionSpec<A, P> spec, final S implementation,
+            final LogicalDatastoreType datastore, final Set<? extends InstanceIdentifier<P>> validNodes) {
+        return delegate().registerImplementation(spec, implementation, datastore, validNodes);
     }
 
     @Activate
@@ -47,7 +45,7 @@ public final class OSGiActionProviderService extends AbstractAdaptedService<Acti
     }
 
     @Deactivate
-    void deactivate() {
-        stop();
+    void deactivate(final int reason) {
+        stop(reason);
     }
 }