From: Arul.Nambi <arul.nambi@amdocs.com>
Date: Thu, 12 Oct 2017 14:42:00 +0000 (-0400)
Subject: Renaming openecomp to onap
X-Git-Tag: v1.1.0~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=commitdiff_plain;h=2a5ff133471c5a69b0dfd760d2743f48112da9a0

Renaming openecomp to onap

Issue-ID: AAI-208
Change-Id: Ib5dc63c9b2f4c580caec21414c2fafae904adca9
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
---

diff --git a/FUNCTIONS.md b/FUNCTIONS.md
index b2090e1..cf0ce87 100644
--- a/FUNCTIONS.md
+++ b/FUNCTIONS.md
@@ -19,7 +19,7 @@ In order to take advantage of the entity change event functionality the followin
                         http://www.springframework.org/schema/beans
                         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-        <bean id="eepConfig" class="org.openecomp.datarouter.policy.EntityEventPolicyConfig" >
+        <bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" >
         	<property name="sourceDomain" value="{domain-origin}" />
            <property name="searchBaseUrl" value="https://{search-service-host}:{search-service-port}" />
            <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
@@ -33,7 +33,7 @@ In order to take advantage of the entity change event functionality the followin
            <property name="searchKeystore" value="{keystore-name}" />
         </bean>
 
-        <bean id="entityEventPolicy" class="org.openecomp.datarouter.policy.EntityEventPolicy" init-method="startup" >
+        <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
             <constructor-arg ref="eepConfig"/>
         </bean>
 	</beans>
diff --git a/ajsc-shared-config/etc/logback.xml b/ajsc-shared-config/etc/logback.xml
index 228872e..80d3b81 100644
--- a/ajsc-shared-config/etc/logback.xml
+++ b/ajsc-shared-config/etc/logback.xml
@@ -179,7 +179,7 @@
   <logger name="com.att.ajsc.csi.logging" level="WARN" />
   <logger name="com.att.ajsc.filemonitor" level="WARN" />
 
-  <logger name="org.openecomp.datarouter" level="INFO" />
+  <logger name="org.onap.aai.datarouter" level="INFO" />
 
   <!-- Other Loggers that may help troubleshoot -->
   <logger name="net.sf" level="WARN" />
diff --git a/bundleconfig-local/etc/logback.xml b/bundleconfig-local/etc/logback.xml
index 228872e..80d3b81 100644
--- a/bundleconfig-local/etc/logback.xml
+++ b/bundleconfig-local/etc/logback.xml
@@ -179,7 +179,7 @@
   <logger name="com.att.ajsc.csi.logging" level="WARN" />
   <logger name="com.att.ajsc.filemonitor" level="WARN" />
 
-  <logger name="org.openecomp.datarouter" level="INFO" />
+  <logger name="org.onap.aai.datarouter" level="INFO" />
 
   <!-- Other Loggers that may help troubleshoot -->
   <logger name="net.sf" level="WARN" />
