From 13c0353d0f637ec88ca4cdbeb64c4de3917e6a2b Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 22 Feb 2019 13:37:19 -0800 Subject: Changes for new odl version Changes required to update to latest opendaylight version. Some powermock tests have been temporarily removed due to an powermock incompatibility. They will be fixed and re-added. Change-Id: I418d44913fcd42423d2d9bd37b189f6301eaab81 Signed-off-by: Patrick Brady Issue-ID: APPC-1370 --- .../onap/appc/seqgen/provider/SequenceGeneratorProvider.java | 11 ++++++----- .../opendaylight/blueprint/sequence-generator-blueprint.xml | 2 +- .../appc/seqgen/provider/SequenceGeneratorProviderTest.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'appc-sequence-generator/appc-sequence-generator-bundle/src') diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java index 86d51e393..1dd5fefdd 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/provider/SequenceGeneratorProvider.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -57,7 +57,7 @@ import org.onap.appc.seqgen.objects.SequenceGeneratorInputBuilder; import org.onap.appc.seqgen.objects.Transaction; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.NotificationProviderService; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceInput; import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceOutput; @@ -80,18 +80,19 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; public class SequenceGeneratorProvider implements AutoCloseable,SequenceGeneratorService { protected DataBroker dataBroker; protected RpcProviderRegistry rpcRegistry; - protected NotificationProviderService notificationService; + protected NotificationPublishService notificationService; protected BindingAwareBroker.RpcRegistration rpcRegistration; private final EELFLogger log = EELFManager.getInstance().getLogger(SequenceGeneratorProvider.class); private final ExecutorService executor; private final static String APP_NAME = "SequenceGeneratorProvider"; - public SequenceGeneratorProvider(DataBroker dataBroker2, NotificationProviderService notificationProviderService, + public SequenceGeneratorProvider(DataBroker dataBroker2, NotificationPublishService notificationProviderService, RpcProviderRegistry rpcRegistry2) { log.info("Creating provider for " + APP_NAME); executor = Executors.newFixedThreadPool(1); @@ -119,7 +120,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato } @Override - public Future> generateSequence(GenerateSequenceInput input) { + public ListenableFuture> generateSequence(GenerateSequenceInput input) { RpcResult rpcResult=null; log.debug("Received input = " + input ); try { diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org/opendaylight/blueprint/sequence-generator-blueprint.xml b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org/opendaylight/blueprint/sequence-generator-blueprint.xml index 9d04a0608..2a7c55636 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org/opendaylight/blueprint/sequence-generator-blueprint.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/resources/org/opendaylight/blueprint/sequence-generator-blueprint.xml @@ -42,4 +42,4 @@ - + \ No newline at end of file diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/onap/appc/seqgen/provider/SequenceGeneratorProviderTest.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/onap/appc/seqgen/provider/SequenceGeneratorProviderTest.java index 7f54718f0..bd4445ba4 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/onap/appc/seqgen/provider/SequenceGeneratorProviderTest.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/java/org/onap/appc/seqgen/provider/SequenceGeneratorProviderTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.NotificationProviderService; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceInput; import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceInputBuilder; @@ -56,7 +56,7 @@ public class SequenceGeneratorProviderTest { private DataBroker dataBroker = Mockito.mock(DataBroker.class); private RpcProviderRegistry rpcRegistry = Mockito.mock(RpcProviderRegistry.class); - private NotificationProviderService notificationService = Mockito.mock(NotificationProviderService.class); + private NotificationPublishService notificationService = Mockito.mock(NotificationPublishService.class); @Test public void testClose() throws Exception { -- cgit 1.2.3-korg