Deprecate ClassToInstance-taking methods

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/DynamicBindingAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/DynamicBindingAdapter.java
index 5cc9bdb36f798e0f80a81edfc8c00a66285d38c8..cf5e586a953344eb1439f589b8dfa9ca206c668e 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/DynamicBindingAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/osgi/DynamicBindingAdapter.java
@@ -13,17 +13,15 @@ import org.opendaylight.mdsal.binding.api.ActionProviderService;
 import org.opendaylight.mdsal.binding.api.ActionService;
 import org.opendaylight.mdsal.binding.api.BindingService;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.DataTreeService;
 import org.opendaylight.mdsal.binding.api.MountPointService;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.api.RpcService;
 import org.opendaylight.mdsal.binding.dom.adapter.spi.AdapterFactory;
 import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeService;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
@@ -55,39 +53,35 @@ public final class DynamicBindingAdapter {
     @Reference
     AdapterFactory factory = null;
     @Reference(target = "(component.factory=" + OSGiActionService.FACTORY_NAME + ")")
-    ComponentFactory actionServiceFactory = null;
+    ComponentFactory<OSGiActionService> actionServiceFactory = null;
     @Reference(target = "(component.factory=" + OSGiActionProviderService.FACTORY_NAME + ")")
-    ComponentFactory actionProviderServiceFactory = null;
+    ComponentFactory<OSGiActionProviderService> actionProviderServiceFactory = null;
     @Reference(target = "(component.factory=" + OSGiDataBroker.FACTORY_NAME + ")")
-    ComponentFactory dataBrokerFactory = null;
-    @Reference(target = "(component.factory=" + OSGiDataTreeService.FACTORY_NAME + ")")
-    ComponentFactory dataTreeServiceFactory = null;
+    ComponentFactory<OSGiDataBroker> dataBrokerFactory = null;
     @Reference(target = "(component.factory=" + OSGiMountPointService.FACTORY_NAME + ")")
-    ComponentFactory mountPointServiceFactory = null;
+    ComponentFactory<OSGiMountPointService> mountPointServiceFactory = null;
     @Reference(target = "(component.factory=" + OSGiNotificationService.FACTORY_NAME + ")")
-    ComponentFactory notificationServiceFactory = null;
+    ComponentFactory<OSGiNotificationService> notificationServiceFactory = null;
     @Reference(target = "(component.factory=" + OSGiNotificationPublishService.FACTORY_NAME + ")")
-    ComponentFactory notificationPublishServiceFactory = null;
-    @Reference(target = "(component.factory=" + OSGiRpcConsumerRegistry.FACTORY_NAME + ")")
-    ComponentFactory rpcConsumerRegistryFactory = null;
+    ComponentFactory<OSGiNotificationPublishService> notificationPublishServiceFactory = null;
+    @Reference(target = "(component.factory=" + OSGiRpcService.FACTORY_NAME + ")")
+    ComponentFactory<OSGiRpcService> rpcServiceFactory = null;
     @Reference(target = "(component.factory=" + OSGiRpcProviderService.FACTORY_NAME + ")")
-    ComponentFactory rpcProviderServiceFactory = null;
+    ComponentFactory<OSGiRpcProviderService> rpcProviderServiceFactory = null;
 
     @Activate
     void activate(final BundleContext ctx) {
         trackers = ImmutableList.of(
             new AdaptingTracker<>(ctx, DOMDataBroker.class, DataBroker.class, factory::createDataBroker,
                     dataBrokerFactory),
-            new AdaptingTracker<>(ctx, DOMDataTreeService.class, DataTreeService.class, factory::createDataTreeService,
-                    dataTreeServiceFactory),
             new AdaptingTracker<>(ctx, DOMMountPointService.class, MountPointService.class,
                     factory::createMountPointService, mountPointServiceFactory),
             new AdaptingTracker<>(ctx, DOMNotificationService.class, NotificationService.class,
                     factory::createNotificationService, notificationServiceFactory),
             new AdaptingTracker<>(ctx, DOMNotificationPublishService.class, NotificationPublishService.class,
                     factory::createNotificationPublishService, notificationPublishServiceFactory),
-            new AdaptingTracker<>(ctx, DOMRpcService.class, RpcConsumerRegistry.class,
-                    factory::createRpcConsumerRegistry, rpcConsumerRegistryFactory),
+            new AdaptingTracker<>(ctx, DOMRpcService.class, RpcService.class,
+                    factory::createRpcService, rpcServiceFactory),
             new AdaptingTracker<>(ctx, DOMRpcProviderService.class, RpcProviderService.class,
                     factory::createRpcProviderService, rpcProviderServiceFactory),
             new AdaptingTracker<>(ctx, DOMActionService.class, ActionService.class, factory::createActionService,