From: Edwin Lawrance Date: Mon, 4 Mar 2019 11:08:03 +0000 (+0000) Subject: Update poms to conform to merge job requirements X-Git-Tag: 1.4.2~14 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsearch-data-service.git;a=commitdiff_plain;h=57ccc376054d09367dc4bf8855adea1f19a87b3f Update poms to conform to merge job requirements Change-Id: Ic989e9538b67214e43faf221724ed5d36bfc6d03 Issue-ID: AAI-2203 Signed-off-by: Edwin Lawrance --- 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"> 4.0.0 - org.onap.aai.search-data-service + org.onap.aai elasticsearch-sg - elasticsearch with searchguard + ElasticSearch with SearchGuard 1.4.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index f7c542e..0c6300c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ 4.0.0 org.onap.aai - search-data-service-agg + search-data-service aai-search-data-service aggregate pom 1.4.0-SNAPSHOT pom - search-data-service + search-data-service-app elasticsearch-sg diff --git a/search-data-service/License.txt b/search-data-service-app/License.txt similarity index 100% rename from search-data-service/License.txt rename to 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 similarity index 100% rename from search-data-service/bundleconfig-local/etc/logback.xml rename to search-data-service-app/bundleconfig-local/etc/logback.xml diff --git a/search-data-service/pom.xml b/search-data-service-app/pom.xml similarity index 98% rename from search-data-service/pom.xml rename to 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 @@ 1.5.18.RELEASE - org.onap.aai - search-data-service + org.onap.aai.search-data-service + search-data-service-app 1.4.0-SNAPSHOT - aai-search-data-service + AAI Search Data Service Application ${basedir}/target diff --git a/search-data-service/src/main/bin/start.sh b/search-data-service-app/src/main/bin/start.sh similarity index 100% rename from search-data-service/src/main/bin/start.sh rename to 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 similarity index 100% rename from search-data-service/src/main/docker/Dockerfile rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/Application.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/ApiUtils.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/BulkApi.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/BulkOperation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/BulkRequest.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/Document.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/DocumentApi.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/IndexApi.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/rest/SettingConfiguration.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/RestEchoService.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpsController.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResultBuilder.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SuggestionStatement.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslator.java rename to 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 similarity index 100% rename from search-data-service/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java rename to 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 similarity index 100% rename from search-data-service/src/main/resources/application.properties rename to 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 similarity index 100% rename from search-data-service/src/main/resources/banner.txt rename to 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 similarity index 100% rename from search-data-service/src/main/resources/json/schema/analyzer.schema.json rename to 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 similarity index 100% rename from search-data-service/src/main/resources/json/schema/document-field.schema.json rename to 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 similarity index 100% rename from search-data-service/src/main/resources/json/schema/document.schema.json rename to 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 similarity index 100% rename from search-data-service/src/main/resources/json/schema/filter.schema.json rename to 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 similarity index 100% rename from search-data-service/src/main/resources/logging/SearchDbMsgs.properties rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/auth/SearchDbServiceAuthTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/ApiUtilsTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/BulkApiTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/BulkRequestTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentApiTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentSchemaTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/DocumentTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/IndexApiTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/SettingConfigurationTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/StubEsController.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/rest/TestUtils.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfigTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/AggregationResponseParsingTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpControllerTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItemTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatementTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregationTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregationTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/FilterTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregationTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQueryTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatementTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/SortTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQueryTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/java/org/onap/aai/sa/searchdbabstraction/util/ElasticSearchPayloadTranslatorTest.java rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/analysis-config.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/bulk-ops-invalid.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/bulk-ops-valid.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/dynamic-custom-template.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/dynamicIndex.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/es-payload-translation.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/filter-config.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/index-mapping.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/nested-document.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/queries/query-with-subrange.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/queries/simple-parsed-query.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/search_policy.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/settings-config.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/simpleDocument.json rename to 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 similarity index 100% rename from search-data-service/src/test/resources/json/tier-support-document.json rename to search-data-service-app/src/test/resources/json/tier-support-document.json