aboutsummaryrefslogtreecommitdiffstats
path: root/appc-inbound/appc-interfaces-service
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-02-22 13:37:19 -0800
committerPatrick Brady <patrick.brady@att.com>2019-02-25 22:33:05 +0000
commit13c0353d0f637ec88ca4cdbeb64c4de3917e6a2b (patch)
treea9d1561322f2f66556aa7c8a6e3ddae592a23d08 /appc-inbound/appc-interfaces-service
parent356dba9fb407b1df3fe89a4c8f082a09aa564d36 (diff)
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 <patrick.brady@att.com> Issue-ID: APPC-1370
Diffstat (limited to 'appc-inbound/appc-interfaces-service')
-rw-r--r--appc-inbound/appc-interfaces-service/bundle/pom.xml10
-rw-r--r--appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java7
-rw-r--r--appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml8
-rw-r--r--appc-inbound/appc-interfaces-service/model/pom.xml4
4 files changed, 7 insertions, 22 deletions
diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml
index 8241325f9..b9b7a3fd0 100644
--- a/appc-inbound/appc-interfaces-service/bundle/pom.xml
+++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml
@@ -3,7 +3,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
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -90,14 +90,6 @@
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
diff --git a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java
index caf024739..ba05de733 100644
--- a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.java
+++ b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProviderImpl.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
* ================================================================================
@@ -26,8 +26,6 @@
package org.onap.appc.interfaces.service;
-import java.util.concurrent.Future;
-
import org.opendaylight.yang.gen.v1.org.onap.appc.interfaces.service.rev170818.ExecuteServiceInput;
import org.opendaylight.yang.gen.v1.org.onap.appc.interfaces.service.rev170818.ExecuteServiceOutput;
import org.opendaylight.yang.gen.v1.org.onap.appc.interfaces.service.rev170818.ExecuteServiceOutputBuilder;
@@ -41,13 +39,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
public class InterfacesServiceProviderImpl implements InterfacesServiceService{
private static final Logger log = LoggerFactory.getLogger(InterfacesServiceProviderImpl.class);
@Override
- public Future<RpcResult<ExecuteServiceOutput>> executeService(ExecuteServiceInput input) {
+ public ListenableFuture<RpcResult<ExecuteServiceOutput>> executeService(ExecuteServiceInput input) {
log.info("Received Request: " + input.getRequest().getRequestId() + " Action : " +
input.getRequest().getAction() + " with RequestData :" + input.getRequest().getRequestData() + " and data-Type : " + input.getRequest().getRequestDataType());
diff --git a/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml
index fb3fd9569..56e5e8091 100644
--- a/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml
+++ b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
-Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
=============================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -38,12 +38,6 @@ limitations under the License.
<dependencies>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>odl-mdsal-models</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
<groupId>org.onap.appc</groupId>
<artifactId>appc-interfaces-service-model</artifactId>
<version>${project.version}</version>
diff --git a/appc-inbound/appc-interfaces-service/model/pom.xml b/appc-inbound/appc-interfaces-service/model/pom.xml
index 466cb18c8..382da303a 100644
--- a/appc-inbound/appc-interfaces-service/model/pom.xml
+++ b/appc-inbound/appc-interfaces-service/model/pom.xml
@@ -167,11 +167,11 @@
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types</artifactId>
+ <artifactId>ietf-inet-types-2013-07-15</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types</artifactId>
+ <artifactId>ietf-yang-types-20130715</artifactId>
</dependency>
</dependencies>
<version>1.5.0-SNAPSHOT</version>