summaryrefslogtreecommitdiffstats
path: root/dataChange/provider
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2018-12-20 14:29:35 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-11 17:05:43 -0500
commit90adbb654c878bfc9e1ba61c75feb3cba8280733 (patch)
treefc64077e7eae83fdb018b48f62bd74096fea8b76 /dataChange/provider
parentc3888cff5246447a2b011e27f130fcd087c60295 (diff)
Code changes to sli/northbound for ODL Fluorine
Code changes needed to support port to ODL Fluorine. Change-Id: If898ed120a3d03773db815f797f1eee633ca77e3 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'dataChange/provider')
-rwxr-xr-xdataChange/provider/pom.xml20
-rw-r--r--dataChange/provider/src/main/java/org/onap/ccsdk/sli/northbound/DataChangeProvider.java4
-rw-r--r--dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java2
3 files changed, 17 insertions, 9 deletions
diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 09b7741d..dd08e3ea 100755
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>dataChange-provider</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
@@ -19,6 +19,18 @@
<properties>
<ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
@@ -26,10 +38,6 @@
<artifactId>dataChange-model</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
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 f272dbbc..3301ca8e 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
@@ -25,7 +25,6 @@ package org.onap.ccsdk.sli.northbound;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -43,6 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
/**
* Defines a base implementation for your provider. This class extends from a helper class
@@ -98,7 +98,7 @@ public class DataChangeProvider implements AutoCloseable, DataChangeService {
}
@Override
- public Future<RpcResult<DataChangeNotificationOutput>> dataChangeNotification(
+ public ListenableFuture<RpcResult<DataChangeNotificationOutput>> dataChangeNotification(
DataChangeNotificationInput input) {
final String svcOperation = "data-change-notification";
diff --git a/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java b/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
index 7855375a..f9c39b70 100644
--- a/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
+++ b/dataChange/provider/src/test/java/org/onap/sdnc/northbound/dataChange/TestDataChange.java
@@ -19,7 +19,7 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.sdnc.northbound;
+package org.onap.sdnc.northbound.dataChange;
import org.junit.Before;
import org.junit.Test;