diff options
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java (renamed from src/main/java/org/openecomp/sa/auth/SearchDbServiceAuth.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java (renamed from src/main/java/org/openecomp/sa/auth/SearchDbServiceAuthCore.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java (renamed from src/main/java/org/openecomp/sa/rest/AnalysisConfiguration.java) | 11 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java (renamed from src/main/java/org/openecomp/sa/rest/AnalyzerApi.java) | 7 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/ApiUtils.java (renamed from src/main/java/org/openecomp/sa/rest/ApiUtils.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/BulkApi.java (renamed from src/main/java/org/openecomp/sa/rest/BulkApi.java) | 11 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/BulkMetaData.java (renamed from src/main/java/org/openecomp/sa/rest/BulkMetaData.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/BulkOperation.java (renamed from src/main/java/org/openecomp/sa/rest/BulkOperation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/BulkRequest.java (renamed from src/main/java/org/openecomp/sa/rest/BulkRequest.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/Document.java (renamed from src/main/java/org/openecomp/sa/rest/Document.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/DocumentApi.java (renamed from src/main/java/org/openecomp/sa/rest/DocumentApi.java) | 17 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/IndexApi.java (renamed from src/main/java/org/openecomp/sa/rest/IndexApi.java) | 13 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java (renamed from src/main/java/org/openecomp/sa/rest/SearchServiceApi.java) | 10 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsEchoService.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsEchoService.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsUserService.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsUserService.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java) | 14 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java) | 42 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationBucket.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResults.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/Document.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/DocumentOperationResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/ErrorResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/OperationResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHit.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHits.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchOperationResult.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/logging/SearchDbMsgs.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AbstractAggregation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Aggregation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatement.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRange.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Filter.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/ParsedQuery.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Query.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryStatement.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/RangeQuery.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatement.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Sort.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/TermQuery.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/service/SearchService.java) | 10 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/util/AggregationParsingUtil.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/util/DocumentSchemaUtil.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java (renamed from src/main/java/org/openecomp/sa/searchdbabstraction/util/SearchDbConstants.java) | 2 |
57 files changed, 126 insertions, 119 deletions
diff --git a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuth.java b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java index e0b4b1e..ba60b5a 100644 --- a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuth.java +++ b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuth.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.auth; +package org.onap.aai.sa.auth; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.HttpHeaders; diff --git a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuthCore.java b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java index e5c77e0..e7541cb 100644 --- a/src/main/java/org/openecomp/sa/auth/SearchDbServiceAuthCore.java +++ b/src/main/java/org/onap/aai/sa/auth/SearchDbServiceAuthCore.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.auth; +package org.onap.aai.sa.auth; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/org/openecomp/sa/rest/AnalysisConfiguration.java b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java index d05d50d..ab680cc 100644 --- a/src/main/java/org/openecomp/sa/rest/AnalysisConfiguration.java +++ b/src/main/java/org/onap/aai/sa/rest/AnalysisConfiguration.java @@ -20,15 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.rest.AnalyzerSchema; -import org.openecomp.sa.rest.FilterSchema; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; -import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants; +import org.onap.aai.sa.rest.AnalyzerSchema; +import org.onap.aai.sa.rest.FilterSchema; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/openecomp/sa/rest/AnalyzerApi.java b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java index a02f55c..442b696 100644 --- a/src/main/java/org/openecomp/sa/rest/AnalyzerApi.java +++ b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java @@ -20,14 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.rest.AnalyzerSchema; import java.util.concurrent.atomic.AtomicBoolean; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/org/openecomp/sa/rest/ApiUtils.java b/src/main/java/org/onap/aai/sa/rest/ApiUtils.java index dc7f0cb..bd6afb0 100644 --- a/src/main/java/org/openecomp/sa/rest/ApiUtils.java +++ b/src/main/java/org/onap/aai/sa/rest/ApiUtils.java @@ -20,10 +20,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; +import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants; import org.openecomp.cl.mdc.MdcContext; -import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants; import org.slf4j.MDC; import java.util.UUID; diff --git a/src/main/java/org/openecomp/sa/rest/BulkApi.java b/src/main/java/org/onap/aai/sa/rest/BulkApi.java index 6557dcb..143f248 100644 --- a/src/main/java/org/openecomp/sa/rest/BulkApi.java +++ b/src/main/java/org/onap/aai/sa/rest/BulkApi.java @@ -20,19 +20,20 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.fge.jsonschema.main.JsonSchema; import com.github.fge.jsonschema.main.JsonSchemaFactory; + +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; +import org.onap.aai.sa.searchdbabstraction.entity.OperationResult; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; -import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; -import org.openecomp.sa.searchdbabstraction.entity.OperationResult; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/org/openecomp/sa/rest/BulkMetaData.java b/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java index f0ca73d..56de4ac 100644 --- a/src/main/java/org/openecomp/sa/rest/BulkMetaData.java +++ b/src/main/java/org/onap/aai/sa/rest/BulkMetaData.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; public class BulkMetaData { diff --git a/src/main/java/org/openecomp/sa/rest/BulkOperation.java b/src/main/java/org/onap/aai/sa/rest/BulkOperation.java index 565aec3..a717b1c 100644 --- a/src/main/java/org/openecomp/sa/rest/BulkOperation.java +++ b/src/main/java/org/onap/aai/sa/rest/BulkOperation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; /** * This class represents a single instance of an operation to be performed diff --git a/src/main/java/org/openecomp/sa/rest/BulkRequest.java b/src/main/java/org/onap/aai/sa/rest/BulkRequest.java index ac2c7ba..34ca939 100644 --- a/src/main/java/org/openecomp/sa/rest/BulkRequest.java +++ b/src/main/java/org/onap/aai/sa/rest/BulkRequest.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; /** diff --git a/src/main/java/org/openecomp/sa/rest/Document.java b/src/main/java/org/onap/aai/sa/rest/Document.java index 6b5cc3b..637cfef 100644 --- a/src/main/java/org/openecomp/sa/rest/Document.java +++ b/src/main/java/org/onap/aai/sa/rest/Document.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/org/openecomp/sa/rest/DocumentApi.java b/src/main/java/org/onap/aai/sa/rest/DocumentApi.java index 8762380..e20c3e3 100644 --- a/src/main/java/org/openecomp/sa/rest/DocumentApi.java +++ b/src/main/java/org/onap/aai/sa/rest/DocumentApi.java @@ -20,22 +20,23 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntityImpl; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; +import org.onap.aai.sa.searchdbabstraction.entity.AggregationResults; +import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult; +import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.searchdbabstraction.searchapi.SearchStatement; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreDataEntityImpl; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; -import org.openecomp.sa.searchdbabstraction.entity.AggregationResults; -import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult; -import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; -import org.openecomp.sa.searchdbabstraction.searchapi.SearchStatement; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/org/openecomp/sa/rest/IndexApi.java b/src/main/java/org/onap/aai/sa/rest/IndexApi.java index 7968b1b..4e89fb9 100644 --- a/src/main/java/org/openecomp/sa/rest/IndexApi.java +++ b/src/main/java/org/onap/aai/sa/rest/IndexApi.java @@ -20,17 +20,20 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; import com.fasterxml.jackson.databind.ObjectMapper; + +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; +import org.onap.aai.sa.searchdbabstraction.entity.OperationResult; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; -import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; -import org.openecomp.sa.searchdbabstraction.entity.OperationResult; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.rest.DocumentFieldSchema; +import org.onap.aai.sa.rest.DocumentSchema; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/org/openecomp/sa/rest/SearchServiceApi.java b/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java index f6afefe..183a427 100644 --- a/src/main/java/org/openecomp/sa/rest/SearchServiceApi.java +++ b/src/main/java/org/onap/aai/sa/rest/SearchServiceApi.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.rest; +package org.onap.aai.sa.rest; -import org.openecomp.sa.auth.SearchDbServiceAuth; -import org.openecomp.sa.rest.ApiUtils.Action; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; +import org.onap.aai.sa.auth.SearchDbServiceAuth; +import org.onap.aai.sa.rest.ApiUtils.Action; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.DocumentStoreInterface; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; import java.security.cert.X509Certificate; import javax.security.auth.x500.X500Principal; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsEchoService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsEchoService.java index c2726ca..9133b97 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsEchoService.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsEchoService.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction; +package org.onap.aai.sa.searchdbabstraction; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsUserService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsUserService.java index 5c80f05..c3e5b37 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/JaxrsUserService.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/JaxrsUserService.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction; +package org.onap.aai.sa.searchdbabstraction; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java index 1a3dd00..97d7677 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.config; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.config; import java.util.Properties; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java index 87b38c1..783d2c4 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntity.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; public interface DocumentStoreDataEntity { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java index 442b615..5de3fab 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreDataEntityImpl.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; public class DocumentStoreDataEntityImpl implements DocumentStoreDataEntity { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java index 73a5683..0964a74 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/DocumentStoreInterface.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; -import org.openecomp.sa.rest.BulkRequest; -import org.openecomp.sa.rest.DocumentSchema; -import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; -import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult; -import org.openecomp.sa.searchdbabstraction.entity.OperationResult; -import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult; +import org.onap.aai.sa.rest.BulkRequest; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; +import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult; +import org.onap.aai.sa.searchdbabstraction.entity.OperationResult; +import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult; +import org.onap.aai.sa.rest.DocumentSchema; public interface DocumentStoreInterface { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java index 6aff3b8..f0d4283 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchBulkOperationResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; import java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java index ba5be26..40839a1 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchCause.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; public class ElasticSearchCause { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java index 7ebf48c..a7f7d72 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchError.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java index cd07200..383fcb0 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; import com.att.aft.dme2.internal.google.common.base.Throwables; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -33,32 +33,32 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.onap.aai.sa.rest.AnalysisConfiguration; +import org.onap.aai.sa.rest.ApiUtils; +import org.onap.aai.sa.rest.BulkRequest; +import org.onap.aai.sa.rest.BulkRequest.OperationType; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; +import org.onap.aai.sa.searchdbabstraction.entity.AggregationResult; +import org.onap.aai.sa.searchdbabstraction.entity.AggregationResults; +import org.onap.aai.sa.searchdbabstraction.entity.Document; +import org.onap.aai.sa.searchdbabstraction.entity.DocumentOperationResult; +import org.onap.aai.sa.searchdbabstraction.entity.ErrorResult; +import org.onap.aai.sa.searchdbabstraction.entity.OperationResult; +import org.onap.aai.sa.searchdbabstraction.entity.SearchHit; +import org.onap.aai.sa.searchdbabstraction.entity.SearchHits; +import org.onap.aai.sa.searchdbabstraction.entity.SearchOperationResult; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.searchdbabstraction.util.AggregationParsingUtil; +import org.onap.aai.sa.searchdbabstraction.util.DocumentSchemaUtil; +import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; import org.openecomp.cl.mdc.MdcContext; import org.openecomp.cl.mdc.MdcOverride; -import org.openecomp.sa.rest.AnalysisConfiguration; -import org.openecomp.sa.rest.ApiUtils; -import org.openecomp.sa.rest.BulkRequest; -import org.openecomp.sa.rest.BulkRequest.OperationType; -import org.openecomp.sa.rest.DocumentSchema; -import org.openecomp.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig; -import org.openecomp.sa.searchdbabstraction.elasticsearch.exception.DocumentStoreOperationException; -import org.openecomp.sa.searchdbabstraction.entity.AggregationResult; -import org.openecomp.sa.searchdbabstraction.entity.AggregationResults; -import org.openecomp.sa.searchdbabstraction.entity.Document; -import org.openecomp.sa.searchdbabstraction.entity.DocumentOperationResult; -import org.openecomp.sa.searchdbabstraction.entity.ErrorResult; -import org.openecomp.sa.searchdbabstraction.entity.OperationResult; -import org.openecomp.sa.searchdbabstraction.entity.SearchHit; -import org.openecomp.sa.searchdbabstraction.entity.SearchHits; -import org.openecomp.sa.searchdbabstraction.entity.SearchOperationResult; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; -import org.openecomp.sa.searchdbabstraction.util.AggregationParsingUtil; -import org.openecomp.sa.searchdbabstraction.util.DocumentSchemaUtil; -import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants; +import org.onap.aai.sa.rest.DocumentSchema; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java index c463110..25a6afc 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchOperationStatus.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java index 9b24c5d..fdba9cf 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; -import org.openecomp.sa.rest.ApiUtils; +import org.onap.aai.sa.rest.ApiUtils; public class ElasticSearchResultItem { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java index 158e295..1d24c82 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchShardStatus.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.dao; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.dao; public class ElasticSearchShardStatus { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java index 441f1d1..ab45ea7 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/exception/DocumentStoreOperationException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.elasticsearch.exception; +package org.onap.aai.sa.searchdbabstraction.elasticsearch.exception; public class DocumentStoreOperationException extends Exception { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationBucket.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java index d02e526..625a7b7 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationBucket.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationBucket.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; import com.fasterxml.jackson.annotation.JsonProperty; import edu.emory.mathcs.backport.java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java index 0c57de4..5b04009 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; import com.fasterxml.jackson.annotation.JsonProperty; import edu.emory.mathcs.backport.java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResults.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java index 0ea1088..f26a0fd 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/AggregationResults.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/AggregationResults.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; import java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/Document.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java index 2634846..4a5d834 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/Document.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/Document.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; import org.json.simple.JSONObject; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/DocumentOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java index 8400700..5d14e75 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/DocumentOperationResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/DocumentOperationResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; public class DocumentOperationResult extends OperationResult { private Document document; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/ErrorResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java index c930072..3a910a2 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/ErrorResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/ErrorResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; public class ErrorResult { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/OperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java index 20822d8..36d072f 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/OperationResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/OperationResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; public class OperationResult { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHit.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java index 5ee6b40..9015d53 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHit.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHit.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; public class SearchHit { private String score; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHits.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java index 8aa6f2b..2c58377 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchHits.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchHits.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; import java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java index 581fc49..540149e 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/entity/SearchOperationResult.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.entity; +package org.onap.aai.sa.searchdbabstraction.entity; public class SearchOperationResult extends OperationResult { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/logging/SearchDbMsgs.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java index cbc6abf..fd30e6e 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/logging/SearchDbMsgs.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/logging/SearchDbMsgs.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.logging; +package org.onap.aai.sa.searchdbabstraction.logging; import com.att.eelf.i18n.EELFResourceManager; import org.openecomp.cl.eelf.LogMessageEnum; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AbstractAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java index 02a57d8..33f5ed7 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AbstractAggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AbstractAggregation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Aggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java index 3bd74a3..0585ec3 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Aggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Aggregation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java index ba62f74..a207e1a 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/AggregationStatement.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/AggregationStatement.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java index 2edad68..5088410 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateHistogramAggregation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRange.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java index 69e795d..448abdc 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRange.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRange.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java index f893905..bf1ae9f 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/DateRangeAggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Filter.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java index bfed378..3d48cbe 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Filter.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Filter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java index fbd120c..cdb113f 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/GroupByAggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/GroupByAggregation.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; /** * An example of a date_range aggregation: diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/ParsedQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java index bacb2ef..8fab4f0 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/ParsedQuery.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/ParsedQuery.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Query.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java index 991b50c..7975a05 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Query.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Query.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; public class Query { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java index e8687b3..25b42de 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/QueryStatement.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/QueryStatement.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/RangeQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java index 9b8bc08..32cc8d1 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/RangeQuery.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/RangeQuery.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatement.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java index 38ea80d..11eee1e 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/SearchStatement.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/SearchStatement.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; import org.radeox.util.logging.Logger; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Sort.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java index 3e98621..3fb0afe 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/Sort.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/Sort.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; public class Sort { diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/TermQuery.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java index 109d88c..297e347 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/searchapi/TermQuery.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/TermQuery.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.searchapi; +package org.onap.aai.sa.searchdbabstraction.searchapi; import com.fasterxml.jackson.annotation.JsonProperty; import edu.emory.mathcs.backport.java.util.Arrays; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/service/SearchService.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java index c31307c..e1d4536 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/service/SearchService.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/service/SearchService.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.service; +package org.onap.aai.sa.searchdbabstraction.service; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig; +import org.onap.aai.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; +import org.onap.aai.sa.searchdbabstraction.logging.SearchDbMsgs; +import org.onap.aai.sa.searchdbabstraction.util.SearchDbConstants; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.sa.searchdbabstraction.elasticsearch.config.ElasticSearchConfig; -import org.openecomp.sa.searchdbabstraction.elasticsearch.dao.ElasticSearchHttpController; -import org.openecomp.sa.searchdbabstraction.logging.SearchDbMsgs; -import org.openecomp.sa.searchdbabstraction.util.SearchDbConstants; import java.io.FileInputStream; import java.util.Properties; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/AggregationParsingUtil.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java index 3f61e28..04261f3 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/AggregationParsingUtil.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/AggregationParsingUtil.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.util; +package org.onap.aai.sa.searchdbabstraction.util; import com.fasterxml.jackson.core.JsonProcessingException; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.openecomp.sa.searchdbabstraction.entity.AggregationBucket; -import org.openecomp.sa.searchdbabstraction.entity.AggregationResult; +import org.onap.aai.sa.searchdbabstraction.entity.AggregationBucket; +import org.onap.aai.sa.searchdbabstraction.entity.AggregationResult; import java.util.Iterator; import java.util.Set; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/DocumentSchemaUtil.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java index 34d1837..1e27dc4 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/DocumentSchemaUtil.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/DocumentSchemaUtil.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.util; +package org.onap.aai.sa.searchdbabstraction.util; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.openecomp.sa.rest.DocumentFieldSchema; -import org.openecomp.sa.rest.DocumentSchema; +import org.onap.aai.sa.rest.DocumentFieldSchema; +import org.onap.aai.sa.rest.DocumentSchema; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/openecomp/sa/searchdbabstraction/util/SearchDbConstants.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java index 457980e..e4f62ef 100644 --- a/src/main/java/org/openecomp/sa/searchdbabstraction/util/SearchDbConstants.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/util/SearchDbConstants.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.sa.searchdbabstraction.util; +package org.onap.aai.sa.searchdbabstraction.util; public class SearchDbConstants { public static final String SDB_FILESEP = (System.getProperty("file.separator") == null) ? "/" |