Improve RpcProviderService.registerRpcImplementations()

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcProviderService.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcProviderService.java
index d1f6880944c070afa7d5c0653b36208a61ee49ba..d1694dca77ca28cf5f40e49495110c4df5890bea 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcProviderService.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcProviderService.java
@@ -7,74 +7,64 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.osgi;
 
-import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.Rpc;
-import org.opendaylight.yangtools.yang.binding.RpcService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 
-@Beta
 @Component(factory = OSGiRpcProviderService.FACTORY_NAME)
 public final class OSGiRpcProviderService extends AbstractAdaptedService<RpcProviderService>
         implements RpcProviderService {
     // OSGi DS Component Factory name
     static final String FACTORY_NAME = "org.opendaylight.mdsal.binding.dom.adapter.osgi.OSGiRpcProviderService";
 
-    public OSGiRpcProviderService() {
-        super(RpcProviderService.class);
-    }
-
-    @Override
-    @Deprecated
-    public <R extends RpcService, I extends R> ObjectRegistration<I> registerRpcImplementation(final Class<R> type,
-            final I implementation) {
-        return delegate().registerRpcImplementation(type, implementation);
+    @Activate
+    public OSGiRpcProviderService(final Map<String, ?> properties) {
+        super(RpcProviderService.class, properties);
     }
 
-    @Override
-    @Deprecated
-    public <R extends RpcService, I extends R> ObjectRegistration<I> registerRpcImplementation(final Class<R> type,
-            final I implementation, final Set<InstanceIdentifier<?>> paths) {
-        return delegate().registerRpcImplementation(type, implementation, paths);
+    @Deactivate
+    void deactivate(final int reason) {
+        stop(reason);
     }
 
     @Override
     public Registration registerRpcImplementation(final Rpc<?, ?> implementation) {
-        return delegate().registerRpcImplementation(implementation);
+        return delegate.registerRpcImplementation(implementation);
     }
 
     @Override
     public Registration registerRpcImplementation(final Rpc<?, ?> implementation,
             final Set<InstanceIdentifier<?>> paths) {
-        return delegate().registerRpcImplementation(implementation, paths);
+        return delegate.registerRpcImplementation(implementation, paths);
     }
 
     @Override
-    public Registration registerRpcImplementations(final ClassToInstanceMap<Rpc<?, ?>> implementations) {
-        return delegate().registerRpcImplementations(implementations);
+    public Registration registerRpcImplementations(final Collection<Rpc<?, ?>> implementations) {
+        return delegate.registerRpcImplementations(implementations);
     }
 
     @Override
-    public Registration registerRpcImplementations(final ClassToInstanceMap<Rpc<?, ?>> implementations,
+    public Registration registerRpcImplementations(final Collection<Rpc<?, ?>> implementations,
             final Set<InstanceIdentifier<?>> paths) {
-        return delegate().registerRpcImplementations(implementations, paths);
+        return delegate.registerRpcImplementations(implementations, paths);
     }
 
-    @Activate
-    void activate(final Map<String, ?> properties) {
-        start(properties);
+    @Override
+    public Registration registerRpcImplementations(final ClassToInstanceMap<Rpc<?, ?>> implementations) {
+        return delegate.registerRpcImplementations(implementations);
     }
 
-    @Deactivate
-    void deactivate(final int reason) {
-        stop(reason);
+    @Override
+    public Registration registerRpcImplementations(final ClassToInstanceMap<Rpc<?, ?>> implementations,
+            final Set<InstanceIdentifier<?>> paths) {
+        return delegate.registerRpcImplementations(implementations, paths);
     }
 }