Use constructor activation for adapted services

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcService.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcService.java
index ba272cf66f51ddbc2d61ac6ce8ad7c7e4303498a..dbbc69294f98a6de4bf22f5e81ebec389caa5a15 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcService.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/OSGiRpcService.java
@@ -7,36 +7,32 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.osgi;
 
-import com.google.common.annotations.Beta;
 import java.util.Map;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.mdsal.binding.api.RpcService;
 import org.opendaylight.yangtools.yang.binding.Rpc;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 
-@Beta
+@NonNullByDefault
 @Component(factory = OSGiRpcService.FACTORY_NAME)
 public final class OSGiRpcService extends AbstractAdaptedService<RpcService> implements RpcService {
     // OSGi DS Component Factory name
     static final String FACTORY_NAME = "org.opendaylight.mdsal.binding.dom.adapter.osgi.OSGiRpcConsumerRegistry";
 
-    public OSGiRpcService() {
-        super(RpcService.class);
-    }
-
-    @Override
-    public <T extends Rpc<?, ?>> T getRpc(final Class<T> rpcInterface) {
-        return delegate().getRpc(rpcInterface);
-    }
-
     @Activate
-    void activate(final Map<String, ?> properties) {
-        start(properties);
+    public OSGiRpcService(final Map<String, ?> properties) {
+        super(RpcService.class, properties);
     }
 
     @Deactivate
     void deactivate(final int reason) {
         stop(reason);
     }
+
+    @Override
+    public <T extends Rpc<?, ?>> T getRpc(final Class<T> rpcInterface) {
+        return delegate.getRpc(rpcInterface);
+    }
 }