Renaming openecomp to onap 63/15663/1
authorArul.Nambi <arul.nambi@amdocs.com>
Tue, 26 Sep 2017 18:00:57 +0000 (14:00 -0400)
committerArul.Nambi <arul.nambi@amdocs.com>
Tue, 26 Sep 2017 18:01:41 +0000 (14:01 -0400)
Issue-ID: AAI-208
Change-Id: I2bd02287bed376111156aca0100e2b7b74e368e3
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
214 files changed:
pom.xml
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
src/main/config/runner-web.xml
src/main/java/org/onap/aai/sparky/HelloWorld.java [moved from src/main/java/org/openecomp/sparky/HelloWorld.java with 97% similarity]
src/main/java/org/onap/aai/sparky/JaxrsEchoService.java [moved from src/main/java/org/openecomp/sparky/JaxrsEchoService.java with 98% similarity]
src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java [moved from src/main/java/org/openecomp/sparky/analytics/AbstractStatistics.java with 87% similarity]
src/main/java/org/onap/aai/sparky/analytics/AveragingRingBuffer.java [moved from src/main/java/org/openecomp/sparky/analytics/AveragingRingBuffer.java with 98% similarity]
src/main/java/org/onap/aai/sparky/analytics/ComponentStatistics.java [moved from src/main/java/org/openecomp/sparky/analytics/ComponentStatistics.java with 98% similarity]
src/main/java/org/onap/aai/sparky/analytics/HistogramSampler.java [moved from src/main/java/org/openecomp/sparky/analytics/HistogramSampler.java with 99% similarity]
src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java [moved from src/main/java/org/openecomp/sparky/analytics/HistoricalCounter.java with 98% similarity]
src/main/java/org/onap/aai/sparky/config/Configurable.java [moved from src/main/java/org/openecomp/sparky/config/Configurable.java with 92% similarity]
src/main/java/org/onap/aai/sparky/config/exception/ConfigurationException.java [moved from src/main/java/org/openecomp/sparky/config/exception/ConfigurationException.java with 96% similarity]
src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReference.java [moved from src/main/java/org/openecomp/sparky/config/oxm/CrossEntityReference.java with 98% similarity]
src/main/java/org/onap/aai/sparky/config/oxm/OxmEntityDescriptor.java [moved from src/main/java/org/openecomp/sparky/config/oxm/OxmEntityDescriptor.java with 97% similarity]
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java [moved from src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java with 98% similarity]
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoaderFilter.java [moved from src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoaderFilter.java with 95% similarity]
src/main/java/org/onap/aai/sparky/dal/NetworkTransaction.java [moved from src/main/java/org/openecomp/sparky/dal/NetworkTransaction.java with 94% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java [moved from src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryAdapter.java with 89% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryDataProvider.java [moved from src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryDataProvider.java with 92% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryEntityStatistics.java [moved from src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryEntityStatistics.java with 96% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java [moved from src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java with 93% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfig.java [moved from src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfig.java with 92% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java [moved from src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfig.java with 98% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java [moved from src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfig.java with 96% similarity]
src/main/java/org/onap/aai/sparky/dal/aai/enums/RestAuthenticationMode.java [moved from src/main/java/org/openecomp/sparky/dal/aai/enums/RestAuthenticationMode.java with 97% similarity]
src/main/java/org/onap/aai/sparky/dal/cache/EntityCache.java [moved from src/main/java/org/openecomp/sparky/dal/cache/EntityCache.java with 94% similarity]
src/main/java/org/onap/aai/sparky/dal/cache/InMemoryEntityCache.java [moved from src/main/java/org/openecomp/sparky/dal/cache/InMemoryEntityCache.java with 80% similarity]
src/main/java/org/onap/aai/sparky/dal/cache/PersistentEntityCache.java [moved from src/main/java/org/openecomp/sparky/dal/cache/PersistentEntityCache.java with 88% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchAdapter.java with 74% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchDataProvider.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchDataProvider.java with 89% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java with 96% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/HashQueryResponse.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/HashQueryResponse.java with 94% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/SearchAdapter.java with 80% similarity]
src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java [moved from src/main/java/org/openecomp/sparky/dal/elasticsearch/config/ElasticSearchConfig.java with 98% similarity]
src/main/java/org/onap/aai/sparky/dal/exception/ElasticSearchOperationException.java [moved from src/main/java/org/openecomp/sparky/dal/exception/ElasticSearchOperationException.java with 97% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/HttpMethod.java [moved from src/main/java/org/openecomp/sparky/dal/rest/HttpMethod.java with 96% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/OperationResult.java [moved from src/main/java/org/openecomp/sparky/dal/rest/OperationResult.java with 99% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/RestClientBuilder.java [moved from src/main/java/org/openecomp/sparky/dal/rest/RestClientBuilder.java with 96% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/RestDataProvider.java [moved from src/main/java/org/openecomp/sparky/dal/rest/RestDataProvider.java with 98% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/RestOperationalStatistics.java [moved from src/main/java/org/openecomp/sparky/dal/rest/RestOperationalStatistics.java with 98% similarity]
src/main/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessor.java [moved from src/main/java/org/openecomp/sparky/dal/rest/RestfulDataAccessor.java with 89% similarity]
src/main/java/org/onap/aai/sparky/dal/sas/config/SearchServiceConfig.java [moved from src/main/java/org/openecomp/sparky/dal/sas/config/SearchServiceConfig.java with 97% similarity]
src/main/java/org/onap/aai/sparky/dal/servlet/ResettableStreamHttpServletRequest.java [moved from src/main/java/org/openecomp/sparky/dal/servlet/ResettableStreamHttpServletRequest.java with 98% similarity]
src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java [moved from src/main/java/org/openecomp/sparky/inventory/EntityHistoryQueryBuilder.java with 99% similarity]
src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java [moved from src/main/java/org/openecomp/sparky/inventory/entity/GeoIndexDocument.java with 96% similarity]
src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java [moved from src/main/java/org/openecomp/sparky/inventory/entity/TopographicalEntity.java with 99% similarity]
src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java [moved from src/main/java/org/openecomp/sparky/inventory/servlet/EntityCountHistoryServlet.java with 94% similarity]
src/main/java/org/onap/aai/sparky/inventory/servlet/GeoVisualizationServlet.java [moved from src/main/java/org/openecomp/sparky/inventory/servlet/GeoVisualizationServlet.java with 92% similarity]
src/main/java/org/onap/aai/sparky/logging/AaiUiMsgs.java [moved from src/main/java/org/openecomp/sparky/logging/AaiUiMsgs.java with 99% similarity]
src/main/java/org/onap/aai/sparky/logging/util/LoggingUtils.java [moved from src/main/java/org/openecomp/sparky/logging/util/LoggingUtils.java with 97% similarity]
src/main/java/org/onap/aai/sparky/search/EntityTypeSummary.java [moved from src/main/java/org/openecomp/sparky/search/EntityTypeSummary.java with 97% similarity]
src/main/java/org/onap/aai/sparky/search/EntityTypeSummaryBucket.java [moved from src/main/java/org/openecomp/sparky/search/EntityTypeSummaryBucket.java with 97% similarity]
src/main/java/org/onap/aai/sparky/search/SearchEntityProperties.java [moved from src/main/java/org/openecomp/sparky/search/SearchEntityProperties.java with 97% similarity]
src/main/java/org/onap/aai/sparky/search/Suggestion.java [moved from src/main/java/org/openecomp/sparky/search/Suggestion.java with 98% similarity]
src/main/java/org/onap/aai/sparky/search/SuggestionList.java [moved from src/main/java/org/openecomp/sparky/search/SuggestionList.java with 98% similarity]
src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java [moved from src/main/java/org/openecomp/sparky/search/VnfSearchQueryBuilder.java with 99% similarity]
src/main/java/org/onap/aai/sparky/search/VnfSearchService.java [moved from src/main/java/org/openecomp/sparky/search/VnfSearchService.java with 94% similarity]
src/main/java/org/onap/aai/sparky/search/config/SuggestionConfig.java [moved from src/main/java/org/openecomp/sparky/search/config/SuggestionConfig.java with 97% similarity]
src/main/java/org/onap/aai/sparky/security/EcompSso.java [moved from src/main/java/org/openecomp/sparky/security/EcompSso.java with 95% similarity]
src/main/java/org/onap/aai/sparky/security/SecurityContextFactory.java [moved from src/main/java/org/openecomp/sparky/security/SecurityContextFactory.java with 98% similarity]
src/main/java/org/onap/aai/sparky/security/SecurityContextFactoryImpl.java [moved from src/main/java/org/openecomp/sparky/security/SecurityContextFactoryImpl.java with 99% similarity]
src/main/java/org/onap/aai/sparky/security/filter/LoginFilter.java [moved from src/main/java/org/openecomp/sparky/security/filter/LoginFilter.java with 96% similarity]
src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java [moved from src/main/java/org/openecomp/sparky/security/portal/PortalRestAPIServiceImpl.java with 95% similarity]
src/main/java/org/onap/aai/sparky/security/portal/UserManager.java [moved from src/main/java/org/openecomp/sparky/security/portal/UserManager.java with 97% similarity]
src/main/java/org/onap/aai/sparky/security/portal/config/PortalAuthenticationConfig.java [moved from src/main/java/org/openecomp/sparky/security/portal/config/PortalAuthenticationConfig.java with 93% similarity]
src/main/java/org/onap/aai/sparky/security/portal/config/RolesConfig.java [moved from src/main/java/org/openecomp/sparky/security/portal/config/RolesConfig.java with 95% similarity]
src/main/java/org/onap/aai/sparky/suggestivesearch/SuggestionEntity.java [moved from src/main/java/org/openecomp/sparky/suggestivesearch/SuggestionEntity.java with 94% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/AbstractEntitySynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/AbstractEntitySynchronizer.java with 94% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSuggestionSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/AggregationSuggestionSynchronizer.java with 88% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/AggregationSynchronizer.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/AutosuggestionSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/AutosuggestionSynchronizer.java with 94% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/CrossEntityReferenceSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/CrossEntityReferenceSynchronizer.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java [moved from src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java with 96% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/GeoSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/GeoSynchronizer.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/HistoricalEntitySummarizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/HistoricalEntitySummarizer.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/IndexCleaner.java [moved from src/main/java/org/openecomp/sparky/synchronizer/IndexCleaner.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java [moved from src/main/java/org/openecomp/sparky/synchronizer/IndexIntegrityValidator.java with 88% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/IndexSynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/IndexSynchronizer.java with 89% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/IndexValidator.java [moved from src/main/java/org/openecomp/sparky/synchronizer/IndexValidator.java with 97% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java [moved from src/main/java/org/openecomp/sparky/synchronizer/MyErrorHandler.java with 98% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/SearchableEntitySynchronizer.java [moved from src/main/java/org/openecomp/sparky/synchronizer/SearchableEntitySynchronizer.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/SyncController.java [moved from src/main/java/org/openecomp/sparky/synchronizer/SyncController.java with 97% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/SyncHelper.java [moved from src/main/java/org/openecomp/sparky/synchronizer/SyncHelper.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java [moved from src/main/java/org/openecomp/sparky/synchronizer/TaskProcessingStats.java with 96% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/TransactionRateController.java [moved from src/main/java/org/openecomp/sparky/synchronizer/TransactionRateController.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java [moved from src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConfiguration.java with 98% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConstants.java [moved from src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConstants.java with 98% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/config/TaskProcessorConfig.java [moved from src/main/java/org/openecomp/sparky/synchronizer/config/TaskProcessorConfig.java with 99% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationEntity.java with 94% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationSuggestionEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationSuggestionEntity.java with 96% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexDocument.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/IndexDocument.java with 96% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableCrossEntityReference.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableCrossEntityReference.java with 94% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableEntity.java with 96% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/MergableEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/MergableEntity.java with 97% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/ObjectIdCollection.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/ObjectIdCollection.java with 97% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/SearchableEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/SearchableEntity.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/SelfLinkDescriptor.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/SelfLinkDescriptor.java with 98% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/SuggestionSearchEntity.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/SuggestionSearchEntity.java with 98% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/entity/TransactionStorageType.java [moved from src/main/java/org/openecomp/sparky/synchronizer/entity/TransactionStorageType.java with 97% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/OperationState.java [moved from src/main/java/org/openecomp/sparky/synchronizer/enumeration/OperationState.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/SynchronizerState.java [moved from src/main/java/org/openecomp/sparky/synchronizer/enumeration/SynchronizerState.java with 95% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java [moved from src/main/java/org/openecomp/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java with 90% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntitySelfLinkTask.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchPut.java with 92% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchRetrieval.java with 91% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchUpdate.java with 92% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/PersistOperationResultToDisk.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java with 93% similarity]
src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java [moved from src/main/java/org/openecomp/sparky/synchronizer/task/StoreDocumentTask.java with 89% similarity]
src/main/java/org/onap/aai/sparky/util/ConfigHelper.java [moved from src/main/java/org/openecomp/sparky/util/ConfigHelper.java with 96% similarity]
src/main/java/org/onap/aai/sparky/util/EncryptConvertor.java [moved from src/main/java/org/openecomp/sparky/util/EncryptConvertor.java with 99% similarity]
src/main/java/org/onap/aai/sparky/util/Encryptor.java [moved from src/main/java/org/openecomp/sparky/util/Encryptor.java with 99% similarity]
src/main/java/org/onap/aai/sparky/util/ErrorUtil.java [moved from src/main/java/org/openecomp/sparky/util/ErrorUtil.java with 98% similarity]
src/main/java/org/onap/aai/sparky/util/JsonXmlConverter.java [moved from src/main/java/org/openecomp/sparky/util/JsonXmlConverter.java with 98% similarity]
src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java [moved from src/main/java/org/openecomp/sparky/util/KeystoreBuilder.java with 99% similarity]
src/main/java/org/onap/aai/sparky/util/NodeUtils.java [moved from src/main/java/org/openecomp/sparky/util/NodeUtils.java with 98% similarity]
src/main/java/org/onap/aai/sparky/util/RawByteHelper.java [moved from src/main/java/org/openecomp/sparky/util/RawByteHelper.java with 99% similarity]
src/main/java/org/onap/aai/sparky/util/ServletUtils.java [moved from src/main/java/org/openecomp/sparky/util/ServletUtils.java with 94% similarity]
src/main/java/org/onap/aai/sparky/util/SuggestionsPermutation.java [moved from src/main/java/org/openecomp/sparky/util/SuggestionsPermutation.java with 96% similarity]
src/main/java/org/onap/aai/sparky/util/TreeWalker.java [moved from src/main/java/org/openecomp/sparky/util/TreeWalker.java with 99% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/EntityTypeAggregation.java with 94% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/config/TierSupportUiConstants.java with 98% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/config/VisualizationConfig.java with 98% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/ActiveInventoryNode.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/D3VisualizationOutput.java with 98% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntry.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/EntityEntry.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/GraphMeta.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/GraphMeta.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/InlineMessage.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/InlineMessage.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNode.java with 99% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNodeLink.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNodeLink.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeDebug.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeDebug.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeMeta.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeMeta.java with 96% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeProcessingTransaction.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeProcessingTransaction.java with 96% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryParams.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryParams.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryRequest.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryRequest.java with 96% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QuerySearchEntity.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/QuerySearchEntity.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelatedToProperty.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/RelatedToProperty.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Relationship.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/Relationship.java with 98% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipData.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipData.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipDirectionality.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipDirectionality.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipList.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SearchResponse.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/SearchResponse.java with 95% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java with 95% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/entity/Violations.java with 98% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingAction.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingAction.java with 96% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingState.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingState.java with 95% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/services/SearchServiceWrapper.java with 96% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationContext.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationContext.java with 97% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationService.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationService.java with 89% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationTransformer.java with 92% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/servlet/SearchServlet.java with 88% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/VisualizationServlet.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/servlet/VisualizationServlet.java with 91% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java with 91% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java with 89% similarity]
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java [moved from src/main/java/org/openecomp/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java with 87% similarity]
src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java [moved from src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java with 97% similarity]
src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java [moved from src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java with 96% similarity]
src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java [moved from src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java with 99% similarity]
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java [moved from src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java with 95% similarity]
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java [moved from src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java with 98% similarity]
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java [moved from src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java with 98% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java with 98% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java with 96% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java with 96% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java with 96% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java with 95% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java with 96% similarity]
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java [moved from src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java with 95% similarity]
src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java [moved from src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java [moved from src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java with 94% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java with 97% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java with 99% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java with 96% similarity]
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java [moved from src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java with 97% similarity]
src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java [moved from src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java with 97% similarity]
src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java [moved from src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java with 95% similarity]
src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java [moved from src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java with 95% similarity]
src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java [moved from src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java with 97% similarity]
src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java [moved from src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java with 98% similarity]
src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java [moved from src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java with 96% similarity]
src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java [moved from src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java with 93% similarity]
src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java [moved from src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java with 99% similarity]
src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java [moved from src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java with 92% similarity]
src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java [moved from src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java with 95% similarity]
src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java [moved from src/test/java/org/openecomp/sparky/util/ExceptionHelper.java with 98% similarity]
src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java [moved from src/test/java/org/openecomp/sparky/util/HttpServletHelper.java with 99% similarity]
src/test/java/org/onap/aai/sparky/util/LogValidator.java [moved from src/test/java/org/openecomp/sparky/util/LogValidator.java with 98% similarity]
src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java [moved from src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java with 94% similarity]
src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java [moved from src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java with 99% similarity]
src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java [moved from src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java with 98% similarity]
src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java [moved from src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java with 93% similarity]
src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java [moved from src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java with 99% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java with 98% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java with 93% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java with 93% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java with 92% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java with 98% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java with 89% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java with 95% similarity]
src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java [moved from src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java with 95% similarity]

diff --git a/pom.xml b/pom.xml
index 388ec19..35767f6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
                <groupId>com.att.ajsc</groupId>
                <version>2.0.0</version>
        </parent>
-       <groupId>org.openecomp.aai.sparky-be</groupId>
+       <groupId>org.onap.aai.sparky-be</groupId>
        <artifactId>sparky-be</artifactId>
        <version>1.0-SNAPSHOT</version>
        <name>aai-sparky-be</name>
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.aai</groupId>
+                       <groupId>org.onap.aai</groupId>
                        <artifactId>rest-client</artifactId>
             <version>1.1.0-SNAPSHOT</version>
                </dependency>
 
                <!-- Common logging framework -->
                <dependency>
-                 <groupId>org.openecomp.aai.logging-service</groupId>
+                 <groupId>org.onap.aai.logging-service</groupId>
                  <artifactId>common-logging</artifactId>
-                 <version>1.0.0</version>
+                 <version>1.1.0-SNAPSHOT</version>
                </dependency>
                
                <dependency>
                </dependency>
                
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-fw</artifactId>
-                       <version>1.1.0</version>
+                       <version>1.3.0 </version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
                                                        <configuration>
                                                                <artifactItems>
                                                                        <artifactItem>
-                                                                               <groupId>org.openecomp.aai</groupId>
+                                                                               <groupId>org.onap.aai</groupId>
                                                                                <artifactId>sparky-fe</artifactId>
                                                                                <version>1.0.0-SNAPSHOT</version>
                                                                                <type>war</type>
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>                              
+                    <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>                              
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
index b311770..c052560 100644 (file)
@@ -4,5 +4,5 @@
               http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
        <bean id="helloWorld" name="helloWorld"
-               class="org.openecomp.sparky.HelloWorld" />
+               class="org.onap.aai.sparky.HelloWorld" />
 </beans>               
index da9b558..b65cb80 100644 (file)
@@ -3,7 +3,7 @@ beans{
        xmlns jaxrs: "http://cxf.apache.org/jaxrs"
        xmlns util: "http://www.springframework.org/schema/util"
        
-       echoService(org.openecomp.sparky.JaxrsEchoService)
+       echoService(org.onap.aai.sparky.JaxrsEchoService)
        
        util.list(id: 'jaxrsServices') {
                ref(bean:'echoService')
index abfdf74..f70d71b 100644 (file)
 
        <servlet>
                <servlet-name>VisualizationServlet</servlet-name>
-               <servlet-class>org.openecomp.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class>
+               <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class>
        </servlet>
 
        <servlet>
                <servlet-name>GeoVisualizationServlet</servlet-name>
-               <servlet-class>org.openecomp.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class>
+               <servlet-class>org.onap.aai.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class>
        </servlet>
 
        <servlet>
                <servlet-name>EntityCountHistoryServlet</servlet-name>
-               <servlet-class>org.openecomp.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class>
+               <servlet-class>org.onap.aai.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class>
        </servlet>
 
     
 
        <filter>
                <filter-name>ElasticSearchSynchronizerFilter</filter-name>
-               <filter-class>org.openecomp.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class>
+               <filter-class>org.onap.aai.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class>
        </filter>
 
        <filter>
                <filter-name>OxmModelLoaderFilter</filter-name>
-               <filter-class>org.openecomp.sparky.config.oxm.OxmModelLoaderFilter</filter-class>
+               <filter-class>org.onap.aai.sparky.config.oxm.OxmModelLoaderFilter</filter-class>
        </filter>
 
        <filter>
@@ -73,7 +73,7 @@
 
        <servlet>
                <servlet-name>SearchServlet</servlet-name>
-               <servlet-class>org.openecomp.sparky.viewandinspect.servlet.SearchServlet</servlet-class>
+               <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.SearchServlet</servlet-class>
        </servlet>
 
        <filter>
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky;
+package org.onap.aai.sparky;
 
 import org.apache.camel.Exchange;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky;
+package org.onap.aai.sparky;
 
 import com.att.ajsc.beans.PropertiesMapBean;
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -42,7 +42,7 @@ public class AbstractStatistics implements ComponentStatistics {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#addCounter(java.lang.String)
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#addCounter(java.lang.String)
    */
   /*
    * sync-lock the creation of counters during initialization, but run time should not use lock
@@ -63,7 +63,7 @@ public class AbstractStatistics implements ComponentStatistics {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#pegCounter(java.lang.String)
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#pegCounter(java.lang.String)
    */
   @Override
   public void pegCounter(String key) {
@@ -77,7 +77,7 @@ public class AbstractStatistics implements ComponentStatistics {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#incrementCounter(java.lang.String, int)
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#incrementCounter(java.lang.String, int)
    */
   @Override
   public void incrementCounter(String key, int value) {
@@ -92,7 +92,7 @@ public class AbstractStatistics implements ComponentStatistics {
 
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#addHistogram(java.lang.String, java.lang.String, long, int, int)
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#addHistogram(java.lang.String, java.lang.String, long, int, int)
    */
   @Override
   public synchronized void addHistogram(String key, String histName, long maxYValue, int numBins,
@@ -107,7 +107,7 @@ public class AbstractStatistics implements ComponentStatistics {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#updateHistogram(java.lang.String, long)
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#updateHistogram(java.lang.String, long)
    */
   @Override
   public void updateHistogram(String key, long value) {
@@ -119,7 +119,7 @@ public class AbstractStatistics implements ComponentStatistics {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.analytics.ComponentStatistics#reset()
+   * @see org.onap.aai.sparky.analytics.ComponentStatistics#reset()
    */
   @Override
   public void reset() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 
 /**
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 /**
  * A class that models a histogram for reporting and tracking long values with variable steps, bins,
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 /**
  * A simple class to model a historical counter. A set of values will be tracked and basic
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.config;
+package org.onap.aai.sparky.config;
 
-import org.openecomp.sparky.config.exception.ConfigurationException;
+import org.onap.aai.sparky.config.exception.ConfigurationException;
 
 /**
  * The Interface Configurable.
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
-package org.openecomp.sparky.config.oxm;
+package org.onap.aai.sparky.config.oxm;
 
 import java.util.ArrayList;
 import java.util.List;
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.config.oxm;
+package org.onap.aai.sparky.config.oxm;
 
 import java.util.List;
 
-import org.openecomp.sparky.synchronizer.entity.SuggestionSearchEntity;
+import org.onap.aai.sparky.synchronizer.entity.SuggestionSearchEntity;
 
 /**
  * The Class OxmEntityDescriptor.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.config.oxm;
+package org.onap.aai.sparky.config.oxm;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -44,11 +44,11 @@ import org.eclipse.persistence.jaxb.JAXBContextProperties;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
 import org.eclipse.persistence.mappings.DatabaseMapping;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.entity.SuggestionSearchEntity;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.SuggestionSearchEntity;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class OxmModelLoader.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.config.oxm;
+package org.onap.aai.sparky.config.oxm;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
@@ -32,9 +32,8 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.openecomp.sparky.util.NodeUtils;
-
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.mdc.MdcContext;
 
 /**
  * The Class OxmModelLoaderFilter.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal;
+package org.onap.aai.sparky.dal;
 
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class NetworkTransaction.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai;
+package org.onap.aai.sparky.dal.aai;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -29,20 +29,20 @@ import java.util.List;
 import java.util.NoSuchElementException;
 
 import org.apache.http.client.utils.URIBuilder;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryRestConfig;
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.security.SecurityContextFactory;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource.Builder;
@@ -111,7 +111,7 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestfulDataAccessor#setClientDefaults(com.sun.jersey.api.client.Client, java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestfulDataAccessor#setClientDefaults(com.sun.jersey.api.client.Client, java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   protected Builder setClientDefaults(Client client, String url, String payloadContentType,
@@ -194,7 +194,7 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor
 
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinksByEntityType(java.lang.String)
+   * @see org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinksByEntityType(java.lang.String)
    */
   @Override
   public OperationResult getSelfLinksByEntityType(String entityType) throws Exception {
@@ -231,7 +231,7 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinkForEntity(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinkForEntity(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult getSelfLinkForEntity(String entityType, String primaryKeyName,
@@ -322,7 +322,7 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider#queryActiveInventoryWithRetries(java.lang.String, java.lang.String, int)
+   * @see org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider#queryActiveInventoryWithRetries(java.lang.String, java.lang.String, int)
    */
   @Override
   public OperationResult queryActiveInventoryWithRetries(String url, String responseType,
@@ -398,7 +398,7 @@ public class ActiveInventoryAdapter extends RestfulDataAccessor
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestfulDataAccessor#shutdown()
+   * @see org.onap.aai.sparky.dal.rest.RestfulDataAccessor#shutdown()
    */
   @Override
   public void shutdown() {
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai;
+package org.onap.aai.sparky.dal.aai;
 
 import java.util.List;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
 
 /**
  * The Interface ActiveInventoryDataProvider.
@@ -80,7 +80,7 @@ public interface ActiveInventoryDataProvider extends RestDataProvider {
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#shutdown()
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#shutdown()
    */
   @Override
   void shutdown();
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai;
+package org.onap.aai.sparky.dal.aai;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -29,10 +29,10 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class ActiveInventoryEntityStatistics.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai;
-
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.analytics.AbstractStatistics;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+package org.onap.aai.sparky.dal.aai;
+
+import org.onap.aai.sparky.analytics.AbstractStatistics;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class ActiveInventoryProcessingExceptionStatistics.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,13 +28,13 @@ import java.util.Properties;
 
 import javax.ws.rs.core.UriBuilder;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.util.Encryptor;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.util.Encryptor;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 /**
  * The Class ActiveInventoryConfig.
  */
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
-import org.openecomp.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.util.ConfigHelper;
 
 /**
  * The Class ActiveInventoryRestConfig.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import java.util.Properties;
 
 import org.eclipse.jetty.util.security.Password;
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.util.Encryptor;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.util.Encryptor;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 
 /**
  * The Class ActiveInventorySslConfig.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.aai.enums;
+package org.onap.aai.sparky.dal.aai.enums;
 
 /**
  * Authentication Modes:
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.cache;
+package org.onap.aai.sparky.dal.cache;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Interface EntityCache.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.cache;
+package org.onap.aai.sparky.dal.cache;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class InMemoryEntityCache.
@@ -48,7 +48,7 @@ public class InMemoryEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#put(java.lang.String, org.openecomp.sparky.dal.rest.OperationResult)
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#put(java.lang.String, org.onap.aai.sparky.dal.rest.OperationResult)
    */
   @Override
   public void put(String key, OperationResult data) {
@@ -65,7 +65,7 @@ public class InMemoryEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult get(String entityKey, String link) {
@@ -78,7 +78,7 @@ public class InMemoryEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#shutdown()
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#shutdown()
    */
   @Override
   public void shutdown() {
@@ -88,7 +88,7 @@ public class InMemoryEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#clear()
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#clear()
    */
   @Override
   public void clear() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.cache;
+package org.onap.aai.sparky.dal.cache;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -37,14 +37,14 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.aai.ActiveInventoryAdapter;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.task.PersistOperationResultToDisk;
-import org.openecomp.sparky.synchronizer.task.RetrieveOperationResultFromDisk;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryAdapter;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.task.PersistOperationResultToDisk;
+import org.onap.aai.sparky.synchronizer.task.RetrieveOperationResultFromDisk;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -168,7 +168,7 @@ public class PersistentEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult get(String key, String link) {
@@ -196,7 +196,7 @@ public class PersistentEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#put(java.lang.String, org.openecomp.sparky.dal.rest.OperationResult)
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#put(java.lang.String, org.onap.aai.sparky.dal.rest.OperationResult)
    */
   @Override
   public void put(String key, OperationResult data) {
@@ -223,7 +223,7 @@ public class PersistentEntityCache implements EntityCache {
 
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#shutdown()
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#shutdown()
    */
   @Override
   public void shutdown() {
@@ -234,7 +234,7 @@ public class PersistentEntityCache implements EntityCache {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.cache.EntityCache#clear()
+   * @see org.onap.aai.sparky.dal.cache.EntityCache#clear()
    */
   @Override
   public void clear() {
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
 
 /**
  * The Class ElasticSearchAdapter.
@@ -52,7 +52,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doGet(String url, String acceptContentType) {
@@ -60,7 +60,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doDelete(String url, String acceptContentType) {
@@ -68,7 +68,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
@@ -76,7 +76,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPut(String url, String jsonPayload, String acceptContentType) {
@@ -84,7 +84,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPatch(String url, String jsonPayload, String acceptContentType) {
@@ -92,7 +92,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doHead(String url, String acceptContentType) {
@@ -100,7 +100,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#clearCache()
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#clearCache()
    */
   @Override
   public void clearCache() {
@@ -108,7 +108,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider#doBulkOperation(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider#doBulkOperation(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doBulkOperation(String url, String payload) {
@@ -119,7 +119,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider#shutdown()
+   * @see org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider#shutdown()
    */
   @Override
   public void shutdown() {
@@ -127,7 +127,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doRestfulOperation(org.openecomp.sparky.dal.rest.HttpMethod, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doRestfulOperation(org.onap.aai.sparky.dal.rest.HttpMethod, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doRestfulOperation(HttpMethod method, String url, String payload,
@@ -137,7 +137,7 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider#buildBulkImportOperationRequest(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider#buildBulkImportOperationRequest(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public String buildBulkImportOperationRequest(String index, String type, String id,
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
 
 /**
  * The Interface ElasticSearchDataProvider.
@@ -55,7 +55,7 @@ public interface ElasticSearchDataProvider extends RestDataProvider {
   OperationResult retrieveEntityById(String entityId) throws Exception;
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#shutdown()
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#shutdown()
    */
   @Override
   void shutdown();
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -29,11 +29,11 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class ElasticSearchEntityStatistics.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
 import org.json.JSONObject;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 public class HashQueryResponse {
   private String jsonPayload = null;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -29,20 +29,20 @@ import java.util.Map;
 
 import javax.ws.rs.core.MediaType;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.sas.config.SearchServiceConfig;
-import org.openecomp.sparky.util.Encryptor;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.sas.config.SearchServiceConfig;
+import org.onap.aai.sparky.util.Encryptor;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
-import org.openecomp.restclient.client.RestClient;
-import org.openecomp.restclient.enums.RestAuthenticationMode;
-import org.openecomp.restclient.client.Headers;
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.restclient.enums.RestAuthenticationMode;
+import org.onap.aai.restclient.client.Headers;
+import org.onap.aai.cl.mdc.MdcContext;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 
 /**
  * The Class SearchAdapter.
@@ -83,26 +83,26 @@ public class SearchAdapter {
   }
 
   public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
-    org.openecomp.restclient.client.OperationResult or = client.post(url, jsonPayload, getTxnHeader(),
+    org.onap.aai.restclient.client.OperationResult or = client.post(url, jsonPayload, getTxnHeader(),
         MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_JSON_TYPE);
     return new OperationResult(or.getResultCode(), or.getResult());
   }
 
   public OperationResult doGet(String url, String acceptContentType) {
-    org.openecomp.restclient.client.OperationResult or =
+    org.onap.aai.restclient.client.OperationResult or =
         client.get(url, getTxnHeader(), MediaType.APPLICATION_JSON_TYPE);
     return new OperationResult(or.getResultCode(), or.getResult());
   }
 
   public OperationResult doPut(String url, String payload, String acceptContentType) {
-    org.openecomp.restclient.client.OperationResult or = client.put(url, payload, getTxnHeader(),
+    org.onap.aai.restclient.client.OperationResult or = client.put(url, payload, getTxnHeader(),
         MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_JSON_TYPE);
     return new OperationResult(or.getResultCode(), or.getResult());
   }
 
   public OperationResult doDelete(String url, String acceptContentType) {
 
-    org.openecomp.restclient.client.OperationResult or =
+    org.onap.aai.restclient.client.OperationResult or =
         client.delete(url, getTxnHeader(), MediaType.APPLICATION_JSON_TYPE);
     return new OperationResult(or.getResultCode(), or.getResult());
   }
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.elasticsearch.config;
+package org.onap.aai.sparky.dal.elasticsearch.config;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Properties;
 
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 
 /**
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 /**
  * The Class OperationResult.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.config.ClientConfig;
@@ -31,8 +31,8 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 
-import org.openecomp.sparky.security.SecurityContextFactory;
-import org.openecomp.sparky.security.SecurityContextFactoryImpl;
+import org.onap.aai.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.security.SecurityContextFactoryImpl;
 
 /**
  * This is a generic REST Client builder with flexible security validation. Sometimes it's nice to
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 /**
  * The Interface RestDataProvider.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
-import org.openecomp.sparky.analytics.AbstractStatistics;
-import org.openecomp.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.analytics.AbstractStatistics;
+import org.onap.aai.sparky.dal.NetworkTransaction;
 
 /**
  * The Class RestOperationalStatistics.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import java.security.SecureRandom;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.cache.EntityCache;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.dal.cache.EntityCache;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -135,7 +135,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doRestfulOperation(org.openecomp.sparky.dal.rest.HttpMethod, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doRestfulOperation(org.onap.aai.sparky.dal.rest.HttpMethod, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doRestfulOperation(HttpMethod method, String url, String payload,
@@ -256,7 +256,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doGet(String url, String acceptContentType) {
@@ -264,7 +264,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doDelete(String url, String acceptContentType) {
@@ -272,7 +272,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
@@ -281,7 +281,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPut(String url, String jsonPayload, String acceptContentType) {
@@ -290,7 +290,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doPatch(String url, String jsonPayload, String acceptContentType) {
@@ -299,7 +299,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
    */
   @Override
   public OperationResult doHead(String url, String acceptContentType) {
@@ -329,7 +329,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#shutdown()
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#shutdown()
    */
   @Override
   public void shutdown() {
@@ -341,7 +341,7 @@ public class RestfulDataAccessor implements RestDataProvider {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.dal.rest.RestDataProvider#clearCache()
+   * @see org.onap.aai.sparky.dal.rest.RestDataProvider#clearCache()
    */
   @Override
   public void clearCache() {
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.dal.sas.config;
+package org.onap.aai.sparky.dal.sas.config;
 
 import java.util.Properties;
 
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 
 /**
  * The Class ElasticSearchConfig.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.inventory;
+package org.onap.aai.sparky.inventory;
 
 import javax.json.Json;
 import javax.json.JsonArray;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.inventory.entity;
+package org.onap.aai.sparky.inventory.entity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -33,10 +33,10 @@ import java.util.List;
 import javax.json.Json;
 import javax.json.JsonObject;
 
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.synchronizer.entity.IndexDocument;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.synchronizer.entity.IndexDocument;
+import org.onap.aai.sparky.util.NodeUtils;
 
 /**
  * The Class GeoIndexDocument.
@@ -191,7 +191,7 @@ public class GeoIndexDocument implements Serializable, IndexDocument {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.entity.IndexDocument#deriveFields()
+   * @see org.onap.aai.sparky.synchronizer.entity.IndexDocument#deriveFields()
    */
   @Override
   public void deriveFields() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.inventory.entity;
+package org.onap.aai.sparky.inventory.entity;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.inventory.servlet;
+package org.onap.aai.sparky.inventory.servlet;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -44,19 +44,19 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.inventory.EntityHistoryQueryBuilder;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.util.ServletUtils;
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.inventory.EntityHistoryQueryBuilder;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.ServletUtils;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
 
 /**
  * The Class EntityCountHistoryServlet.
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.inventory.servlet;
+package org.onap.aai.sparky.inventory.servlet;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,17 +37,17 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.util.ServletUtils;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.ServletUtils;
 
 /**
  * The Class GeoVisualizationServlet.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.logging;
+package org.onap.aai.sparky.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
 
-import org.openecomp.cl.eelf.LogMessageEnum;
+import org.onap.aai.cl.eelf.LogMessageEnum;
 
 /**
  * The Enum AaiUiMsgs.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.logging.util;
+package org.onap.aai.sparky.logging.util;
 
 /**
  * The Class LoggingUtils.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 public class EntityTypeSummaryBucket {
   private int count;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 public class Suggestion {
   private String entityType;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 import java.util.Date;
 import java.util.Map;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search;
+package org.onap.aai.sparky.search;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -37,17 +37,17 @@ import javax.ws.rs.core.MediaType;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.elasticsearch.HashQueryResponse;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.suggestivesearch.SuggestionEntity;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.dal.elasticsearch.HashQueryResponse;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.suggestivesearch.SuggestionEntity;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 
 /**
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.search.config;
+package org.onap.aai.sparky.search.config;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 
 public class SuggestionConfig {
   public static final String CONFIG_FILE =
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security;
+package org.onap.aai.sparky.security;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.security.portal.config.PortalAuthenticationConfig;
 import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
 
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security;
+package org.onap.aai.sparky.security;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security;
+package org.onap.aai.sparky.security;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security.filter;
+package org.onap.aai.sparky.security.filter;
 
 import java.io.IOException;
 
@@ -36,15 +36,15 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.ws.rs.core.HttpHeaders;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.security.EcompSso;
+import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.openecomp.portalsdk.core.onboarding.util.SSOUtil;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.security.EcompSso;
-import org.openecomp.sparky.security.portal.config.PortalAuthenticationConfig;
 
 /**
  * This filter checks every request for proper ECOMP Portal single sign on initialization. The
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,13 +30,13 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.onap.aai.sparky.security.EcompSso;
+import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 import org.openecomp.portalsdk.core.onboarding.crossapi.IPortalRestAPIService;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.security.EcompSso;
-import org.openecomp.sparky.security.portal.config.PortalAuthenticationConfig;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,7 +154,7 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService {
    * @see com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#getAvailableRoles()
    */
   @Override
-  public List<EcompRole> getAvailableRoles() throws PortalAPIException {
+  public List<EcompRole> getAvailableRoles(String role) throws PortalAPIException {
     LOG.debug("Get available roles");
     return UserManager.getRoles();
   }
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,9 +34,9 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 
+import org.onap.aai.sparky.security.portal.config.RolesConfig;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.security.portal.config.RolesConfig;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security.portal.config;
+package org.onap.aai.sparky.security.portal.config;
 
 import java.util.Properties;
 
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.util.Encryptor;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.util.Encryptor;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 
 /**
  * Provides Portal authentication configuration.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.security.portal.config;
+package org.onap.aai.sparky.security.portal.config;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -30,8 +30,8 @@ import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.List;
 
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -20,7 +20,7 @@
  *\r
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
-package org.openecomp.sparky.suggestivesearch;\r
+package org.onap.aai.sparky.suggestivesearch;\r
 \r
 public class SuggestionEntity {\r
   private String route;\r
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -28,23 +28,22 @@ import java.util.EnumSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.aai.ActiveInventoryEntityStatistics;
-import org.openecomp.sparky.dal.aai.ActiveInventoryProcessingExceptionStatistics;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchEntityStatistics;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestOperationalStatistics;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.util.NodeUtils;
-
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryEntityStatistics;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryProcessingExceptionStatistics;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchEntityStatistics;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestOperationalStatistics;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.entity.AggregationSuggestionEntity;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchPut;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.AggregationSuggestionEntity;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchPut;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 import org.slf4j.MDC;
 
 public class AggregationSuggestionSynchronizer extends AbstractEntitySynchronizer
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -47,29 +47,29 @@ import java.util.function.Supplier;
 
 import javax.json.Json;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConfiguration;
-import org.openecomp.sparky.synchronizer.entity.AggregationEntity;
-import org.openecomp.sparky.synchronizer.entity.MergableEntity;
-import org.openecomp.sparky.synchronizer.entity.SelfLinkDescriptor;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchPut;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchUpdate;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConfiguration;
+import org.onap.aai.sparky.synchronizer.entity.AggregationEntity;
+import org.onap.aai.sparky.synchronizer.entity.MergableEntity;
+import org.onap.aai.sparky.synchronizer.entity.SelfLinkDescriptor;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchPut;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectReader;
@@ -675,7 +675,7 @@ public class AggregationSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -701,7 +701,7 @@ public class AggregationSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -720,7 +720,7 @@ public class AggregationSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -749,7 +749,7 @@ public class AggregationSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+   * @see org.onap.aai.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
    */
   @Override
   public void clearCache() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -40,25 +40,25 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConfiguration;
-import org.openecomp.sparky.synchronizer.entity.SelfLinkDescriptor;
-import org.openecomp.sparky.synchronizer.entity.SuggestionSearchEntity;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchPut;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.util.SuggestionsPermutation;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConfiguration;
+import org.onap.aai.sparky.synchronizer.entity.SelfLinkDescriptor;
+import org.onap.aai.sparky.synchronizer.entity.SuggestionSearchEntity;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchPut;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchRetrieval;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.SuggestionsPermutation;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 import org.slf4j.MDC;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -221,7 +221,7 @@ public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -669,7 +669,7 @@ public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -680,7 +680,7 @@ public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -709,7 +709,7 @@ public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
   /*
    * (non-Javadoc)
    * 
-   * @see org.openecomp.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+   * @see org.onap.aai.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
    */
   @Override
   public void clearCache() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -38,30 +38,30 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.CrossEntityReference;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConfiguration;
-import org.openecomp.sparky.synchronizer.entity.IndexableCrossEntityReference;
-import org.openecomp.sparky.synchronizer.entity.MergableEntity;
-import org.openecomp.sparky.synchronizer.entity.SelfLinkDescriptor;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchPut;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchUpdate;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.CrossEntityReference;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConfiguration;
+import org.onap.aai.sparky.synchronizer.entity.IndexableCrossEntityReference;
+import org.onap.aai.sparky.synchronizer.entity.MergableEntity;
+import org.onap.aai.sparky.synchronizer.entity.SelfLinkDescriptor;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchPut;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectReader;
@@ -135,7 +135,7 @@ public class CrossEntityReferenceSynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -159,7 +159,7 @@ public class CrossEntityReferenceSynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -168,7 +168,7 @@ public class CrossEntityReferenceSynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -34,14 +34,14 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.entity.ObjectIdCollection;
-import org.openecomp.sparky.synchronizer.entity.SearchableEntity;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.ObjectIdCollection;
+import org.onap.aai.sparky.synchronizer.entity.SearchableEntity;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class ElasticSearchIndexCleaner.
@@ -95,7 +95,7 @@ public class ElasticSearchIndexCleaner implements IndexCleaner {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexCleaner#populatePreOperationCollection()
+   * @see org.onap.aai.sparky.synchronizer.IndexCleaner#populatePreOperationCollection()
    */
   @Override
   public OperationState populatePreOperationCollection() {
@@ -111,7 +111,7 @@ public class ElasticSearchIndexCleaner implements IndexCleaner {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexCleaner#populatePostOperationCollection()
+   * @see org.onap.aai.sparky.synchronizer.IndexCleaner#populatePostOperationCollection()
    */
   @Override
   public OperationState populatePostOperationCollection() {
@@ -125,7 +125,7 @@ public class ElasticSearchIndexCleaner implements IndexCleaner {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexCleaner#performCleanup()
+   * @see org.onap.aai.sparky.synchronizer.IndexCleaner#performCleanup()
    */
   @Override
   public OperationState performCleanup() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -34,22 +34,22 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.inventory.entity.GeoIndexDocument;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.entity.SelfLinkDescriptor;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
-import org.openecomp.sparky.synchronizer.task.StoreDocumentTask;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.inventory.entity.GeoIndexDocument;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.SelfLinkDescriptor;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
+import org.onap.aai.sparky.synchronizer.task.StoreDocumentTask;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 import org.slf4j.MDC;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -90,7 +90,7 @@ public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
 
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -394,7 +394,7 @@ public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -403,7 +403,7 @@ public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -38,16 +38,16 @@ import java.util.function.Supplier;
 
 import javax.json.Json;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.cl.mdc.MdcContext;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 import org.slf4j.MDC;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -186,7 +186,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -309,7 +309,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -318,7 +318,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -345,7 +345,7 @@ public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+   * @see org.onap.aai.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
    */
   @Override
   public void clearCache() {
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
 
 /**
  * The Interface IndexCleaner.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class IndexIntegrityValidator.
@@ -84,7 +84,7 @@ public class IndexIntegrityValidator implements IndexValidator {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexValidator#exists()
+   * @see org.onap.aai.sparky.synchronizer.IndexValidator#exists()
    */
   @Override
   public boolean exists() {
@@ -103,7 +103,7 @@ public class IndexIntegrityValidator implements IndexValidator {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexValidator#integrityValid()
+   * @see org.onap.aai.sparky.synchronizer.IndexValidator#integrityValid()
    */
   @Override
   public boolean integrityValid() {
@@ -115,7 +115,7 @@ public class IndexIntegrityValidator implements IndexValidator {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexValidator#createOrRepair()
+   * @see org.onap.aai.sparky.synchronizer.IndexValidator#createOrRepair()
    */
   @Override
   public void createOrRepair() {
@@ -140,7 +140,7 @@ public class IndexIntegrityValidator implements IndexValidator {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexValidator#destroyIndex()
+   * @see org.onap.aai.sparky.synchronizer.IndexValidator#destroyIndex()
    */
   @Override
   public void destroyIndex() {
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
 
 /**
  * The Interface IndexSynchronizer.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 /**
  * The Interface IndexValidator.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.io.PrintWriter;
 
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -47,26 +47,26 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.HttpMethod;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConfiguration;
-import org.openecomp.sparky.synchronizer.entity.MergableEntity;
-import org.openecomp.sparky.synchronizer.entity.SearchableEntity;
-import org.openecomp.sparky.synchronizer.entity.SelfLinkDescriptor;
-import org.openecomp.sparky.synchronizer.enumeration.OperationState;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchPut;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval;
-import org.openecomp.sparky.synchronizer.task.PerformElasticSearchUpdate;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.HttpMethod;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConfiguration;
+import org.onap.aai.sparky.synchronizer.entity.MergableEntity;
+import org.onap.aai.sparky.synchronizer.entity.SearchableEntity;
+import org.onap.aai.sparky.synchronizer.entity.SelfLinkDescriptor;
+import org.onap.aai.sparky.synchronizer.enumeration.OperationState;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchPut;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchRetrieval;
+import org.onap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
 /**
@@ -223,7 +223,7 @@ public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#doSync()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#doSync()
    */
   @Override
   public OperationState doSync() {
@@ -730,7 +730,7 @@ public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
    */
   @Override
   public String getStatReport(boolean showFinalReport) {
@@ -739,7 +739,7 @@ public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.IndexSynchronizer#shutdown()
+   * @see org.onap.aai.sparky.synchronizer.IndexSynchronizer#shutdown()
    */
   @Override
   public void shutdown() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -29,11 +29,11 @@ import java.util.LinkedHashSet;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class SyncController.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -37,27 +37,27 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.aai.ActiveInventoryAdapter;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryRestConfig;
-import org.openecomp.sparky.dal.cache.EntityCache;
-import org.openecomp.sparky.dal.cache.InMemoryEntityCache;
-import org.openecomp.sparky.dal.cache.PersistentEntityCache;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.SyncController.SyncActions;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConfiguration;
-import org.openecomp.sparky.synchronizer.config.SynchronizerConstants;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
-import org.openecomp.sparky.util.ErrorUtil;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryAdapter;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.cache.EntityCache;
+import org.onap.aai.sparky.dal.cache.InMemoryEntityCache;
+import org.onap.aai.sparky.dal.cache.PersistentEntityCache;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.SyncController.SyncActions;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConfiguration;
+import org.onap.aai.sparky.synchronizer.config.SynchronizerConstants;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
+import org.onap.aai.sparky.util.ErrorUtil;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
-import org.openecomp.sparky.analytics.AbstractStatistics;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.analytics.AbstractStatistics;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * The Class TaskProcessingStats.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.analytics.AveragingRingBuffer;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.analytics.AveragingRingBuffer;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * TODO: Fill in description.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.config;
+package org.onap.aai.sparky.synchronizer.config;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -32,11 +32,11 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 
 /**
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.config;
+package org.onap.aai.sparky.synchronizer.config;
 
 import java.util.Properties;
 
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.NodeUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -55,7 +55,7 @@ public class AggregationEntity extends IndexableEntity implements IndexDocument
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.entity.IndexDocument#deriveFields()
+   * @see org.onap.aai.sparky.synchronizer.entity.IndexDocument#deriveFields()
    */
   @Override
   public void deriveFields() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -30,7 +30,7 @@ import java.util.List;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.NodeUtils;
 
 public class AggregationSuggestionEntity extends IndexableEntity implements IndexDocument {
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import java.util.ArrayList;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.NodeUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -69,7 +69,7 @@ public class IndexableCrossEntityReference extends IndexableEntity implements In
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.entity.IndexDocument#deriveFields()
+   * @see org.onap.aai.sparky.synchronizer.entity.IndexDocument#deriveFields()
    */
   @Override
   public void deriveFields() {
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 
 /**
  * The Class IndexableEntity.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import java.util.Collection;
 import java.util.List;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -28,8 +28,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.NodeUtils;
 
 /**
  * The Class SearchableEntity.
@@ -69,7 +69,7 @@ public class SearchableEntity extends IndexableEntity implements IndexDocument {
   }
 
   /* (non-Javadoc)
-   * @see org.openecomp.sparky.synchronizer.entity.IndexDocument#deriveFields()
+   * @see org.onap.aai.sparky.synchronizer.entity.IndexDocument#deriveFields()
    */
   @Override
   public void deriveFields() {
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 /**
  * The Class SelfLinkDescriptor.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,8 +34,8 @@ import java.util.Map;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.NodeUtils;
 
 public class SuggestionSearchEntity extends IndexableEntity implements IndexDocument {
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.entity;
+package org.onap.aai.sparky.synchronizer.entity;
 
 /**
  * The Enum TransactionStorageType.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.enumeration;
+package org.onap.aai.sparky.synchronizer.enumeration;
 
 /**
  * The Enum OperationState.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.enumeration;
+package org.onap.aai.sparky.synchronizer.enumeration;
 
 /**
  * The Enum SynchronizerState.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.filter;
+package org.onap.aai.sparky.synchronizer.filter;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -33,14 +33,13 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.SyncHelper;
-import org.openecomp.sparky.util.NodeUtils;
-
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.SyncHelper;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 
 /*
  * This is a wire-frame for an experiment to get the jetty filter-lifecyle initialization method to
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class CollectEntitySelfLinkTask.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class CollectEntityTypeSelfLinksTask.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class GetCrossEntityReferenceEntityTask.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
 import org.slf4j.MDC;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
 import org.slf4j.MDC;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 import org.slf4j.MDC;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.io.File;
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
 import org.slf4j.MDC;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,9 +29,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.synchronizer.task;
+package org.onap.aai.sparky.synchronizer.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.NetworkTransaction;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.entity.IndexDocument;
+import org.onap.aai.sparky.dal.NetworkTransaction;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.synchronizer.entity.IndexDocument;
 import org.slf4j.MDC;
 
 /**
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,9 +32,9 @@ import java.io.InputStream;
 import java.util.Properties;
 import java.util.Set;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 /**
  * The Class ConfigHelper.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 /**
  * The Class EncryptConvertor.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 /**
  * The Class ErrorUtil.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -50,9 +50,9 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.stream.XMLStreamConstants;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.cl.api.Logger;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 /**
  * The Class RawByteHelper.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.cl.api.Logger;
 
 /**
  * The Class ServletUtils.
@@ -20,7 +20,7 @@
  *\r
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
-package org.openecomp.sparky.util;\r
+package org.onap.aai.sparky.util;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.EntityTypeAggregation;
 
 /**
  * The Class EntityTypeAggregation.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.config;
+package org.onap.aai.sparky.viewandinspect.config;
 
 /**
  * The Class TierSupportUiConstants.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.config;
+package org.onap.aai.sparky.viewandinspect.config;
 
 import java.util.Properties;
 
-import org.openecomp.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.util.ConfigHelper;
 
 /**
  * The Class VisualizationConfig.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,14 +36,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.enumeration.NodeProcessingAction;
-import org.openecomp.sparky.viewandinspect.enumeration.NodeProcessingState;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.enumeration.NodeProcessingAction;
+import org.onap.aai.sparky.viewandinspect.enumeration.NodeProcessingState;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * The Class EntityEntry.
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
-import org.openecomp.sparky.viewandinspect.EntityTypeAggregation;
+import org.onap.aai.sparky.viewandinspect.EntityTypeAggregation;
 
 /**
  * The Class GraphMeta.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * The Class InlineMessage.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /*
  * Expected JSON Output:
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * The Class NodeDebug.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.enumeration.NodeProcessingState;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.enumeration.NodeProcessingState;
 
 /**
  * The Class NodeMeta.
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class NodeProcessingTransaction.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * The Class QueryParams.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * The Class QueryRequest.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 /**
  * This enumeration is intended to be used to help us discriminate neighbor relationships for the
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sparky.suggestivesearch.SuggestionEntity;
+import org.onap.aai.sparky.suggestivesearch.SuggestionEntity;
 
 /**
  * The Class SearchResponse.
@@ -20,9 +20,9 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 public class SelfLinkDeterminationTransaction {
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 import com.att.aft.dme2.internal.jackson.annotate.JsonProperty;
 
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.enumeration;
+package org.onap.aai.sparky.viewandinspect.enumeration;
 
 /**
  * The Enum NodeProcessingAction.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.enumeration;
+package org.onap.aai.sparky.viewandinspect.enumeration;
 
 /**
  * The Enum NodeProcessingState.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.services;
+package org.onap.aai.sparky.viewandinspect.services;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -39,21 +39,21 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.HashQueryResponse;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.sas.config.SearchServiceConfig;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.search.VnfSearchService;
-import org.openecomp.sparky.search.config.SuggestionConfig;
-import org.openecomp.sparky.suggestivesearch.SuggestionEntity;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
-import org.openecomp.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.HashQueryResponse;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.sas.config.SearchServiceConfig;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.search.VnfSearchService;
+import org.onap.aai.sparky.search.config.SuggestionConfig;
+import org.onap.aai.sparky.suggestivesearch.SuggestionEntity;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.services;
+package org.onap.aai.sparky.viewandinspect.services;
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 
@@ -36,30 +36,30 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.http.client.utils.URIBuilder;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.entity.SearchableEntity;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.openecomp.sparky.viewandinspect.entity.InlineMessage;
-import org.openecomp.sparky.viewandinspect.entity.NodeProcessingTransaction;
-import org.openecomp.sparky.viewandinspect.entity.QueryParams;
-import org.openecomp.sparky.viewandinspect.entity.Relationship;
-import org.openecomp.sparky.viewandinspect.entity.RelationshipData;
-import org.openecomp.sparky.viewandinspect.entity.RelationshipList;
-import org.openecomp.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
-import org.openecomp.sparky.viewandinspect.enumeration.NodeProcessingAction;
-import org.openecomp.sparky.viewandinspect.enumeration.NodeProcessingState;
-import org.openecomp.sparky.viewandinspect.task.PerformNodeSelfLinkProcessingTask;
-import org.openecomp.sparky.viewandinspect.task.PerformSelfLinkDeterminationTask;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.SearchableEntity;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.entity.InlineMessage;
+import org.onap.aai.sparky.viewandinspect.entity.NodeProcessingTransaction;
+import org.onap.aai.sparky.viewandinspect.entity.QueryParams;
+import org.onap.aai.sparky.viewandinspect.entity.Relationship;
+import org.onap.aai.sparky.viewandinspect.entity.RelationshipData;
+import org.onap.aai.sparky.viewandinspect.entity.RelationshipList;
+import org.onap.aai.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
+import org.onap.aai.sparky.viewandinspect.enumeration.NodeProcessingAction;
+import org.onap.aai.sparky.viewandinspect.enumeration.NodeProcessingState;
+import org.onap.aai.sparky.viewandinspect.task.PerformNodeSelfLinkProcessingTask;
+import org.onap.aai.sparky.viewandinspect.task.PerformSelfLinkDeterminationTask;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.services;
+package org.onap.aai.sparky.viewandinspect.services;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -30,30 +30,30 @@ import java.util.concurrent.ExecutorService;
 
 import javax.servlet.ServletException;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.aai.ActiveInventoryAdapter;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryRestConfig;
-import org.openecomp.sparky.dal.cache.EntityCache;
-import org.openecomp.sparky.dal.cache.PersistentEntityCache;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.synchronizer.entity.SearchableEntity;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.openecomp.sparky.viewandinspect.entity.D3VisualizationOutput;
-import org.openecomp.sparky.viewandinspect.entity.GraphMeta;
-import org.openecomp.sparky.viewandinspect.entity.QueryParams;
-import org.openecomp.sparky.viewandinspect.entity.QueryRequest;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryAdapter;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.cache.EntityCache;
+import org.onap.aai.sparky.dal.cache.PersistentEntityCache;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.synchronizer.entity.SearchableEntity;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.entity.D3VisualizationOutput;
+import org.onap.aai.sparky.viewandinspect.entity.GraphMeta;
+import org.onap.aai.sparky.viewandinspect.entity.QueryParams;
+import org.onap.aai.sparky.viewandinspect.entity.QueryRequest;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.services;
+package org.onap.aai.sparky.viewandinspect.services;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,18 +30,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.util.ConfigHelper;
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.openecomp.sparky.viewandinspect.entity.D3VisualizationOutput;
-import org.openecomp.sparky.viewandinspect.entity.GraphMeta;
-import org.openecomp.sparky.viewandinspect.entity.JsonNode;
-import org.openecomp.sparky.viewandinspect.entity.JsonNodeLink;
-import org.openecomp.sparky.viewandinspect.entity.NodeDebug;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.ConfigHelper;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.entity.D3VisualizationOutput;
+import org.onap.aai.sparky.viewandinspect.entity.GraphMeta;
+import org.onap.aai.sparky.viewandinspect.entity.JsonNode;
+import org.onap.aai.sparky.viewandinspect.entity.JsonNodeLink;
+import org.onap.aai.sparky.viewandinspect.entity.NodeDebug;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.servlet;
+package org.onap.aai.sparky.viewandinspect.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -34,19 +34,18 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.sas.config.SearchServiceConfig;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.search.VnfSearchService;
-import org.openecomp.sparky.search.config.SuggestionConfig;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.services.SearchServiceWrapper;
-
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.sas.config.SearchServiceConfig;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.search.VnfSearchService;
+import org.onap.aai.sparky.search.config.SuggestionConfig;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.services.SearchServiceWrapper;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 
 /**
  * The Class SearchServlet.
@@ -20,7 +20,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.servlet;
+package org.onap.aai.sparky.viewandinspect.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -32,17 +32,16 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.servlet.ResettableStreamHttpServletRequest;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.entity.QueryRequest;
-import org.openecomp.sparky.viewandinspect.services.VisualizationService;
-
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.servlet.ResettableStreamHttpServletRequest;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.entity.QueryRequest;
+import org.onap.aai.sparky.viewandinspect.services.VisualizationService;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.cl.mdc.MdcContext;
 
 /**
  * A dedicated servlet for handling Front-End Visualization Requests and performing feats of magic
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.task;
+package org.onap.aai.sparky.viewandinspect.task;
 
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.rest.OperationResult;
 
 /**
  * The Class CollectNodeSelfLinkTask.
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.task;
+package org.onap.aai.sparky.viewandinspect.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.viewandinspect.entity.NodeProcessingTransaction;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.viewandinspect.entity.NodeProcessingTransaction;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
 /**
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.sparky.viewandinspect.task;
+package org.onap.aai.sparky.viewandinspect.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.openecomp.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.logging.AaiUiMsgs;
-import org.openecomp.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
+import org.onap.aai.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.slf4j.MDC;
 
 public class PerformSelfLinkDeterminationTask implements Supplier<SelfLinkDeterminationTransaction> {
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,6 +32,7 @@ import java.security.SecureRandom;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.analytics.AveragingRingBuffer;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.analytics;
+package org.onap.aai.sparky.analytics;
 
 import java.security.SecureRandom;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.analytics.HistogramSampler;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
@@ -1,4 +1,4 @@
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 
 import static org.junit.Assert.assertEquals;
@@ -10,8 +10,11 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 public class ActiveInventoryConfigTest {
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,7 +37,8 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig;
+import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode;
 
 
 public class ActiveInventoryRestConfigTest {
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.aai.config;
+package org.onap.aai.sparky.dal.aai.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,7 +37,8 @@ import org.eclipse.jetty.util.security.Password;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.util.Encryptor;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig;
+import org.onap.aai.sparky.util.Encryptor;
 
 //import com.att.aai.util.EncryptedConfiguration;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.elasticsearch;
+package org.onap.aai.sparky.dal.elasticsearch;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -38,9 +38,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
 
 import ch.qos.logback.classic.Level;
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 public class ElasticHit {
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.elasticsearch.entity;
+package org.onap.aai.sparky.dal.elasticsearch.entity;
 
 public class PayloadEntity {
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,7 +41,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.security.SecurityContextFactory;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import ch.qos.logback.classic.Level;
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.dal.rest;
+package org.onap.aai.sparky.dal.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyObject;
@@ -36,6 +36,9 @@ import static org.mockito.Mockito.mock;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.sun.jersey.api.client.Client;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.HashMap;
 import java.util.Map;
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.BucketEntity;
 
 public class GroupByAggregationEntity {
   private int totalChartHits;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 public class HitEntity {
 
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 public class SearchAbstractionResponse {
   
@@ -22,7 +22,7 @@
 * ECOMP and OpenECOMP are trademarks
 * and service marks of AT&T Intellectual Property.
 */
-package org.openecomp.sparky.dal.sas.entity;
+package org.onap.aai.sparky.dal.sas.entity;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.inventory;
+package org.onap.aai.sparky.inventory;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.inventory.entity.GeoIndexDocument;
+import org.onap.aai.sparky.inventory.entity.GeoIndexDocument;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security;
+package org.onap.aai.sparky.security;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,7 +35,9 @@ import javax.net.ssl.SSLContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.openecomp.sparky.util.LogValidator;
+import org.onap.aai.sparky.security.SecurityContextFactory;
+import org.onap.aai.sparky.security.SecurityContextFactoryImpl;
+import org.onap.aai.sparky.util.LogValidator;
 
 import ch.qos.logback.classic.Level;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
@@ -51,11 +51,13 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl;
+import org.onap.aai.sparky.security.portal.UserManager;
+import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig;
+import org.onap.aai.sparky.security.portal.config.RolesConfig;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.security.portal.config.PortalAuthenticationConfig;
-import org.openecomp.sparky.security.portal.config.RolesConfig;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -184,7 +186,7 @@ public class TestPortalRestAPIServiceImpl {
   public void testGetRoles() throws Exception {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
-    user.setRoles(new HashSet<>(portalApi.getAvailableRoles()));
+    user.setRoles(new HashSet<>(portalApi.getAvailableRoles("")));
 
     portalApi.pushUser(user);
 
@@ -239,7 +241,7 @@ public class TestPortalRestAPIServiceImpl {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
     user.setFirstName("Bob");
-    List<EcompRole> availableRoles = portalApi.getAvailableRoles();
+    List<EcompRole> availableRoles = portalApi.getAvailableRoles("");
     user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
 
     portalApi.pushUser(user);
@@ -256,7 +258,7 @@ public class TestPortalRestAPIServiceImpl {
     EcompUser user = new EcompUser();
     user.setLoginId(LOGINID_1);
     user.setFirstName("Bob");
-    List<EcompRole> availableRoles = portalApi.getAvailableRoles();
+    List<EcompRole> availableRoles = portalApi.getAvailableRoles("");
     user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
 
     portalApi.pushUser(user);
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.security.portal;
+package org.onap.aai.sparky.security.portal;
 
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
@@ -46,8 +46,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.security.portal.UserManager;
+import org.onap.aai.sparky.util.NodeUtils;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.util.NodeUtils;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import com.google.gson.Gson;
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
+package org.onap.aai.sparky.synchronizer;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -32,8 +32,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.util.LogValidator;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.util.LogValidator;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import ch.qos.logback.classic.Level;
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.synchronizer;
-
-import org.openecomp.sparky.dal.aai.ActiveInventoryAdapter;
-import org.openecomp.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.openecomp.sparky.dal.cache.InMemoryEntityCache;
-import org.openecomp.sparky.dal.cache.PersistentEntityCache;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
-import org.openecomp.sparky.dal.rest.RestfulDataAccessor;
-import org.openecomp.sparky.synchronizer.SyncController.SyncActions;
-import org.openecomp.sparky.synchronizer.enumeration.SynchronizerState;
+package org.onap.aai.sparky.synchronizer;
+
+import org.onap.aai.sparky.dal.aai.ActiveInventoryAdapter;
+import org.onap.aai.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.onap.aai.sparky.dal.cache.InMemoryEntityCache;
+import org.onap.aai.sparky.dal.cache.PersistentEntityCache;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.rest.RestfulDataAccessor;
+import org.onap.aai.sparky.synchronizer.AutosuggestionSynchronizer;
+import org.onap.aai.sparky.synchronizer.CrossEntityReferenceSynchronizer;
+import org.onap.aai.sparky.synchronizer.ElasticSearchIndexCleaner;
+import org.onap.aai.sparky.synchronizer.GeoSynchronizer;
+import org.onap.aai.sparky.synchronizer.HistoricalEntitySummarizer;
+import org.onap.aai.sparky.synchronizer.IndexCleaner;
+import org.onap.aai.sparky.synchronizer.IndexIntegrityValidator;
+import org.onap.aai.sparky.synchronizer.SearchableEntitySynchronizer;
+import org.onap.aai.sparky.synchronizer.SyncController;
+import org.onap.aai.sparky.synchronizer.SyncController.SyncActions;
+import org.onap.aai.sparky.synchronizer.enumeration.SynchronizerState;
 import org.slf4j.LoggerFactory;
 
 import ch.qos.logback.classic.Level;
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.ArrayList;
 import java.util.Deque;
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -32,11 +32,11 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.exception.ElasticSearchOperationException;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * The Class ElasticEntitySummarizer.
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.openecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.openecomp.sparky.dal.rest.RestDataProvider;
-import org.openecomp.sparky.synchronizer.config.TaskProcessorConfig;
+import org.onap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.onap.aai.sparky.dal.rest.RestDataProvider;
+import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig;
 
 /**
  * The Class ElasticGarbageInjector.
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 /**
  * The Class ExceptionHelper.
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.fail;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import java.util.List;
 
@@ -23,9 +23,9 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 
 /**
  * The Class ModelLoaderTester.
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -40,7 +40,8 @@ import javax.xml.stream.XMLStreamConstants;
 import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.util.NodeUtils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -36,7 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
 
 /**
  * The Class OxmModelLoaderTest.
@@ -1,4 +1,4 @@
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -8,6 +8,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
+import org.onap.aai.sparky.util.SuggestionsPermutation;
 
 public class SuggestionsPermutationsTest {
 
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.util;
+package org.onap.aai.sparky.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -36,6 +36,8 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.util.TreeWalker;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.openecomp.sparky.viewandinspect.config.VisualizationConfig;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.config.VisualizationConfig;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
 
 /**
  * The Class ActiveInventoryNodeTester.
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyObject;
@@ -35,9 +35,9 @@ import static org.mockito.Mockito.mock;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.rest.RestClientBuilder;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.rest.RestClientBuilder;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,8 +31,8 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.viewandinspect.entity.EntityEntry;
-import org.openecomp.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.sparky.viewandinspect.entity.EntityEntry;
+import org.onap.aai.sparky.viewandinspect.entity.SearchResponse;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -50,38 +50,38 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.openecomp.sparky.config.oxm.OxmEntityDescriptor;
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.dal.elasticsearch.SearchAdapter;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.BucketEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
-import org.openecomp.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
-import org.openecomp.sparky.dal.elasticsearch.entity.PayloadEntity;
-import org.openecomp.sparky.dal.rest.OperationResult;
-import org.openecomp.sparky.dal.sas.config.SearchServiceConfig;
-import org.openecomp.sparky.dal.sas.entity.EntityCountResponse;
-import org.openecomp.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
-import org.openecomp.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
-import org.openecomp.sparky.search.VnfSearchService;
-import org.openecomp.sparky.search.config.SuggestionConfig;
-import org.openecomp.sparky.suggestivesearch.SuggestionEntity;
-import org.openecomp.sparky.util.ExceptionHelper;
-import org.openecomp.sparky.util.HttpServletHelper;
-import org.openecomp.sparky.util.NodeUtils;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
-import org.openecomp.sparky.viewandinspect.entity.SearchResponse;
-import org.openecomp.sparky.viewandinspect.services.SearchServiceWrapper;
-import org.openecomp.sparky.viewandinspect.servlet.SearchServlet;
+import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
+import org.onap.aai.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
+import org.onap.aai.sparky.dal.elasticsearch.entity.PayloadEntity;
+import org.onap.aai.sparky.dal.rest.OperationResult;
+import org.onap.aai.sparky.dal.sas.config.SearchServiceConfig;
+import org.onap.aai.sparky.dal.sas.entity.EntityCountResponse;
+import org.onap.aai.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
+import org.onap.aai.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
+import org.onap.aai.sparky.search.VnfSearchService;
+import org.onap.aai.sparky.search.config.SuggestionConfig;
+import org.onap.aai.sparky.suggestivesearch.SuggestionEntity;
+import org.onap.aai.sparky.util.ExceptionHelper;
+import org.onap.aai.sparky.util.HttpServletHelper;
+import org.onap.aai.sparky.util.NodeUtils;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.viewandinspect.entity.SearchResponse;
+import org.onap.aai.sparky.viewandinspect.services.SearchServiceWrapper;
+import org.onap.aai.sparky.viewandinspect.servlet.SearchServlet;
 import org.slf4j.MDC;
 
-import org.openecomp.cl.mdc.MdcContext;
+import org.onap.aai.cl.mdc.MdcContext;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
-import org.openecomp.sparky.config.oxm.OxmModelLoader;
-import org.openecomp.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.openecomp.sparky.viewandinspect.services.VisualizationContext;
+import org.onap.aai.sparky.config.oxm.OxmModelLoader;
+import org.onap.aai.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.onap.aai.sparky.viewandinspect.services.VisualizationContext;
 
 /**
  * The Class SelfLinkNodeCollectorTester.
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect;
+package org.onap.aai.sparky.viewandinspect;
 
 
 import static org.junit.Assert.assertEquals;
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openecomp.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.onap.aai.sparky.viewandinspect.entity.QuerySearchEntity;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
@@ -23,7 +23,7 @@
 * and service marks of AT&T Intellectual Property.
 */
 
-package org.openecomp.sparky.viewandinspect.entity;
+package org.onap.aai.sparky.viewandinspect.entity;
 
 
 import static org.junit.Assert.assertEquals;
@@ -34,6 +34,7 @@ import java.security.NoSuchAlgorithmException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.sparky.viewandinspect.entity.EntityEntry;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**