summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-18 20:02:55 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-18 20:02:55 +0000
commit298d795205068f9ba7ce548a09bec474b8375270 (patch)
tree07791ff2f043215766b812731137cfde06ff6464
parentbf092c7f773e69b1723369f427edb957ccc6f4f1 (diff)
parentb36a9d940c2a865af5b43cad9822f05492235f75 (diff)
Merge "Replace deprecated APIs with newer one"
-rw-r--r--dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java7
-rw-r--r--dataChange/provider/src/main/resources/org/opendaylight/blueprint/datachange-blueprint.xml2
-rwxr-xr-xdataChange/provider/src/main/yang/DataChange-provider-impl.yang8
3 files changed, 11 insertions, 6 deletions
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 0977fa0b7..2b45cc7d7 100644
--- 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 b826b0113..03293015b 100644
--- 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 2913273de..f7ca378b6 100755
--- 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;
}
}
}