aboutsummaryrefslogtreecommitdiffstats
path: root/appc-inbound/appc-design-services/provider
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-design-services/provider
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-design-services/provider')
-rwxr-xr-xappc-inbound/appc-design-services/provider/pom.xml10
-rw-r--r--appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/impl/DesignServicesImpl.java10
2 files changed, 6 insertions, 14 deletions
diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml
index e53bec080..e3ecf887a 100755
--- a/appc-inbound/appc-design-services/provider/pom.xml
+++ b/appc-inbound/appc-design-services/provider/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
Modification Copyright (C) 2018 IBM
================================================================================
@@ -93,14 +93,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-design-services/provider/src/main/java/org/onap/appc/design/services/impl/DesignServicesImpl.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/impl/DesignServicesImpl.java
index 890f40d3d..5833b0157 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/impl/DesignServicesImpl.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/impl/DesignServicesImpl.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,7 +26,7 @@
package org.onap.appc.design.services.impl;
import com.google.common.util.concurrent.Futures;
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
import org.onap.appc.design.dbervices.DbResponseProcessor;
import org.onap.appc.design.dbervices.DesignDBService;
import org.onap.appc.design.services.util.DesignServiceConstants;
@@ -58,7 +58,7 @@ public class DesignServicesImpl implements DesignServicesService {
private static final String ACTION_STR = " Action : ";
@Override
- public Future<RpcResult<DbserviceOutput>> dbservice(DbserviceInput input) {
+ public ListenableFuture<RpcResult<DbserviceOutput>> dbservice(DbserviceInput input) {
log.info(RECEIVED_REQUEST_STR + input.getDesignRequest().getRequestId() + ACTION_STR +
input.getDesignRequest().getAction() + WITH_PAYLOAD_STR + input.getDesignRequest().getPayload());
@@ -93,7 +93,7 @@ public class DesignServicesImpl implements DesignServicesService {
}
@Override
- public Future<RpcResult<XinterfaceserviceOutput>> xinterfaceservice(XinterfaceserviceInput input) {
+ public ListenableFuture<RpcResult<XinterfaceserviceOutput>> xinterfaceservice(XinterfaceserviceInput input) {
log.info(RECEIVED_REQUEST_STR + input.getDesignRequest().getRequestId() + ACTION_STR +
input.getDesignRequest().getAction() + WITH_PAYLOAD_STR + input.getDesignRequest().getPayload());
XinterfaceserviceOutputBuilder outputBuilder = new XinterfaceserviceOutputBuilder();
@@ -124,7 +124,7 @@ public class DesignServicesImpl implements DesignServicesService {
}
@Override
- public Future<RpcResult<ValidatorOutput>> validator(ValidatorInput input) {
+ public ListenableFuture<RpcResult<ValidatorOutput>> validator(ValidatorInput input) {
log.info(RECEIVED_REQUEST_STR + input.getDesignRequest().getRequestId() + ACTION_STR +
input.getDesignRequest().getAction() + WITH_PAYLOAD_STR + input.getDesignRequest().getPayload()
+ " and Data Type = " + input.getDesignRequest().getDataType());