81 files changed, 192 insertions, 161 deletions
diff --git a/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/jaxrsBeans.groovy b/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/jaxrsBeans.groovy
index 24ec0da..9065b04 100644
--- a/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/jaxrsBeans.groovy
+++ b/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/jaxrsBeans.groovy
@@ -3,9 +3,9 @@ beans {
     xmlns jaxrs: "http://cxf.apache.org/jaxrs"
     xmlns util: "http://www.springframework.org/schema/util"
 
-    echoService(org.openecomp.sa.searchdbabstraction.JaxrsEchoService)
-    userService(org.openecomp.sa.searchdbabstraction.JaxrsUserService)
-    searchService(org.openecomp.sa.searchdbabstraction.service.SearchService)
+    echoService(org.onap.aai.sa.searchdbabstraction.JaxrsEchoService)
+    userService(org.onap.aai.sa.searchdbabstraction.JaxrsUserService)
+    searchService(org.onap.aai.sa.searchdbabstraction.service.SearchService)
 
     util.list(id: 'jaxrsServices') {
         ref(bean: 'echoService')
diff --git a/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/searchBeans.groovy b/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/searchBeans.groovy
index dddedfa..02ad789 100644
--- a/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/searchBeans.groovy
+++ b/src/main/ajsc/search-data-service_v1/search-data-service/v1/conf/searchBeans.groovy
@@ -1,4 +1,4 @@
-import org.openecomp.sa.rest.SearchServiceApi
+import org.onap.aai.sa.rest.SearchServiceApi
 
 beans {
     xmlns cxf: "http://camel.apache.org/schema/cxf"
diff --git a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuth.java b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
index e0b4b1e..ba60b5a 100644
--- a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuth.java
+++ b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.auth;
+package org.onap.aai.sa.auth;
 
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.HttpHeaders;
diff --git a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuthCore.java b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java
index e5c77e0..e7541cb 100644
--- a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuthCore.java
+++ b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java
@@ -20,16 +20,16 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.auth;
+package org.onap.aai.sa.auth;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/org/openecomp/sa/rest/AnalysisConfiguration.java b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
index d05d50d..ab680cc 100644
--- a/src/main/java/org/openecomp/sa/rest/AnalysisConfiguration.java
+++ b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
@@ -20,15 +20,16 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.rest.AnalyzerSchema;
-import org.openecomp.sa.rest.FilterSchema;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
-import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants;
+import org.onap.aai.sa.rest.AnalyzerSchema;
+import org.onap.aai.sa.rest.FilterSchema;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/openecomp/sa/rest/AnalyzerApi.java b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
index a02f55c..442b696 100644
--- a/src/main/java/org/openecomp/sa/rest/AnalyzerApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
@@ -20,14 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.rest.AnalyzerSchema;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/org/openecomp/sa/rest/ApiUtils.java b/src/main/java/org/onap/aai/sa/rest/ApiUtils.java
index dc7f0cb..bd6afb0 100644
--- a/src/main/java/org/openecomp/sa/rest/ApiUtils.java
+++ b/src/main/java/org/onap/aai/sa/rest/ApiUtils.java
@@ -20,10 +20,10 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
 import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants;
 import org.slf4j.MDC;
 
 import java.util.UUID;
diff --git a/src/main/java/org/openecomp/sa/rest/BulkApi.java b/src/main/java/org/onap/aai/sa/rest/BulkApi.java
index 6557dcb..143f248 100644
--- a/src/main/java/org/openecomp/sa/rest/BulkApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/BulkApi.java
@@ -20,19 +20,20 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
+
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/src/main/java/org/openecomp/sa/rest/BulkMetaData.java b/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java
index f0ca73d..56de4ac 100644
--- a/src/main/java/org/openecomp/sa/rest/BulkMetaData.java
+++ b/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 public class BulkMetaData {
 
diff --git a/src/main/java/org/openecomp/sa/rest/BulkOperation.java b/src/main/java/org/onap/aai/sa/rest/BulkOperation.java
index 565aec3..a717b1c 100644
--- a/src/main/java/org/openecomp/sa/rest/BulkOperation.java
+++ b/src/main/java/org/onap/aai/sa/rest/BulkOperation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 /**
  * This class represents a single instance of an operation to be performed
diff --git a/src/main/java/org/openecomp/sa/rest/BulkRequest.java b/src/main/java/org/onap/aai/sa/rest/BulkRequest.java
index ac2c7ba..34ca939 100644
--- a/src/main/java/org/openecomp/sa/rest/BulkRequest.java
+++ b/src/main/java/org/onap/aai/sa/rest/BulkRequest.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 
 /**
diff --git a/src/main/java/org/openecomp/sa/rest/Document.java b/src/main/java/org/onap/aai/sa/rest/Document.java
index 6b5cc3b..637cfef 100644
--- a/src/main/java/org/openecomp/sa/rest/Document.java
+++ b/src/main/java/org/onap/aai/sa/rest/Document.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/src/main/java/org/openecomp/sa/rest/DocumentApi.java b/src/main/java/org/onap/aai/sa/rest/DocumentApi.java
index 8762380..e20c3e3 100644
--- a/src/main/java/org/openecomp/sa/rest/DocumentApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/DocumentApi.java
@@ -20,22 +20,23 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntityImpl;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResults;
+import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.searchdbabstraction.searchapi.SearchStatement;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntityImpl;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResults;
-import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult;
-import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
-import org.openecomp.sa.searchdbabstraction.searchapi.SearchStatement;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/openecomp/sa/rest/IndexApi.java b/src/main/java/org/onap/aai/sa/rest/IndexApi.java
index 7968b1b..4e89fb9 100644
--- a/src/main/java/org/openecomp/sa/rest/IndexApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/IndexApi.java
@@ -20,17 +20,20 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.rest.DocumentFieldSchema;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/main/java/org/openecomp/sa/rest/SearchServiceApi.java b/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java
index f6afefe..183a427 100644
--- a/src/main/java/org/openecomp/sa/rest/SearchServiceApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java
@@ -20,12 +20,12 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
-import org.openecomp.sa.auth.SearchDbServiceAuth;
-import org.openecomp.sa.rest.ApiUtils.Action;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
+import org.onap.aai.sa.auth.SearchDbServiceAuth;
+import org.onap.aai.sa.rest.ApiUtils.Action;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
 
 import java.security.cert.X509Certificate;
 import javax.security.auth.x500.X500Principal;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsEchoService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsEchoService.java
index c2726ca..9133b97 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsEchoService.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsEchoService.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction;
+package org.onap.aai.sa.searchdbabstraction;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsUserService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsUserService.java
index 5c80f05..c3e5b37 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsUserService.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsUserService.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction;
+package org.onap.aai.sa.searchdbabstraction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
index 1a3dd00..97d7677 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.config;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.config;
 
 import java.util.Properties;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
index 87b38c1..783d2c4 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 public interface DocumentStoreDataEntity {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
index 442b615..5de3fab 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 public class DocumentStoreDataEntityImpl implements DocumentStoreDataEntity {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
index 73a5683..0964a74 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
@@ -20,15 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 
-import org.openecomp.sa.rest.BulkRequest;
-import org.openecomp.sa.rest.DocumentSchema;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
-import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult;
+import org.onap.aai.sa.rest.BulkRequest;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 
 public interface DocumentStoreInterface {
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
index 6aff3b8..f0d4283 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
index ba5be26..40839a1 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 public class ElasticSearchCause {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
index 7ebf48c..a7f7d72 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
index cd07200..383fcb0 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import com.att.aft.dme2.internal.google.common.base.Throwables;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -33,32 +33,32 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
+import org.onap.aai.sa.rest.AnalysisConfiguration;
+import org.onap.aai.sa.rest.ApiUtils;
+import org.onap.aai.sa.rest.BulkRequest;
+import org.onap.aai.sa.rest.BulkRequest.OperationType;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResults;
+import org.onap.aai.sa.searchdbabstraction.entity.Document;
+import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.ErrorResult;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.SearchHit;
+import org.onap.aai.sa.searchdbabstraction.entity.SearchHits;
+import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.searchdbabstraction.util.AggregationParsingUtil;
+import org.onap.aai.sa.searchdbabstraction.util.DocumentSchemaUtil;
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
 import org.openecomp.cl.api.LogFields;
 import org.openecomp.cl.api.LogLine;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
 import org.openecomp.cl.mdc.MdcContext;
 import org.openecomp.cl.mdc.MdcOverride;
-import org.openecomp.sa.rest.AnalysisConfiguration;
-import org.openecomp.sa.rest.ApiUtils;
-import org.openecomp.sa.rest.BulkRequest;
-import org.openecomp.sa.rest.BulkRequest.OperationType;
-import org.openecomp.sa.rest.DocumentSchema;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResult;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResults;
-import org.openecomp.sa.searchdbabstraction.entity.Document;
-import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult;
-import org.openecomp.sa.searchdbabstraction.entity.ErrorResult;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
-import org.openecomp.sa.searchdbabstraction.entity.SearchHit;
-import org.openecomp.sa.searchdbabstraction.entity.SearchHits;
-import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
-import org.openecomp.sa.searchdbabstraction.util.AggregationParsingUtil;
-import org.openecomp.sa.searchdbabstraction.util.DocumentSchemaUtil;
-import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
index c463110..25a6afc 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
index 9b24c5d..fdba9cf 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
-import org.openecomp.sa.rest.ApiUtils;
+import org.onap.aai.sa.rest.ApiUtils;
 
 public class ElasticSearchResultItem {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
index 158e295..1d24c82 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 public class ElasticSearchShardStatus {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
index 441f1d1..ab45ea7 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.exception;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.exception;
 
 public class DocumentStoreOperationException extends Exception {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationBucket.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
index d02e526..625a7b7 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationBucket.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.emory.mathcs.backport.java.util.Arrays;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
index 0c57de4..5b04009 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.emory.mathcs.backport.java.util.Arrays;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResults.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java
index 0ea1088..f26a0fd 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResults.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/Document.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java
index 2634846..4a5d834 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/Document.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 import org.json.simple.JSONObject;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/DocumentOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java
index 8400700..5d14e75 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/DocumentOperationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 public class DocumentOperationResult extends OperationResult {
   private Document document;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/ErrorResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java
index c930072..3a910a2 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/ErrorResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 public class ErrorResult {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/OperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java
index 20822d8..36d072f 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/OperationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 public class OperationResult {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHit.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java
index 5ee6b40..9015d53 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHit.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 public class SearchHit {
   private String score;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHits.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java
index 8aa6f2b..2c58377 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHits.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
index 581fc49..540149e 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchOperationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.entity;
+package org.onap.aai.sa.searchdbabstraction.entity;
 
 public class SearchOperationResult extends OperationResult {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/logging/SearchDbMsgs.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java
index cbc6abf..fd30e6e 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/logging/SearchDbMsgs.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.logging;
+package org.onap.aai.sa.searchdbabstraction.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
 import org.openecomp.cl.eelf.LogMessageEnum;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AbstractAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java
index 02a57d8..33f5ed7 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AbstractAggregation.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Aggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java
index 3bd74a3..0585ec3 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Aggregation.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java
index ba62f74..a207e1a 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatement.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
index 2edad68..5088410 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRange.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java
index 69e795d..448abdc 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRange.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
index f893905..bf1ae9f 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Filter.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java
index bfed378..3d48cbe 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Filter.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java
index fbd120c..cdb113f 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregation.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 /**
  * An example of a date_range aggregation:
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/ParsedQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java
index bacb2ef..8fab4f0 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/ParsedQuery.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Query.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java
index 991b50c..7975a05 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Query.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 public class Query {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java
index e8687b3..25b42de 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryStatement.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/RangeQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java
index 9b8bc08..32cc8d1 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/RangeQuery.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java
index 38ea80d..11eee1e 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatement.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.radeox.util.logging.Logger;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Sort.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java
index 3e98621..3fb0afe 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Sort.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 public class Sort {
 
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/TermQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
index 109d88c..297e347 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/TermQuery.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.emory.mathcs.backport.java.util.Arrays;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/service/SearchService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
index c31307c..e1d4536 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/service/SearchService.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
@@ -20,14 +20,14 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.service;
+package org.onap.aai.sa.searchdbabstraction.service;
 
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
+import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs;
+import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants;
 import org.openecomp.cl.api.Logger;
 import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
-import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs;
-import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants;
 
 import java.io.FileInputStream;
 import java.util.Properties;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/AggregationParsingUtil.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java
index 3f61e28..04261f3 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/AggregationParsingUtil.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java
@@ -20,13 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.util;
+package org.onap.aai.sa.searchdbabstraction.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationBucket;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationBucket;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResult;
 
 import java.util.Iterator;
 import java.util.Set;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/DocumentSchemaUtil.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java
index 34d1837..1e27dc4 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/DocumentSchemaUtil.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java
@@ -20,13 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.util;
+package org.onap.aai.sa.searchdbabstraction.util;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.sa.rest.DocumentFieldSchema;
-import org.openecomp.sa.rest.DocumentSchema;
+import org.onap.aai.sa.rest.DocumentFieldSchema;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/SearchDbConstants.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
index 457980e..e4f62ef 100644
--- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/SearchDbConstants.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.util;
+package org.onap.aai.sa.searchdbabstraction.util;
 
 public class SearchDbConstants {
   public static final String SDB_FILESEP = (System.getProperty("file.separator") == null) ? "/"
diff --git a/src/main/resources/json/schema/document-field.schema.json b/src/main/resources/json/schema/document-field.schema.json
index 2b79256..78d6cba 100644
--- a/src/main/resources/json/schema/document-field.schema.json
+++ b/src/main/resources/json/schema/document-field.schema.json
@@ -3,7 +3,7 @@
   "title": "Document Field Schema",
   "description": "Describes the structure of a document field for storage in a document store.",
   "type": "object",
-  "javaType": "org.openecomp.sa.rest.DocumentFieldSchema",
+  "javaType": "org.onap.aai.sa.rest.DocumentFieldSchema",
   "properties": {
     "name": {
       "type": "string"
diff --git a/src/main/resources/json/schema/document.schema.json b/src/main/resources/json/schema/document.schema.json
index e2dd204..bbf3e50 100644
--- a/src/main/resources/json/schema/document.schema.json
+++ b/src/main/resources/json/schema/document.schema.json
@@ -3,7 +3,7 @@
   "title": "Document Schema",
   "description": "Describes the structure of a document for storage in a document store.",
   "type": "object",
-  "javaType": "org.openecomp.sa.rest.DocumentSchema",
+  "javaType": "org.onap.aai.sa.rest.DocumentSchema",
   "properties": {
     "fields": {
       "type": "array",
diff --git a/src/test/java/org/openecomp/sa/rest/ApiUtilsTest.java b/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java
index dc097a2..48730b2 100644
--- a/src/test/java/org/openecomp/sa/rest/ApiUtilsTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java
@@ -20,9 +20,10 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import org.junit.Test;
+import org.onap.aai.sa.rest.ApiUtils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/org/openecomp/sa/rest/BulkApiTest.java b/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
index 937672e..e225c67 100644
--- a/src/test/java/org/openecomp/sa/rest/BulkApiTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
diff --git a/src/test/java/org/openecomp/sa/rest/DocumentApiTest.java b/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
index f9d4fcd..1a13a48 100644
--- a/src/test/java/org/openecomp/sa/rest/DocumentApiTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
diff --git a/src/test/java/org/openecomp/sa/rest/DocumentSchemaTest.java b/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
index b084cc3..c223bee 100644
--- a/src/test/java/org/openecomp/sa/rest/DocumentSchemaTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
@@ -20,13 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.openecomp.sa.rest.DocumentSchema;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/test/java/org/openecomp/sa/rest/IndexApiTest.java b/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
index c1e6b7a..2f59d26 100644
--- a/src/test/java/org/openecomp/sa/rest/IndexApiTest.java
+++ b/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
@@ -20,14 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Test;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.rest.IndexApi;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
diff --git a/src/test/java/org/openecomp/sa/rest/SearchServiceApiHarness.java b/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
index e2ac695..f6a9693 100644
--- a/src/test/java/org/openecomp/sa/rest/SearchServiceApiHarness.java
+++ b/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,6 +30,9 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.onap.aai.sa.rest.ApiUtils;
+import org.onap.aai.sa.rest.SearchServiceApi;
+
 @Path("test/")
 public class SearchServiceApiHarness extends SearchServiceApi {
 
diff --git a/src/test/java/org/openecomp/sa/rest/StubEsController.java b/src/test/java/org/onap/aai/sa/rest/StubEsController.java
index 614f6ca..5d11791 100644
--- a/src/test/java/org/openecomp/sa/rest/StubEsController.java
+++ b/src/test/java/org/onap/aai/sa/rest/StubEsController.java
@@ -20,16 +20,18 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import org.json.simple.JSONObject;
-import org.openecomp.sa.rest.DocumentSchema;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntity;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
-import org.openecomp.sa.searchdbabstraction.entity.Document;
-import org.openecomp.sa.searchdbabstraction.entity.*;
-import org.openecomp.sa.searchdbabstraction.util.DocumentSchemaUtil;
+import org.onap.aai.sa.rest.AnalysisConfiguration;
+import org.onap.aai.sa.rest.BulkRequest;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntity;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException;
+import org.onap.aai.sa.searchdbabstraction.entity.*;
+import org.onap.aai.sa.searchdbabstraction.util.DocumentSchemaUtil;
+import org.onap.aai.sa.searchdbabstraction.entity.Document;
+import org.onap.aai.sa.rest.DocumentSchema;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/openecomp/sa/rest/TestUtils.java b/src/test/java/org/onap/aai/sa/rest/TestUtils.java
index 7371db9..e84f6f7 100644
--- a/src/test/java/org/openecomp/sa/rest/TestUtils.java
+++ b/src/test/java/org/onap/aai/sa/rest/TestUtils.java
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.rest;
+package org.onap.aai.sa.rest;
 
 import static org.junit.Assert.fail;
 
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
index 49073c4..a950d48 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
@@ -20,16 +20,16 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.junit.Test;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResult;
-import org.openecomp.sa.searchdbabstraction.entity.AggregationResults;
-import org.openecomp.sa.searchdbabstraction.util.AggregationParsingUtil;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResult;
+import org.onap.aai.sa.searchdbabstraction.entity.AggregationResults;
+import org.onap.aai.sa.searchdbabstraction.util.AggregationParsingUtil;
 
 public class AggregationResponseParsingTest {
 
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
index b921b32..787976b 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
@@ -20,15 +20,18 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.elasticsearch.dao;
+package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.openecomp.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sa.searchdbabstraction.entity.OperationResult;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntity;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntityImpl;
+import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController;
+import org.onap.aai.sa.searchdbabstraction.entity.OperationResult;
 
 import java.util.Properties;
 
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatementTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
index 93434a4..49832cb 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.AggregationStatement;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java
index 99a6609..90b3776 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.Aggregation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
index d02720b..8ce41f9 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.DateHistogramAggregation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
index eae0af3..05081bb 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.DateRangeAggregation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java
index 3f7ec7b..75a1fca 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.DateRange;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/FilterTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java
index 44069d8..c4e2d49 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/FilterTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java
@@ -20,12 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.Filter;
 
 import java.io.IOException;
 
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
index e37bd78..fb3c023 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
@@ -20,10 +20,11 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.GroupByAggregation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java
index 224a603..20dd212 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java
@@ -20,12 +20,15 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.ParsedQuery;
+import org.onap.aai.sa.searchdbabstraction.searchapi.RangeQuery;
+import org.onap.aai.sa.searchdbabstraction.searchapi.TermQuery;
 
 import java.io.IOException;
 
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatementTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java
index e68c10d..5cfdc62 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatementTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java
@@ -20,13 +20,16 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.openecomp.sa.rest.TestUtils;
+import org.onap.aai.sa.rest.TestUtils;
+import org.onap.aai.sa.searchdbabstraction.searchapi.Aggregation;
+import org.onap.aai.sa.searchdbabstraction.searchapi.QueryStatement;
+import org.onap.aai.sa.searchdbabstraction.searchapi.SearchStatement;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/SortTest.java b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java
index bb03012..62b05c4 100644
--- a/src/test/java/org/openecomp/sa/searchdbabstraction/searchapi/SortTest.java
+++ b/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java
@@ -20,12 +20,13 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sa.searchdbabstraction.searchapi;
+package org.onap.aai.sa.searchdbabstraction.searchapi;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
+import org.onap.aai.sa.searchdbabstraction.searchapi.Sort;
 
 import java.io.IOException;