From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 4 Sep 2017 21:37:25 -0700 Subject: Change to CCSDK and ODL Carbon Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc Signed-off-by: Patrick Brady Issue-Id: [APPC-91] Issue-Id: [APPC-158] --- appc-outbound/appc-aai-client/provider/pom.xml | 5 +++-- .../java/org/openecomp/appc/aai/client/aai/AaiService.java | 12 ++++++------ .../org/openecomp/appc/aai/client/node/AAIResourceNode.java | 6 +++--- .../org/openecomp/appc/aai/client/aai/MockAaiService.java | 6 +++--- .../org/openecomp/appc/aai/client/aai/TestAaiService.java | 4 ++-- .../org/openecomp/appc/aai/client/node/MockAaiService.java | 4 ++-- .../openecomp/appc/aai/client/node/TestAAIResourceNode.java | 6 +++--- appc-outbound/appc-network-inventory-client/provider/pom.xml | 10 +++++----- .../appc/instar/interfaceImpl/InstarResponseHandlerImpl.java | 2 +- .../appc/instar/interfaceImpl/InterfaceIpAddressImpl.java | 2 +- .../org/openecomp/appc/instar/node/InstarClientNode.java | 6 +++--- .../instar/interfaceImpl/TestInstarResponseHandlerImpl.java | 2 +- .../instar/interfaceImpl/TestInterfaceIpAddressImpl.java | 2 +- .../org/openecomp/appc/instar/node/TestInstarClientNode.java | 2 +- 14 files changed, 35 insertions(+), 34 deletions(-) (limited to 'appc-outbound') diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml index 0604b1ad0..3d63620f1 100755 --- a/appc-outbound/appc-aai-client/provider/pom.xml +++ b/appc-outbound/appc-aai-client/provider/pom.xml @@ -21,14 +21,15 @@ ${equinox.osgi.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider compile - org.openecomp.sdnc.adaptors + org.onap.ccsdk.sli.adaptors aai-service-provider + ${ccsdk.sli.plugins.version} compile diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java index 388f5caa1..921417ad7 100644 --- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java +++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/aai/AaiService.java @@ -34,16 +34,16 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; import org.openecomp.appc.aai.client.AppcAaiClientConstant; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.aai.AAIClient; -import org.openecomp.sdnc.sli.aai.AAIService; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; +import org.onap.ccsdk.sli.adaptors.aai.AAIService; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java index d2797c8db..a65143882 100644 --- a/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java +++ b/appc-outbound/appc-aai-client/provider/src/main/java/org/openecomp/appc/aai/client/node/AAIResourceNode.java @@ -42,9 +42,9 @@ import org.openecomp.appc.aai.client.aai.AaiService; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; //import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java index a58522ac8..b330cdb23 100644 --- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java +++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/MockAaiService.java @@ -35,9 +35,9 @@ import org.apache.commons.lang3.StringUtils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicResource; -import org.openecomp.sdnc.sli.aai.AAIClient; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicResource; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; public class MockAaiService extends AaiService { diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java index 0207d0a63..050d5bfae 100644 --- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java +++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/aai/TestAaiService.java @@ -30,8 +30,8 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.aai.AAIClient; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java index ac7a6735d..29f77a9fd 100644 --- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java +++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/MockAaiService.java @@ -36,8 +36,8 @@ import org.openecomp.appc.aai.client.aai.AaiService; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.aai.AAIClient; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; public class MockAaiService extends AaiService { diff --git a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java index c589dc300..9653af11a 100644 --- a/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java +++ b/appc-outbound/appc-aai-client/provider/src/test/java/org/openecomp/appc/aai/client/node/TestAAIResourceNode.java @@ -45,10 +45,10 @@ import org.openecomp.appc.aai.client.aai.TestAaiService; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.aai.AAIClient; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index f6e969cdc..597021596 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -64,13 +64,13 @@ org.powermock powermock-api-mockito - 1.6.2 + 1.6.4 test org.powermock powermock-module-junit4 - 1.6.2 + 1.6.4 test @@ -79,15 +79,15 @@ ${project.version} - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-provider - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core dblib-provider diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java index 3292253da..57b8b9dec 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InstarResponseHandlerImpl.java @@ -29,7 +29,7 @@ import org.json.JSONObject; import org.openecomp.appc.instar.interfaces.ResponseHandlerInterface; import org.openecomp.appc.instar.utils.InstarClientConstant; import org.openecomp.sdnc.config.params.data.ResponseKey; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java index 2d94331aa..c0de909c7 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java @@ -34,7 +34,7 @@ import org.openecomp.appc.instar.node.InstarClientNode; import org.openecomp.appc.instar.utils.InstarClientConstant; import org.openecomp.sdnc.config.params.data.Parameter; import org.openecomp.sdnc.config.params.data.ResponseKey; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java index 17ce64422..f120f9995 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/openecomp/appc/instar/node/InstarClientNode.java @@ -40,9 +40,9 @@ import org.openecomp.appc.instar.interfaces.RestClientInterface; import org.openecomp.appc.instar.interfaces.RuleHandlerInterface; import org.openecomp.appc.instar.utils.InstarClientConstant; import org.openecomp.sdnc.config.params.data.Parameter; -import org.openecomp.sdnc.sli.SvcLogicContext; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicJavaPlugin; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class InstarClientNode implements SvcLogicJavaPlugin { diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java index d5b082472..e2055ef6d 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInstarResponseHandlerImpl.java @@ -26,7 +26,7 @@ package org.openecomp.appc.instar.interfaceImpl; import org.junit.Test; import org.openecomp.sdnc.config.params.data.ResponseKey; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestInstarResponseHandlerImpl { diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java index 6b71bb1d3..1217a7488 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/interfaceImpl/TestInterfaceIpAddressImpl.java @@ -29,7 +29,7 @@ import java.util.List; import org.junit.Test; import org.openecomp.sdnc.config.params.data.Parameter; import org.openecomp.sdnc.config.params.data.ResponseKey; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestInterfaceIpAddressImpl { diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java index 00e580c39..6901d24b8 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/openecomp/appc/instar/node/TestInstarClientNode.java @@ -38,7 +38,7 @@ import org.junit.Assert; import org.junit.Test; import org.openecomp.appc.instar.dme2client.SecureRestClientTrustManager; import org.openecomp.appc.instar.utils.InstarClientConstant; -import org.openecomp.sdnc.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; -- cgit 1.2.3-korg