Replace deprecated APIs with newer one

Replace following deprecated API
1) NotificationProviderService replaced with NotificationPublishService

Change-Id: I3d5117e63083ce77553feb3d3f6d6265576da646
Issue-Id: CCSDK-93
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

diff --git a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
index 0977fa0..2b45cc7 100644 (file)
--- a/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
+++ b/dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java
@@ -28,6 +28,7 @@ import java.util.concurrent.Future;
 
 import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
@@ -58,21 +59,21 @@ public class DataChangeProvider implements AutoCloseable, DataChangeService {
     private final ExecutorService executor;
 
     protected DataBroker dataBroker;
-    protected NotificationProviderService notificationService;
+    protected NotificationPublishService notificationService;
     protected RpcProviderRegistry rpcRegistry;
     protected BindingAwareBroker.RpcRegistration<DataChangeService> rpcRegistration;
     private final DataChangeClient dataChangeClient;
 
 
     public DataChangeProvider(final DataBroker dataBroker,
-                                                         final NotificationProviderService notificationProviderService,
+                                                         final NotificationPublishService notificationPublishService,
                                                          final RpcProviderRegistry rpcProviderRegistry,
                                                          final DataChangeClient dataChangeClient) {
 
         this.LOG.info( "Creating provider for {}", APPLICATION_NAME);
         executor = Executors.newFixedThreadPool(1);
                this.dataBroker = dataBroker;
-               this.notificationService = notificationProviderService;
+               this.notificationService = notificationPublishService;
                this.rpcRegistry = rpcProviderRegistry;
                this.dataChangeClient = dataChangeClient;
                initialize();

diff --git a/dataChange/provider/src/main/resources/org/opendaylight/blueprint/datachange-blueprint.xml b/dataChange/provider/src/main/resources/org/opendaylight/blueprint/datachange-blueprint.xml
index b826b01..0329301 100644 (file)
--- a/dataChange/provider/src/main/resources/org/opendaylight/blueprint/datachange-blueprint.xml
+++ b/dataChange/provider/src/main/resources/org/opendaylight/blueprint/datachange-blueprint.xml
@@ -15,7 +15,7 @@
                odl:type="default" />
 
     <reference id="notificationService"
-               interface="org.opendaylight.controller.sal.binding.api.NotificationProviderService"
+               interface="org.opendaylight.controller.sal.binding.impl.NotificationPublishService"
                odl:type="default" />
 
     <reference id="rpcRegistry"

diff --git a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
index 2913273..f7ca378 100755 (executable)
--- a/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
+++ b/dataChange/provider/src/main/yang/DataChange-provider-impl.yang
@@ -6,6 +6,10 @@ module DataChange-provider-impl {
 
     import config { prefix config; revision-date 2013-04-05; }
     import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
+    import opendaylight-sal-binding-broker-impl {
+        prefix binding-impl;
+        revision-date 2013-10-28;
+    }
 
      description
         "This module contains the base YANG definitions for
@@ -39,11 +43,11 @@ module DataChange-provider-impl {
                 }
             }
 
-            container notification-service {
+            container notification-publish-adapter {
                 uses config:service-ref {
                     refine type {
                         mandatory true;
-                        config:required-identity mdsal:binding-notification-service;
+                        config:required-identity binding-impl:binding-new-notification-publish-service;
                     }
                 }
             }