diff --git a/src/main/ajsc/data-router_v1/data-router/v1/conf/echoService.groovy b/src/main/ajsc/data-router_v1/data-router/v1/conf/echoService.groovy
index ad7670e..a8583f2 100644
--- a/src/main/ajsc/data-router_v1/data-router/v1/conf/echoService.groovy
+++ b/src/main/ajsc/data-router_v1/data-router/v1/conf/echoService.groovy
@@ -3,7 +3,7 @@ beans{
 	xmlns jaxrs: "http://cxf.apache.org/jaxrs"
 	xmlns util: "http://www.springframework.org/schema/util"
 	
-	echoService(org.openecomp.datarouter.service.EchoService)
+	echoService(org.onap.aai.datarouter.service.EchoService)
 
 	
 	util.list(id: 'echoServices') {	
diff --git a/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java b/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
index 0391ae3..fafa7ad 100644
--- a/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
@@ -59,7 +59,7 @@ import java.util.List;
 import javax.json.Json;
 import javax.json.JsonObject;
 
-import org.openecomp.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.NodeUtils;
 
 /**
  * Note: AAIEventEntity is a port forward of IndexDocument Has been renamed here to move forward
diff --git a/src/main/java/org/onap/aai/datarouter/entity/AggregationEntity.java b/src/main/java/org/onap/aai/datarouter/entity/AggregationEntity.java
index 56ef6fd..8a9f5e4 100644
--- a/src/main/java/org/onap/aai/datarouter/entity/AggregationEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/AggregationEntity.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.openecomp.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.NodeUtils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java b/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
index ed8b9fd..54bd081 100644
--- a/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
@@ -24,7 +24,7 @@ package org.onap.aai.datarouter.entity;
 
 import java.util.List;
 
-import org.openecomp.datarouter.util.CrossEntityReference;
+import org.onap.aai.datarouter.util.CrossEntityReference;
 
 
 public class OxmEntityDescriptor {
diff --git a/src/main/java/org/onap/aai/datarouter/entity/SuggestionSearchEntity.java b/src/main/java/org/onap/aai/datarouter/entity/SuggestionSearchEntity.java
index bd3c5b7..57ab616 100644
--- a/src/main/java/org/onap/aai/datarouter/entity/SuggestionSearchEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/SuggestionSearchEntity.java
@@ -32,11 +32,11 @@ import java.util.Map;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.datarouter.search.filters.config.UiFilterConfig;
-import org.openecomp.datarouter.search.filters.config.UiFiltersConfig;
-import org.openecomp.datarouter.search.filters.config.UiFiltersSchemaUtility;
-import org.openecomp.datarouter.util.NodeUtils;
-import org.openecomp.datarouter.util.SearchSuggestionPermutation;
+import org.onap.aai.datarouter.search.filters.config.UiFilterConfig;
+import org.onap.aai.datarouter.search.filters.config.UiFiltersConfig;
+import org.onap.aai.datarouter.search.filters.config.UiFiltersSchemaUtility;
+import org.onap.aai.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.SearchSuggestionPermutation;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java b/src/main/java/org/onap/aai/datarouter/exception/BaseDataRouterException.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java
rename to src/main/java/org/onap/aai/datarouter/exception/BaseDataRouterException.java
index cc56d05..64ce48b 100644
--- a/src/main/java/org/openecomp/datarouter/exception/BaseDataRouterException.java
+++ b/src/main/java/org/onap/aai/datarouter/exception/BaseDataRouterException.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.exception;
+package org.onap.aai.datarouter.exception;
 
 /*
  * COPYRIGHT NOTICE: Copyright (c) 2016 Team Pacifica (Amdocs & AT&T) The contents and intellectual
diff --git a/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java b/src/main/java/org/onap/aai/datarouter/exception/DataRouterError.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/exception/DataRouterError.java
rename to src/main/java/org/onap/aai/datarouter/exception/DataRouterError.java
index a96d2db..87fc3fc 100644
--- a/src/main/java/org/openecomp/datarouter/exception/DataRouterError.java
+++ b/src/main/java/org/onap/aai/datarouter/exception/DataRouterError.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.exception;
+package org.onap.aai.datarouter.exception;
 
 /*
  * COPYRIGHT NOTICE: Copyright (c) 2016 Team Pacifica (Amdocs & AT&T) The contents and intellectual
diff --git a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java b/src/main/java/org/onap/aai/datarouter/logging/DataRouterMsgs.java
similarity index 99%
rename from src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java
rename to src/main/java/org/onap/aai/datarouter/logging/DataRouterMsgs.java
index a312d46..6551016 100644
--- a/src/main/java/org/openecomp/datarouter/logging/DataRouterMsgs.java
+++ b/src/main/java/org/onap/aai/datarouter/logging/DataRouterMsgs.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.logging;
+package org.onap.aai.datarouter.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
 
diff --git a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java b/src/main/java/org/onap/aai/datarouter/logging/EntityEventPolicyMsgs.java
similarity index 99%
rename from src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java
rename to src/main/java/org/onap/aai/datarouter/logging/EntityEventPolicyMsgs.java
index 1a59ab1..a32216b 100644
--- a/src/main/java/org/openecomp/datarouter/logging/EntityEventPolicyMsgs.java
+++ b/src/main/java/org/onap/aai/datarouter/logging/EntityEventPolicyMsgs.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.logging;
+package org.onap.aai.datarouter.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
 
diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
rename to src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
index 402e158..7c7965e 100644
--- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.policy;
+package org.onap.aai.datarouter.policy;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -48,20 +48,20 @@ import org.onap.aai.datarouter.entity.OxmEntityDescriptor;
 import org.onap.aai.datarouter.entity.SuggestionSearchEntity;
 import org.onap.aai.datarouter.entity.TopographicalEntity;
 import org.onap.aai.datarouter.entity.UebEventHeader;
+import org.onap.aai.datarouter.logging.EntityEventPolicyMsgs;
+import org.onap.aai.datarouter.util.CrossEntityReference;
+import org.onap.aai.datarouter.util.EntityOxmReferenceHelper;
+import org.onap.aai.datarouter.util.ExternalOxmModelProcessor;
+import org.onap.aai.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.OxmModelLoader;
+import org.onap.aai.datarouter.util.RouterServiceUtil;
+import org.onap.aai.datarouter.util.SearchServiceAgent;
+import org.onap.aai.datarouter.util.SearchSuggestionPermutation;
+import org.onap.aai.datarouter.util.Version;
+import org.onap.aai.datarouter.util.VersionedOxmEntities;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.cl.mdc.MdcContext;
-import org.openecomp.datarouter.logging.EntityEventPolicyMsgs;
-import org.openecomp.datarouter.util.CrossEntityReference;
-import org.openecomp.datarouter.util.EntityOxmReferenceHelper;
-import org.openecomp.datarouter.util.ExternalOxmModelProcessor;
-import org.openecomp.datarouter.util.NodeUtils;
-import org.openecomp.datarouter.util.OxmModelLoader;
-import org.openecomp.datarouter.util.RouterServiceUtil;
-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.onap.aai.restclient.client.Headers;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.restclient.rest.HttpUtil;
diff --git a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicyConfig.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java
rename to src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicyConfig.java
index 4bfcd5c..ac81466 100644
--- a/src/main/java/org/openecomp/datarouter/policy/EntityEventPolicyConfig.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicyConfig.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.policy;
+package org.onap.aai.datarouter.policy;
 
 public class EntityEventPolicyConfig {
 
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterConfig.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java
rename to src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterConfig.java
index 0a4f1d7..dbef742 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterConfig.java
+++ b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterConfig.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.search.filters.config;
+package org.onap.aai.datarouter.search.filters.config;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterDataSourceConfig.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java
rename to src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterDataSourceConfig.java
index bbd39f0..812d456 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFilterDataSourceConfig.java
+++ b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFilterDataSourceConfig.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.search.filters.config;
+package org.onap.aai.datarouter.search.filters.config;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersConfig.java
similarity index 96%
rename from src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java
rename to src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersConfig.java
index 49fb846..870a5c0 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersConfig.java
+++ b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersConfig.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.search.filters.config;
+package org.onap.aai.datarouter.search.filters.config;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersSchemaUtility.java
similarity index 92%
rename from src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java
rename to src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersSchemaUtility.java
index 48b4135..f2d2418 100644
--- a/src/main/java/org/openecomp/datarouter/search/filters/config/UiFiltersSchemaUtility.java
+++ b/src/main/java/org/onap/aai/datarouter/search/filters/config/UiFiltersSchemaUtility.java
@@ -20,15 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.search.filters.config;
+package org.onap.aai.datarouter.search.filters.config;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
-import org.openecomp.datarouter.logging.DataRouterMsgs;
-import org.openecomp.datarouter.util.DataRouterConstants;
+import org.onap.aai.datarouter.logging.DataRouterMsgs;
+import org.onap.aai.datarouter.util.DataRouterConstants;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/src/main/java/org/openecomp/datarouter/service/EchoService.java b/src/main/java/org/onap/aai/datarouter/service/EchoService.java
similarity index 95%
rename from src/main/java/org/openecomp/datarouter/service/EchoService.java
rename to src/main/java/org/onap/aai/datarouter/service/EchoService.java
index af4d490..708b391 100644
--- a/src/main/java/org/openecomp/datarouter/service/EchoService.java
+++ b/src/main/java/org/onap/aai/datarouter/service/EchoService.java
@@ -20,15 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.service;
+package org.onap.aai.datarouter.service;
 
 import org.onap.aai.cl.api.LogFields;
 import org.onap.aai.cl.api.LogLine;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.cl.mdc.MdcContext;
-import org.openecomp.datarouter.logging.DataRouterMsgs;
-import org.openecomp.datarouter.util.DataRouterConstants;
+import org.onap.aai.datarouter.logging.DataRouterMsgs;
+import org.onap.aai.datarouter.util.DataRouterConstants;
 import org.slf4j.MDC;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java b/src/main/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtil.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java
rename to src/main/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtil.java
index 856e38a..b86dfc6 100644
--- a/src/main/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtil.java
+++ b/src/main/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtil.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java b/src/main/java/org/onap/aai/datarouter/util/CrossEntityReference.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
rename to src/main/java/org/onap/aai/datarouter/util/CrossEntityReference.java
index e889656..7ad9ade 100644
--- a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
+++ b/src/main/java/org/onap/aai/datarouter/util/CrossEntityReference.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java b/src/main/java/org/onap/aai/datarouter/util/DataRouterConstants.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java
rename to src/main/java/org/onap/aai/datarouter/util/DataRouterConstants.java
index b18b794..a7cae9c 100644
--- a/src/main/java/org/openecomp/datarouter/util/DataRouterConstants.java
+++ b/src/main/java/org/onap/aai/datarouter/util/DataRouterConstants.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 public class DataRouterConstants {
   public static final String DR_FILESEP = (System.getProperty("file.separator") == null) ? "/"
diff --git a/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java b/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java
rename to src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
index 30b798f..87097a8 100644
--- a/src/main/java/org/openecomp/datarouter/util/DataRouterProperties.java
+++ b/src/main/java/org/onap/aai/datarouter/util/DataRouterProperties.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java b/src/main/java/org/onap/aai/datarouter/util/EntityOxmReferenceHelper.java
similarity index 98%
rename from src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
rename to src/main/java/org/onap/aai/datarouter/util/EntityOxmReferenceHelper.java
index cd5a37d..0375152 100644
--- a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
+++ b/src/main/java/org/onap/aai/datarouter/util/EntityOxmReferenceHelper.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java b/src/main/java/org/onap/aai/datarouter/util/ExternalOxmModelProcessor.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java
rename to src/main/java/org/onap/aai/datarouter/util/ExternalOxmModelProcessor.java
index 5c027d3..9e61b8d 100644
--- a/src/main/java/org/openecomp/datarouter/util/ExternalOxmModelProcessor.java
+++ b/src/main/java/org/onap/aai/datarouter/util/ExternalOxmModelProcessor.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 
diff --git a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java b/src/main/java/org/onap/aai/datarouter/util/FileWatcher.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/FileWatcher.java
rename to src/main/java/org/onap/aai/datarouter/util/FileWatcher.java
index 8ae69d3..6009302 100644
--- a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
+++ b/src/main/java/org/onap/aai/datarouter/util/FileWatcher.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.io.File;
 import java.util.TimerTask;
diff --git a/src/main/java/org/openecomp/datarouter/util/NodeUtils.java b/src/main/java/org/onap/aai/datarouter/util/NodeUtils.java
similarity index 99%
rename from src/main/java/org/openecomp/datarouter/util/NodeUtils.java
rename to src/main/java/org/onap/aai/datarouter/util/NodeUtils.java
index 4362d11..84876fb 100644
--- a/src/main/java/org/openecomp/datarouter/util/NodeUtils.java
+++ b/src/main/java/org/onap/aai/datarouter/util/NodeUtils.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java b/src/main/java/org/onap/aai/datarouter/util/OxmModelLoader.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java
rename to src/main/java/org/onap/aai/datarouter/util/OxmModelLoader.java
index a696740..37713c4 100644
--- a/src/main/java/org/openecomp/datarouter/util/OxmModelLoader.java
+++ b/src/main/java/org/onap/aai/datarouter/util/OxmModelLoader.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -41,9 +41,8 @@ import org.eclipse.persistence.jaxb.JAXBContextProperties;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
 import org.onap.aai.cl.eelf.LoggerFactory;
-import org.openecomp.datarouter.logging.DataRouterMsgs;
-
-import org.openecomp.datarouter.util.ExternalOxmModelProcessor;
+import org.onap.aai.datarouter.logging.DataRouterMsgs;
+import org.onap.aai.datarouter.util.ExternalOxmModelProcessor;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
diff --git a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java b/src/main/java/org/onap/aai/datarouter/util/RouterServiceUtil.java
similarity index 99%
rename from src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
rename to src/main/java/org/onap/aai/datarouter/util/RouterServiceUtil.java
index 77366c5..ae0efee 100644
--- a/src/main/java/org/openecomp/datarouter/util/RouterServiceUtil.java
+++ b/src/main/java/org/onap/aai/datarouter/util/RouterServiceUtil.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
similarity index 96%
rename from src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
rename to src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
index de31597..20d0981 100644
--- a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -38,8 +38,8 @@ import javax.ws.rs.core.Response.Status;
 import org.eclipse.jetty.util.security.Password;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.mdc.MdcContext;
-import org.openecomp.datarouter.logging.DataRouterMsgs;
-import org.openecomp.datarouter.policy.EntityEventPolicy;
+import org.onap.aai.datarouter.logging.DataRouterMsgs;
+import org.onap.aai.datarouter.policy.EntityEventPolicy;
 import org.onap.aai.restclient.client.Headers;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.restclient.client.RestClient;
diff --git a/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java b/src/main/java/org/onap/aai/datarouter/util/SearchSuggestionPermutation.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java
rename to src/main/java/org/onap/aai/datarouter/util/SearchSuggestionPermutation.java
index 0a72ce5..384122e 100644
--- a/src/main/java/org/openecomp/datarouter/util/SearchSuggestionPermutation.java
+++ b/src/main/java/org/onap/aai/datarouter/util/SearchSuggestionPermutation.java
@@ -8,19 +8,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- * <p>
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/openecomp/datarouter/util/Version.java b/src/main/java/org/onap/aai/datarouter/util/Version.java
similarity index 96%
rename from src/main/java/org/openecomp/datarouter/util/Version.java
rename to src/main/java/org/onap/aai/datarouter/util/Version.java
index 7ffce94..3362497 100644
--- a/src/main/java/org/openecomp/datarouter/util/Version.java
+++ b/src/main/java/org/onap/aai/datarouter/util/Version.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 public enum Version {
   v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20;
diff --git a/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java b/src/main/java/org/onap/aai/datarouter/util/VersionedOxmEntities.java
similarity index 99%
rename from src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java
rename to src/main/java/org/onap/aai/datarouter/util/VersionedOxmEntities.java
index 1c993bb..24277c6 100644
--- a/src/main/java/org/openecomp/datarouter/util/VersionedOxmEntities.java
+++ b/src/main/java/org/onap/aai/datarouter/util/VersionedOxmEntities.java
@@ -8,19 +8,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- * <p>
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import org.eclipse.persistence.dynamic.DynamicType;
 import org.eclipse.persistence.internal.helper.DatabaseField;
diff --git a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java b/src/main/java/org/onap/aai/datarouter/util/client/NoAuthRestClient.java
similarity index 84%
rename from src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
rename to src/main/java/org/onap/aai/datarouter/util/client/NoAuthRestClient.java
index b334226..91bd7d7 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/NoAuthRestClient.java
+++ b/src/main/java/org/onap/aai/datarouter/util/client/NoAuthRestClient.java
@@ -8,19 +8,19 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- * <p>
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util.client;
+package org.onap.aai.datarouter.util.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.camel.Exchange;
@@ -28,15 +28,15 @@ import org.apache.camel.Message;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.cl.mdc.MdcContext;
+import org.onap.aai.datarouter.logging.DataRouterMsgs;
+import org.onap.aai.datarouter.util.AaiUiSvcPolicyUtil;
+import org.onap.aai.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.RouterServiceUtil;
 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.openecomp.datarouter.logging.DataRouterMsgs;
-import org.openecomp.datarouter.util.AaiUiSvcPolicyUtil;
-import org.openecomp.datarouter.util.NodeUtils;
-import org.openecomp.datarouter.util.RouterServiceUtil;
 import org.slf4j.MDC;
 import org.springframework.http.HttpStatus;
 
@@ -122,7 +122,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#getHost()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#getHost()
      */
     @Override
     public String getHost() {
@@ -130,7 +130,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#setHost(java.lang.String)
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#setHost(java.lang.String)
      */
     @Override
     public void setHost(String host) {
@@ -139,7 +139,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#getPort()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#getPort()
      */
     @Override
     public String getPort() {
@@ -148,7 +148,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#setPort(java.lang.String)
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#setPort(java.lang.String)
      */
     @Override
     public void setPort(String port) {
@@ -157,7 +157,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#getTargetUri()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#getTargetUri()
      */
     @Override
     public String getTargetUri() {
@@ -166,7 +166,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#setTargetUri(java.lang.String)
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#setTargetUri(java.lang.String)
      */
     @Override
     public void setTargetUri(String targetUri) {
@@ -175,7 +175,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#getTargetPayload()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#getTargetPayload()
      */
     @Override
     public JsonNode getTargetPayload() {
@@ -184,7 +184,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client
+     * @see org.onap.aai.datarouter.util.client
      * .SvcRoutingRestClient#setTargetPayload(com.fasterxml.jackson.databind.JsonNode)
      */
     @Override
@@ -194,7 +194,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
 
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#getRestClient()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#getRestClient()
      */
     @Override
     public RestClient getRestClient() {
@@ -202,7 +202,7 @@ public class NoAuthRestClient implements SvcRoutingRestClient {
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.datarouter.util.client.SvcRoutingRestClient#setRestClient()
+     * @see org.onap.aai.datarouter.util.client.SvcRoutingRestClient#setRestClient()
      */
     @Override
     public void setRestClient(RestClient client) {
diff --git a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java b/src/main/java/org/onap/aai/datarouter/util/client/SvcRoutingRestClient.java
similarity index 97%
rename from src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
rename to src/main/java/org/onap/aai/datarouter/util/client/SvcRoutingRestClient.java
index aab9605..3d4bf8f 100644
--- a/src/main/java/org/openecomp/datarouter/util/client/SvcRoutingRestClient.java
+++ b/src/main/java/org/onap/aai/datarouter/util/client/SvcRoutingRestClient.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.datarouter.util.client;
+package org.onap.aai.datarouter.util.client;
 
 import org.onap.aai.restclient.client.RestClient;
 
diff --git a/src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyStubbed.java b/src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyStubbed.java
similarity index 86%
rename from src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyStubbed.java
rename to src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyStubbed.java
index b36108f..3ca17f3 100644
--- a/src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyStubbed.java
+++ b/src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyStubbed.java
@@ -1,8 +1,10 @@
-package org.openecomp.datarouter.policy;
+package org.onap.aai.datarouter.policy;
 
 import java.io.FileNotFoundException;
 
 import org.onap.aai.datarouter.entity.DocumentStoreDataEntity;
+import org.onap.aai.datarouter.policy.EntityEventPolicy;
+import org.onap.aai.datarouter.policy.EntityEventPolicyConfig;
 
 public class EntityEventPolicyStubbed extends EntityEventPolicy {
 	
diff --git a/src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyTest.java b/src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyTest.java
similarity index 90%
rename from src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyTest.java
rename to src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyTest.java
index 0d97e1d..d925bc8 100644
--- a/src/test/java/org/openecomp/datarouter/policy/EntityEventPolicyTest.java
+++ b/src/test/java/org/onap/aai/datarouter/policy/EntityEventPolicyTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.datarouter.policy;
+package org.onap.aai.datarouter.policy;
 
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.anyObject;
@@ -12,8 +12,10 @@ import org.apache.camel.Message;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.datarouter.util.NodeUtils;
-import org.openecomp.datarouter.util.SearchServiceAgent;
+import org.onap.aai.datarouter.policy.EntityEventPolicy;
+import org.onap.aai.datarouter.policy.EntityEventPolicyConfig;
+import org.onap.aai.datarouter.util.NodeUtils;
+import org.onap.aai.datarouter.util.SearchServiceAgent;
 import org.powermock.api.mockito.PowerMockito;
 
 
diff --git a/src/test/java/org/openecomp/datarouter/policy/InMemorySearchDatastore.java b/src/test/java/org/onap/aai/datarouter/policy/InMemorySearchDatastore.java
similarity index 92%
rename from src/test/java/org/openecomp/datarouter/policy/InMemorySearchDatastore.java
rename to src/test/java/org/onap/aai/datarouter/policy/InMemorySearchDatastore.java
index 4b25f6e..39382a2 100644
--- a/src/test/java/org/openecomp/datarouter/policy/InMemorySearchDatastore.java
+++ b/src/test/java/org/onap/aai/datarouter/policy/InMemorySearchDatastore.java
@@ -1,4 +1,4 @@
-package org.openecomp.datarouter.policy;
+package org.onap.aai.datarouter.policy;
 
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/src/test/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtilTest.java b/src/test/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtilTest.java
similarity index 97%
rename from src/test/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtilTest.java
rename to src/test/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtilTest.java
index 5e6841f..829a480 100644
--- a/src/test/java/org/openecomp/datarouter/util/AaiUiSvcPolicyUtilTest.java
+++ b/src/test/java/org/onap/aai/datarouter/util/AaiUiSvcPolicyUtilTest.java
@@ -23,7 +23,7 @@
  * and service marks of AT&T Intellectual Property.
  */
 
-package org.openecomp.datarouter.util;
+package org.onap.aai.datarouter.util;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -31,6 +31,7 @@ import static org.junit.Assert.fail;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.onap.aai.datarouter.util.AaiUiSvcPolicyUtil;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java b/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java
similarity index 97%
rename from src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java
rename to src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java
index 160981d..31be2b0 100644
--- a/src/test/java/org/openecomp/datarouter/util/client/NoAuthRestClientTest.java
+++ b/src/test/java/org/onap/aai/datarouter/util/client/NoAuthRestClientTest.java
@@ -23,7 +23,7 @@
  * and service marks of AT&T Intellectual Property.
  */
 
-package org.openecomp.datarouter.util.client;
+package org.onap.aai.datarouter.util.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -37,6 +37,7 @@ import org.apache.camel.impl.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.onap.aai.datarouter.util.client.NoAuthRestClient;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.restclient.client.RestClient;
 
diff --git a/src/test/java/org/openecomp/datarouter/entity/SuggestionSearchEntityTest.java b/src/test/java/org/openecomp/datarouter/entity/SuggestionSearchEntityTest.java
index 4461bdc..6ae4a8e 100644
--- a/src/test/java/org/openecomp/datarouter/entity/SuggestionSearchEntityTest.java
+++ b/src/test/java/org/openecomp/datarouter/entity/SuggestionSearchEntityTest.java
@@ -40,7 +40,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.aai.datarouter.entity.SuggestionSearchEntity;
-import org.openecomp.datarouter.search.filters.config.UiFiltersSchemaUtility;
+import org.onap.aai.datarouter.search.filters.config.UiFiltersSchemaUtility;
 
 public class SuggestionSearchEntityTest {
   private static SuggestionSearchEntity suggestionSearchEntity;