summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurav Agrawal <gaurav.agrawal@huawei.com>2017-09-18 18:37:49 +0530
committerGaurav Agrawal <gaurav.agrawal@huawei.com>2017-09-18 18:37:49 +0530
commitbf092c7f773e69b1723369f427edb957ccc6f4f1 (patch)
tree481953050b043c1f26dc26abf794b5a9f0393106
parent58f195402881a8b59fe394578c133fb7689c06d1 (diff)
Replace deprecated API with newer one
Replace following deprecated API 1) NotificationProviderService replaced with NotificationPublishService 2) InstanceIdentifier<T> toInstance() replace with build() Change-Id: I50195bf123052270edf3fd9f74af00262a01e650 Issue-Id: CCSDK-93 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
-rw-r--r--asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java19
-rw-r--r--asdcApi/provider/src/main/resources/org/opendaylight/blueprint/asdc-blueprint.xml2
2 files changed, 9 insertions, 12 deletions
diff --git a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
index 13198d62..b9c897ec 100644
--- a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
@@ -28,12 +28,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.yang.gen.v1.http.xmlns.onap.org.asdc.license.model._1._0.rev160427.vf.license.model.grouping.VfLicenseModel;
import org.opendaylight.yang.gen.v1.org.onap.ccsdk.rev170201.ASDCAPIService;
@@ -103,21 +103,21 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
private final ExecutorService executor;
protected DataBroker dataBroker;
- protected NotificationProviderService notificationService;
+ protected NotificationPublishService notificationService;
protected RpcProviderRegistry rpcRegistry;
private final AsdcApiSliClient asdcApiSliClient;
protected BindingAwareBroker.RpcRegistration<ASDCAPIService> rpcRegistration;
public AsdcApiProvider(final DataBroker dataBroker,
- final NotificationProviderService notificationProviderService,
+ final NotificationPublishService notificationPublishService,
final RpcProviderRegistry rpcProviderRegistry,
final AsdcApiSliClient asdcApiSliClient) {
LOG.info("Creating provider for {}", APPLICATION_NAME);
executor = Executors.newFixedThreadPool(1);
this.dataBroker = dataBroker;
- notificationService = notificationProviderService;
+ notificationService = notificationPublishService;
rpcRegistry = rpcProviderRegistry;
this.asdcApiSliClient= asdcApiSliClient;
initialize();
@@ -179,7 +179,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
protected boolean artifactVersionExists(String aName, String aVersion) {
InstanceIdentifier artifactInstanceId =
InstanceIdentifier.<Artifacts>builder(Artifacts.class)
- .child(Artifact.class, new ArtifactKey(aName, aVersion)).toInstance();
+ .child(Artifact.class, new ArtifactKey(aName, aVersion)).build();
ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
Optional<Artifact> data = null;
try {
@@ -212,8 +212,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
.<Artifacts> builder(Artifacts.class)
.child(Artifact.class, artifact.getKey());
- InstanceIdentifier<Artifact> path = aIdBuilder
- .toInstance();
+ InstanceIdentifier<Artifact> path = aIdBuilder.build();
WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
@@ -248,8 +247,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
.<VfLicenseModelVersions> builder(VfLicenseModelVersions.class)
.child(VfLicenseModelVersion.class, version.getKey());
- InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder
- .toInstance();
+ InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder.build();
WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
tx.merge(LogicalDatastoreType.CONFIGURATION, path,
@@ -275,8 +273,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
.<VfLicenseModelVersions> builder(VfLicenseModelVersions.class)
.child(VfLicenseModelVersion.class, version.getKey());
- InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder
- .toInstance();
+ InstanceIdentifier<VfLicenseModelVersion> path = versionIdBuilder.build();
WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
diff --git a/asdcApi/provider/src/main/resources/org/opendaylight/blueprint/asdc-blueprint.xml b/asdcApi/provider/src/main/resources/org/opendaylight/blueprint/asdc-blueprint.xml
index 6229db1f..810ce8c5 100644
--- a/asdcApi/provider/src/main/resources/org/opendaylight/blueprint/asdc-blueprint.xml
+++ b/asdcApi/provider/src/main/resources/org/opendaylight/blueprint/asdc-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"