aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml10
-rw-r--r--src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java6
-rw-r--r--src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java2
-rw-r--r--src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java10
-rw-r--r--src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java2
-rw-r--r--src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java4
7 files changed, 22 insertions, 22 deletions
diff --git a/pom.xml b/pom.xml
index 5fa480f..e5d6ba6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,15 +121,15 @@
</dependency>
<dependency>
- <groupId>org.openecomp.aai.logging-service</groupId>
+ <groupId>org.onap.aai.logging-service</groupId>
<artifactId>common-logging</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.openecomp.aai</groupId>
+ <groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -202,7 +202,7 @@
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
- <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
+ <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
<dockerDirectory>${docker.location}</dockerDirectory>
<imageTags>
<imageTag>latest</imageTag>
diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
index e8c3194..cee12da 100644
--- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
@@ -61,9 +61,9 @@ import org.openecomp.datarouter.util.SearchServiceAgent;
import org.openecomp.datarouter.util.SearchSuggestionPermutation;
import org.openecomp.datarouter.util.Version;
import org.openecomp.datarouter.util.VersionedOxmEntities;
-import org.openecomp.restclient.client.Headers;
-import org.openecomp.restclient.client.OperationResult;
-import org.openecomp.restclient.rest.HttpUtil;
+import org.onap.aai.restclient.client.Headers;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.rest.HttpUtil;
import org.slf4j.MDC;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
index aedca66..216b591 100644
--- a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
+++ b/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
@@ -29,7 +29,7 @@ import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.cxf.message.Message;
import org.json.JSONObject;
import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.restclient.client.Headers;
+import org.onap.aai.restclient.client.Headers;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
index 758f584..3aa8f12 100644
--- a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
@@ -40,11 +40,11 @@ import org.openecomp.cl.api.Logger;
import org.openecomp.cl.mdc.MdcContext;
import org.openecomp.datarouter.logging.DataRouterMsgs;
import org.openecomp.datarouter.policy.EntityEventPolicy;
-import org.openecomp.restclient.client.Headers;
-import org.openecomp.restclient.client.OperationResult;
-import org.openecomp.restclient.client.RestClient;
-import org.openecomp.restclient.enums.RestAuthenticationMode;
-import org.openecomp.restclient.rest.HttpUtil;
+import org.onap.aai.restclient.client.Headers;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
+import org.onap.aai.restclient.rest.HttpUtil;
import org.slf4j.MDC;
import com.sun.jersey.core.util.MultivaluedMapImpl;
diff --git a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
index d8d150c..13406a7 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
+++ b/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
@@ -39,15 +39,15 @@ import org.openecomp.datarouter.logging.DataRouterMsgs;
import org.openecomp.datarouter.util.AaiUiSvcPolicyUtil;
import org.openecomp.datarouter.util.NodeUtils;
import org.openecomp.datarouter.util.RouterServiceUtil;
-import org.openecomp.restclient.client.Headers;
-import org.openecomp.restclient.client.OperationResult;
-import org.openecomp.restclient.client.RestClient;
-import org.openecomp.restclient.enums.RestAuthenticationMode;
+import org.onap.aai.restclient.client.Headers;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
import org.slf4j.MDC;
import org.springframework.http.HttpStatus;
-import org.openecomp.restclient.rest.HttpUtil;
+import org.onap.aai.restclient.rest.HttpUtil;
import com.fasterxml.jackson.databind.JsonNode;
public class NoAuthRestClient implements SvcRoutingRestClient {
diff --git a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java b/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
index e22f144..aab9605 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
+++ b/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
@@ -22,7 +22,7 @@
*/
package org.openecomp.datarouter.util.client;
-import org.openecomp.restclient.client.RestClient;
+import org.onap.aai.restclient.client.RestClient;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java b/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java
index 4e4db75..160981d 100644
--- a/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java
+++ b/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java
@@ -37,8 +37,8 @@ import org.apache.camel.impl.DefaultExchange;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.openecomp.restclient.client.OperationResult;
-import org.openecomp.restclient.client.RestClient;
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.restclient.client.RestClient;
public class NoAuthRestClientTest {