Update poms to conform to merge job requirements

Change-Id: Ic989e9538b67214e43faf221724ed5d36bfc6d03
Issue-ID: AAI-2203
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>

122 files changed, 7 insertions, 7 deletions

diff --git a/elasticsearch-sg/pom.xml b/elasticsearch-sg/pom.xml
index b3dba83..419684d 100644
--- a/elasticsearch-sg/pom.xml
+++ b/elasticsearch-sg/pom.xml
@@ -24,9 +24,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.onap.aai.search-data-service</groupId>
+	<groupId>org.onap.aai</groupId>
 	<artifactId>elasticsearch-sg</artifactId>
-	<name>elasticsearch with searchguard</name>
+	<name>ElasticSearch with SearchGuard</name>
 	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
diff --git a/pom.xml b/pom.xml
index f7c542e..0c6300c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.onap.aai</groupId>
-	<artifactId>search-data-service-agg</artifactId>
+	<artifactId>search-data-service</artifactId>
 	<name>aai-search-data-service aggregate pom</name>
 	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>search-data-service</module>
+		<module>search-data-service-app</module>
 		<module>elasticsearch-sg</module>
 	</modules>
 
diff --git a/search-data-service/License.txt b/search-data-service-app/License.txt
index df05b97..df05b97 100644
--- a/search-data-service/License.txt
+++ b/search-data-service-app/License.txt
diff --git a/search-data-service/bundleconfig-local/etc/logback.xml b/search-data-service-app/bundleconfig-local/etc/logback.xml
index 7b90318..7b90318 100644
--- a/search-data-service/bundleconfig-local/etc/logback.xml
+++ b/search-data-service-app/bundleconfig-local/etc/logback.xml
diff --git a/search-data-service/pom.xml b/search-data-service-app/pom.xml
index a270914..c1f2c6a 100644
--- a/search-data-service/pom.xml
+++ b/search-data-service-app/pom.xml
@@ -30,10 +30,10 @@
 		<version>1.5.18.RELEASE</version>
 	</parent>
 
-	<groupId>org.onap.aai</groupId>
-	<artifactId>search-data-service</artifactId>
+	<groupId>org.onap.aai.search-data-service</groupId>
+	<artifactId>search-data-service-app</artifactId>
 	<version>1.4.0-SNAPSHOT</version>
-	<name>aai-search-data-service</name>
+	<name>AAI Search Data Service Application</name>
 
 	<properties>
 		<docker.location>${basedir}/target</docker.location>
diff --git a/search-data-service/src/main/bin/start.sh b/search-data-service-app/src/main/bin/start.sh
index 5248a7a..5248a7a 100644
--- a/search-data-service/src/main/bin/start.sh
+++ b/search-data-service-app/src/main/bin/start.sh
diff --git a/search-data-service/src/main/docker/Dockerfile b/search-data-service-app/src/main/docker/Dockerfile
index 1a70fd7..1a70fd7 100644
--- a/search-data-service/src/main/docker/Dockerfile
+++ b/search-data-service-app/src/main/docker/Dockerfile
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/Application.java b/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java
index ad52dfd..ad52dfd 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/Application.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/Application.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java b/search-data-service-app/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
index 199b5ec..199b5ec 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java b/search-data-service-app/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java
index 5bab0c0..5bab0c0 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
index 0b8947e..0b8947e 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
index 3971920..3971920 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/ApiUtils.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/ApiUtils.java
index db2fb93..db2fb93 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/ApiUtils.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/ApiUtils.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkApi.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkApi.java
index 810f718..810f718 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkApi.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkApi.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java
index 7c096a6..7c096a6 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkOperation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkOperation.java
index 1490f97..1490f97 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkOperation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkOperation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkRequest.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkRequest.java
index 1f8b50e..1f8b50e 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/BulkRequest.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/BulkRequest.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/Document.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/Document.java
index e9bcaf4..e9bcaf4 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/Document.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/Document.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/DocumentApi.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/DocumentApi.java
index da8be98..da8be98 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/DocumentApi.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/DocumentApi.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/IndexApi.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/IndexApi.java
index 04fbcf3..04fbcf3 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/IndexApi.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/IndexApi.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java
index d62bfd6..d62bfd6 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/rest/SettingConfiguration.java b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/SettingConfiguration.java
index 74e46f4..74e46f4 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/rest/SettingConfiguration.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/rest/SettingConfiguration.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/RestEchoService.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/RestEchoService.java
index 96929c7..96929c7 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/RestEchoService.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/RestEchoService.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
index 4680ded..4680ded 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
index 3d95a1b..3d95a1b 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
index 413dbb4..413dbb4 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
index 5ea37e1..5ea37e1 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
index 23181df..23181df 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
index ee12494..ee12494 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
index 1880168..1880168 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
index a4af160..a4af160 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpsController.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpsController.java
index 51b8952..51b8952 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpsController.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpsController.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
index 6374716..6374716 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
index 151e02b..151e02b 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
index e846a38..e846a38 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
index 7db6c4e..7db6c4e 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
index ae0a3e9..ae0a3e9 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
index 923afbf..923afbf 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java
index f8f3ed3..f8f3ed3 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java
index 8b7df43..8b7df43 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java
index 9775446..9775446 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java
index aa7e720..aa7e720 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java
index 0d3a8bb..0d3a8bb 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResultBuilder.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResultBuilder.java
index 32b1d0c..32b1d0c 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResultBuilder.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResultBuilder.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java
index 033dafe..033dafe 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java
index cf4fd3a..cf4fd3a 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
index 6834d33..6834d33 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java
index 4ce267d..4ce267d 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java
index ecc4f25..ecc4f25 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java
index d38de2a..d38de2a 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java
index 29be5ea..29be5ea 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java
index 84f0e9e..84f0e9e 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java
index 94a091d..94a091d 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
index 96bb25d..96bb25d 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java
index cd49ee7..cd49ee7 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
index a4e0cc2..a4e0cc2 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java
index 134c660..134c660 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java
index 69730d2..69730d2 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java
index 19bc250..19bc250 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java
index ee8ffdc..ee8ffdc 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java
index 7764051..7764051 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java
index 60cc9e6..60cc9e6 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java
index d14f8df..d14f8df 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java
index 104c4b0..104c4b0 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SuggestionStatement.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SuggestionStatement.java
index 2002748..2002748 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SuggestionStatement.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SuggestionStatement.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
index b8afa7e..b8afa7e 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
index 3c4110b..3c4110b 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java
index b48588f..b48588f 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java
index ebc7ae9..ebc7ae9 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslator.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslator.java
index d3dd3e1..d3dd3e1 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslator.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslator.java
diff --git a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
index fd63741..fd63741 100644
--- a/search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
+++ b/search-data-service-app/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java
diff --git a/search-data-service/src/main/resources/application.properties b/search-data-service-app/src/main/resources/application.properties
index ae8f9c3..ae8f9c3 100644
--- a/search-data-service/src/main/resources/application.properties
+++ b/search-data-service-app/src/main/resources/application.properties
diff --git a/search-data-service/src/main/resources/banner.txt b/search-data-service-app/src/main/resources/banner.txt
index 117d1e4..117d1e4 100644
--- a/search-data-service/src/main/resources/banner.txt
+++ b/search-data-service-app/src/main/resources/banner.txt
diff --git a/search-data-service/src/main/resources/json/schema/analyzer.schema.json b/search-data-service-app/src/main/resources/json/schema/analyzer.schema.json
index 7592ee9..7592ee9 100644
--- a/search-data-service/src/main/resources/json/schema/analyzer.schema.json
+++ b/search-data-service-app/src/main/resources/json/schema/analyzer.schema.json
diff --git a/search-data-service/src/main/resources/json/schema/document-field.schema.json b/search-data-service-app/src/main/resources/json/schema/document-field.schema.json
index 78d6cba..78d6cba 100644
--- a/search-data-service/src/main/resources/json/schema/document-field.schema.json
+++ b/search-data-service-app/src/main/resources/json/schema/document-field.schema.json
diff --git a/search-data-service/src/main/resources/json/schema/document.schema.json b/search-data-service-app/src/main/resources/json/schema/document.schema.json
index bbf3e50..bbf3e50 100644
--- a/search-data-service/src/main/resources/json/schema/document.schema.json
+++ b/search-data-service-app/src/main/resources/json/schema/document.schema.json
diff --git a/search-data-service/src/main/resources/json/schema/filter.schema.json b/search-data-service-app/src/main/resources/json/schema/filter.schema.json
index 6d1a030..6d1a030 100644
--- a/search-data-service/src/main/resources/json/schema/filter.schema.json
+++ b/search-data-service-app/src/main/resources/json/schema/filter.schema.json
diff --git a/search-data-service/src/main/resources/logging/SearchDbMsgs.properties b/search-data-service-app/src/main/resources/logging/SearchDbMsgs.properties
index 3e8de80..3e8de80 100644
--- a/search-data-service/src/main/resources/logging/SearchDbMsgs.properties
+++ b/search-data-service-app/src/main/resources/logging/SearchDbMsgs.properties
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/auth/SearchDbServiceAuthTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/auth/SearchDbServiceAuthTest.java
index 97e928e..97e928e 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/auth/SearchDbServiceAuthTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/auth/SearchDbServiceAuthTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java
index df6ed0e..df6ed0e 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
index fcc5b77..fcc5b77 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/BulkRequestTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkRequestTest.java
index 7d784d1..7d784d1 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/BulkRequestTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/BulkRequestTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
index 865f981..865f981 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
index c2d5021..c2d5021 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentTest.java
index e4cf335..e4cf335 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/DocumentTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
index ed84a7a..ed84a7a 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
index 93e1d49..93e1d49 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/SettingConfigurationTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/SettingConfigurationTest.java
index 9cc4e3b..9cc4e3b 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/SettingConfigurationTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/SettingConfigurationTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/StubEsController.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/StubEsController.java
index cb4edbc..cb4edbc 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/StubEsController.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/StubEsController.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/rest/TestUtils.java b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/TestUtils.java
index 0d2c615..0d2c615 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/rest/TestUtils.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/rest/TestUtils.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfigTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfigTest.java
index e840e2c..e840e2c 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfigTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfigTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
index fbc077d..fbc077d 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
index 007e3fc..007e3fc 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItemTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItemTest.java
index eef7742..eef7742 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItemTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItemTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
index bff0f4f..bff0f4f 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java
index 12b18d1..12b18d1 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
index 005cb76..005cb76 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
index 45e7c51..45e7c51 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java
index ef7325e..ef7325e 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java
index 81fa07f..81fa07f 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
index 1ebed91..1ebed91 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java
index 1f4887f..1f4887f 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQueryTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQueryTest.java
index e58e545..e58e545 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQueryTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQueryTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java
index 45ad666..45ad666 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java
index 832fa98..832fa98 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQueryTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQueryTest.java
index 9eab5f4..9eab5f4 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQueryTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQueryTest.java
diff --git a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
index 877b64f..877b64f 100644
--- a/search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
+++ b/search-data-service-app/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java
diff --git a/search-data-service/src/test/resources/json/analysis-config.json b/search-data-service-app/src/test/resources/json/analysis-config.json
index a622dcf..a622dcf 100644
--- a/search-data-service/src/test/resources/json/analysis-config.json
+++ b/search-data-service-app/src/test/resources/json/analysis-config.json
diff --git a/search-data-service/src/test/resources/json/bulk-ops-invalid.json b/search-data-service-app/src/test/resources/json/bulk-ops-invalid.json
index 4708498..4708498 100644
--- a/search-data-service/src/test/resources/json/bulk-ops-invalid.json
+++ b/search-data-service-app/src/test/resources/json/bulk-ops-invalid.json
diff --git a/search-data-service/src/test/resources/json/bulk-ops-valid.json b/search-data-service-app/src/test/resources/json/bulk-ops-valid.json
index 6e805cf..6e805cf 100644
--- a/search-data-service/src/test/resources/json/bulk-ops-valid.json
+++ b/search-data-service-app/src/test/resources/json/bulk-ops-valid.json
diff --git a/search-data-service/src/test/resources/json/dynamic-custom-template.json b/search-data-service-app/src/test/resources/json/dynamic-custom-template.json
index a7bd5ae..a7bd5ae 100644
--- a/search-data-service/src/test/resources/json/dynamic-custom-template.json
+++ b/search-data-service-app/src/test/resources/json/dynamic-custom-template.json
diff --git a/search-data-service/src/test/resources/json/dynamicIndex.json b/search-data-service-app/src/test/resources/json/dynamicIndex.json
index 5df4069..5df4069 100644
--- a/search-data-service/src/test/resources/json/dynamicIndex.json
+++ b/search-data-service-app/src/test/resources/json/dynamicIndex.json
diff --git a/search-data-service/src/test/resources/json/es-payload-translation.json b/search-data-service-app/src/test/resources/json/es-payload-translation.json
index 58ed8f6..58ed8f6 100644
--- a/search-data-service/src/test/resources/json/es-payload-translation.json
+++ b/search-data-service-app/src/test/resources/json/es-payload-translation.json
diff --git a/search-data-service/src/test/resources/json/filter-config.json b/search-data-service-app/src/test/resources/json/filter-config.json
index d1de1d7..d1de1d7 100644
--- a/search-data-service/src/test/resources/json/filter-config.json
+++ b/search-data-service-app/src/test/resources/json/filter-config.json
diff --git a/search-data-service/src/test/resources/json/index-mapping.json b/search-data-service-app/src/test/resources/json/index-mapping.json
index e447092..e447092 100644
--- a/search-data-service/src/test/resources/json/index-mapping.json
+++ b/search-data-service-app/src/test/resources/json/index-mapping.json
diff --git a/search-data-service/src/test/resources/json/nested-document.json b/search-data-service-app/src/test/resources/json/nested-document.json
index 8373a6d..8373a6d 100644
--- a/search-data-service/src/test/resources/json/nested-document.json
+++ b/search-data-service-app/src/test/resources/json/nested-document.json
diff --git a/search-data-service/src/test/resources/json/queries/query-with-subrange.json b/search-data-service-app/src/test/resources/json/queries/query-with-subrange.json
index 36e5f15..36e5f15 100644
--- a/search-data-service/src/test/resources/json/queries/query-with-subrange.json
+++ b/search-data-service-app/src/test/resources/json/queries/query-with-subrange.json
diff --git a/search-data-service/src/test/resources/json/queries/simple-parsed-query.json b/search-data-service-app/src/test/resources/json/queries/simple-parsed-query.json
index 50ce681..50ce681 100644
--- a/search-data-service/src/test/resources/json/queries/simple-parsed-query.json
+++ b/search-data-service-app/src/test/resources/json/queries/simple-parsed-query.json
diff --git a/search-data-service/src/test/resources/json/search_policy.json b/search-data-service-app/src/test/resources/json/search_policy.json
index b1abe3c..b1abe3c 100644
--- a/search-data-service/src/test/resources/json/search_policy.json
+++ b/search-data-service-app/src/test/resources/json/search_policy.json
diff --git a/search-data-service/src/test/resources/json/settings-config.json b/search-data-service-app/src/test/resources/json/settings-config.json
index 5ebdbcc..5ebdbcc 100644
--- a/search-data-service/src/test/resources/json/settings-config.json
+++ b/search-data-service-app/src/test/resources/json/settings-config.json
diff --git a/search-data-service/src/test/resources/json/simpleDocument.json b/search-data-service-app/src/test/resources/json/simpleDocument.json
index c21c574..c21c574 100644
--- a/search-data-service/src/test/resources/json/simpleDocument.json
+++ b/search-data-service-app/src/test/resources/json/simpleDocument.json
diff --git a/search-data-service/src/test/resources/json/tier-support-document.json b/search-data-service-app/src/test/resources/json/tier-support-document.json
index c6a20db..c6a20db 100644
--- a/search-data-service/src/test/resources/json/tier-support-document.json
+++ b/search-data-service-app/src/test/resources/json/tier-support-document.json