Code Review
/
aai
/
sparky-be.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
6777c60
)
Renaming openecomp to onap
63/15663/1
author
Arul.Nambi
<arul.nambi@amdocs.com>
Tue, 26 Sep 2017 18:00:57 +0000
(14:00 -0400)
committer
Arul.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
patch
|
blob
|
history
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
patch
|
blob
|
history
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
patch
|
blob
|
history
src/main/config/runner-web.xml
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/HelloWorld.java
[moved from
src/main/java/org/openecomp/sparky/HelloWorld.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/JaxrsEchoService.java
[moved from
src/main/java/org/openecomp/sparky/JaxrsEchoService.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java
[moved from
src/main/java/org/openecomp/sparky/analytics/AbstractStatistics.java
with 87% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/analytics/AveragingRingBuffer.java
[moved from
src/main/java/org/openecomp/sparky/analytics/AveragingRingBuffer.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/analytics/ComponentStatistics.java
[moved from
src/main/java/org/openecomp/sparky/analytics/ComponentStatistics.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/analytics/HistogramSampler.java
[moved from
src/main/java/org/openecomp/sparky/analytics/HistogramSampler.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java
[moved from
src/main/java/org/openecomp/sparky/analytics/HistoricalCounter.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/config/Configurable.java
[moved from
src/main/java/org/openecomp/sparky/config/Configurable.java
with 92% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/dal/NetworkTransaction.java
[moved from
src/main/java/org/openecomp/sparky/dal/NetworkTransaction.java
with 94% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java
[moved from
src/main/java/org/openecomp/sparky/inventory/EntityHistoryQueryBuilder.java
with 99% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/logging/AaiUiMsgs.java
[moved from
src/main/java/org/openecomp/sparky/logging/AaiUiMsgs.java
with 99% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/EntityTypeSummary.java
[moved from
src/main/java/org/openecomp/sparky/search/EntityTypeSummary.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/EntityTypeSummaryBucket.java
[moved from
src/main/java/org/openecomp/sparky/search/EntityTypeSummaryBucket.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/SearchEntityProperties.java
[moved from
src/main/java/org/openecomp/sparky/search/SearchEntityProperties.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/Suggestion.java
[moved from
src/main/java/org/openecomp/sparky/search/Suggestion.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/SuggestionList.java
[moved from
src/main/java/org/openecomp/sparky/search/SuggestionList.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java
[moved from
src/main/java/org/openecomp/sparky/search/VnfSearchQueryBuilder.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/search/VnfSearchService.java
[moved from
src/main/java/org/openecomp/sparky/search/VnfSearchService.java
with 94% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/security/EcompSso.java
[moved from
src/main/java/org/openecomp/sparky/security/EcompSso.java
with 95% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/security/SecurityContextFactory.java
[moved from
src/main/java/org/openecomp/sparky/security/SecurityContextFactory.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/security/SecurityContextFactoryImpl.java
[moved from
src/main/java/org/openecomp/sparky/security/SecurityContextFactoryImpl.java
with 99% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/suggestivesearch/SuggestionEntity.java
[moved from
src/main/java/org/openecomp/sparky/suggestivesearch/SuggestionEntity.java
with 94% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/AbstractEntitySynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/AbstractEntitySynchronizer.java
with 94% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSuggestionSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/AggregationSuggestionSynchronizer.java
with 88% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/AggregationSynchronizer.java
with 93% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/AutosuggestionSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/AutosuggestionSynchronizer.java
with 94% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
with 95% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java
with 96% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/GeoSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/GeoSynchronizer.java
with 91% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/HistoricalEntitySummarizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/HistoricalEntitySummarizer.java
with 91% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/IndexCleaner.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/IndexCleaner.java
with 93% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/IndexIntegrityValidator.java
with 88% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/IndexSynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/IndexSynchronizer.java
with 89% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/IndexValidator.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/IndexValidator.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/MyErrorHandler.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/SearchableEntitySynchronizer.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/SearchableEntitySynchronizer.java
with 93% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/SyncController.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
with 97% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/SyncHelper.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/SyncHelper.java
with 95% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/TaskProcessingStats.java
with 96% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/synchronizer/TransactionRateController.java
[moved from
src/main/java/org/openecomp/sparky/synchronizer/TransactionRateController.java
with 95% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/ConfigHelper.java
[moved from
src/main/java/org/openecomp/sparky/util/ConfigHelper.java
with 96% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/EncryptConvertor.java
[moved from
src/main/java/org/openecomp/sparky/util/EncryptConvertor.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/Encryptor.java
[moved from
src/main/java/org/openecomp/sparky/util/Encryptor.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/ErrorUtil.java
[moved from
src/main/java/org/openecomp/sparky/util/ErrorUtil.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/JsonXmlConverter.java
[moved from
src/main/java/org/openecomp/sparky/util/JsonXmlConverter.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java
[moved from
src/main/java/org/openecomp/sparky/util/KeystoreBuilder.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/NodeUtils.java
[moved from
src/main/java/org/openecomp/sparky/util/NodeUtils.java
with 98% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/RawByteHelper.java
[moved from
src/main/java/org/openecomp/sparky/util/RawByteHelper.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/ServletUtils.java
[moved from
src/main/java/org/openecomp/sparky/util/ServletUtils.java
with 94% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/SuggestionsPermutation.java
[moved from
src/main/java/org/openecomp/sparky/util/SuggestionsPermutation.java
with 96% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/util/TreeWalker.java
[moved from
src/main/java/org/openecomp/sparky/util/TreeWalker.java
with 99% similarity]
patch
|
blob
|
history
src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java
[moved from
src/main/java/org/openecomp/sparky/viewandinspect/EntityTypeAggregation.java
with 94% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
[moved from
src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java
with 97% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
[moved from
src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java
with 96% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
[moved from
src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java
with 99% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
[moved from
src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java
with 97% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
[moved from
src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java
with 95% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
[moved from
src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
[moved from
src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java
with 96% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
[moved from
src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
with 93% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
[moved from
src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java
with 99% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
[moved from
src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java
with 92% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
[moved from
src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java
with 95% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
[moved from
src/test/java/org/openecomp/sparky/util/ExceptionHelper.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
[moved from
src/test/java/org/openecomp/sparky/util/HttpServletHelper.java
with 99% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/LogValidator.java
[moved from
src/test/java/org/openecomp/sparky/util/LogValidator.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
[moved from
src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java
with 94% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
[moved from
src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
with 99% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
[moved from
src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
[moved from
src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java
with 93% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
[moved from
src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java
with 99% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java
with 93% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java
with 93% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java
with 92% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java
with 98% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
with 89% similarity]
patch
|
blob
|
history
src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
[moved from
src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
with 95% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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>com.att.ajsc</groupId>
<version>2.0.0</version>
</parent>
- <groupId>org.o
penecom
p.aai.sparky-be</groupId>
+ <groupId>org.o
na
p.aai.sparky-be</groupId>
<artifactId>sparky-be</artifactId>
<version>1.0-SNAPSHOT</version>
<name>aai-sparky-be</name>
<artifactId>sparky-be</artifactId>
<version>1.0-SNAPSHOT</version>
<name>aai-sparky-be</name>
@@
-106,7
+106,7
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.o
penecom
p.aai</groupId>
+ <groupId>org.o
na
p.aai</groupId>
<artifactId>rest-client</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<artifactId>rest-client</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@
-151,9
+151,9
@@
<!-- Common logging framework -->
<dependency>
<!-- Common logging framework -->
<dependency>
- <groupId>org.o
penecom
p.aai.logging-service</groupId>
+ <groupId>org.o
na
p.aai.logging-service</groupId>
<artifactId>common-logging</artifactId>
<artifactId>common-logging</artifactId>
- <version>1.
0.0
</version>
+ <version>1.
1.0-SNAPSHOT
</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-187,9
+187,9
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.o
penecomp.ecompsdkos
</groupId>
+ <groupId>org.o
nap.portal.sdk
</groupId>
<artifactId>epsdk-fw</artifactId>
<artifactId>epsdk-fw</artifactId>
- <version>1.
1.0
</version>
+ <version>1.
3.0
</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@
-392,7
+392,7
@@
<configuration>
<artifactItems>
<artifactItem>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.o
penecom
p.aai</groupId>
+ <groupId>org.o
na
p.aai</groupId>
<artifactId>sparky-fe</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
<artifactId>sparky-fe</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
@@
-509,7
+509,7
@@
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
<configuration>
<verbose>true</verbose>
<serverId>docker-hub</serverId>
- <imageName>${docker.push.registry}/o
penecom
p/${project.artifactId}</imageName>
+ <imageName>${docker.push.registry}/o
na
p/${project.artifactId}</imageName>
<dockerDirectory>${docker.location}</dockerDirectory>
<imageTags>
<imageTag>latest</imageTag>
<dockerDirectory>${docker.location}</dockerDirectory>
<imageTags>
<imageTag>latest</imageTag>
diff --git
a/src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
b/src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
index
b311770
..
c052560
100644
(file)
--- a/
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
+++ b/
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/HelloWorldBeans.xml
@@
-4,5
+4,5
@@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="helloWorld" name="helloWorld"
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="helloWorld" name="helloWorld"
- class="org.o
penecomp
.sparky.HelloWorld" />
+ class="org.o
nap.aai
.sparky.HelloWorld" />
</beans>
</beans>
diff --git
a/src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
b/src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
index
da9b558
..
b65cb80
100644
(file)
--- a/
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
+++ b/
src/main/ajsc/inventory-ui-service_v1/inventory-ui-service/v1/conf/jaxrsBeans.groovy
@@
-3,7
+3,7
@@
beans{
xmlns jaxrs: "http://cxf.apache.org/jaxrs"
xmlns util: "http://www.springframework.org/schema/util"
xmlns jaxrs: "http://cxf.apache.org/jaxrs"
xmlns util: "http://www.springframework.org/schema/util"
- echoService(org.o
penecomp
.sparky.JaxrsEchoService)
+ echoService(org.o
nap.aai
.sparky.JaxrsEchoService)
util.list(id: 'jaxrsServices') {
ref(bean:'echoService')
util.list(id: 'jaxrsServices') {
ref(bean:'echoService')
diff --git
a/src/main/config/runner-web.xml
b/src/main/config/runner-web.xml
index
abfdf74
..
f70d71b
100644
(file)
--- a/
src/main/config/runner-web.xml
+++ b/
src/main/config/runner-web.xml
@@
-27,29
+27,29
@@
<servlet>
<servlet-name>VisualizationServlet</servlet-name>
<servlet>
<servlet-name>VisualizationServlet</servlet-name>
- <servlet-class>org.o
penecomp
.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class>
+ <servlet-class>org.o
nap.aai
.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>GeoVisualizationServlet</servlet-name>
</servlet>
<servlet>
<servlet-name>GeoVisualizationServlet</servlet-name>
- <servlet-class>org.o
penecomp
.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class>
+ <servlet-class>org.o
nap.aai
.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>EntityCountHistoryServlet</servlet-name>
</servlet>
<servlet>
<servlet-name>EntityCountHistoryServlet</servlet-name>
- <servlet-class>org.o
penecomp
.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class>
+ <servlet-class>org.o
nap.aai
.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class>
</servlet>
<filter>
<filter-name>ElasticSearchSynchronizerFilter</filter-name>
</servlet>
<filter>
<filter-name>ElasticSearchSynchronizerFilter</filter-name>
- <filter-class>org.o
penecomp
.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class>
+ <filter-class>org.o
nap.aai
.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class>
</filter>
<filter>
<filter-name>OxmModelLoaderFilter</filter-name>
</filter>
<filter>
<filter-name>OxmModelLoaderFilter</filter-name>
- <filter-class>org.o
penecomp
.sparky.config.oxm.OxmModelLoaderFilter</filter-class>
+ <filter-class>org.o
nap.aai
.sparky.config.oxm.OxmModelLoaderFilter</filter-class>
</filter>
<filter>
</filter>
<filter>
@@
-73,7
+73,7
@@
<servlet>
<servlet-name>SearchServlet</servlet-name>
<servlet>
<servlet-name>SearchServlet</servlet-name>
- <servlet-class>org.o
penecomp
.sparky.viewandinspect.servlet.SearchServlet</servlet-class>
+ <servlet-class>org.o
nap.aai
.sparky.viewandinspect.servlet.SearchServlet</servlet-class>
</servlet>
<filter>
</servlet>
<filter>
diff --git
a/src/main/java/org/openecomp/sparky/HelloWorld.java
b/src/main/java/org/onap/aai/sparky/HelloWorld.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/HelloWorld.java
rename to
src/main/java/org/onap/aai/sparky/HelloWorld.java
index
1dfb082
..
30d277d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/HelloWorld.java
+++ b/
src/main/java/org/onap/aai/sparky/HelloWorld.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky;
+package org.o
nap.aai
.sparky;
import org.apache.camel.Exchange;
import org.apache.camel.Exchange;
diff --git
a/src/main/java/org/openecomp/sparky/JaxrsEchoService.java
b/src/main/java/org/onap/aai/sparky/JaxrsEchoService.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/JaxrsEchoService.java
rename to
src/main/java/org/onap/aai/sparky/JaxrsEchoService.java
index
d2d6c0a
..
878f618
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/JaxrsEchoService.java
+++ b/
src/main/java/org/onap/aai/sparky/JaxrsEchoService.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky;
+package org.o
nap.aai
.sparky;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.ajsc.filemonitor.AJSCPropertiesMap;
import com.att.ajsc.beans.PropertiesMapBean;
import com.att.ajsc.filemonitor.AJSCPropertiesMap;
diff --git
a/src/main/java/org/openecomp/sparky/analytics/AbstractStatistics.java
b/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java
similarity index 87%
rename from
src/main/java/org/openecomp/sparky/analytics/AbstractStatistics.java
rename to
src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java
index
f51b6d1
..
3fccab3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/analytics/AbstractStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@
-42,7
+42,7
@@
public class AbstractStatistics implements ComponentStatistics {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#addCounter(java.lang.String)
+ * @see org.o
nap.aai
.sparky.analytics.ComponentStatistics#addCounter(java.lang.String)
*/
/*
* sync-lock the creation of counters during initialization, but run time should not use lock
*/
/*
* 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)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#pegCounter(java.lang.String)
+ * @see org.o
nap.aai
.sparky.analytics.ComponentStatistics#pegCounter(java.lang.String)
*/
@Override
public void pegCounter(String key) {
*/
@Override
public void pegCounter(String key) {
@@
-77,7
+77,7
@@
public class AbstractStatistics implements ComponentStatistics {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#incrementCounter(java.lang.String, int)
+ * @see org.o
nap.aai
.sparky.analytics.ComponentStatistics#incrementCounter(java.lang.String, int)
*/
@Override
public void incrementCounter(String key, int value) {
*/
@Override
public void incrementCounter(String key, int value) {
@@
-92,7
+92,7
@@
public class AbstractStatistics implements ComponentStatistics {
/* (non-Javadoc)
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#addHistogram(java.lang.String, java.lang.String, long, int, int)
+ * @see org.o
nap.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,
*/
@Override
public synchronized void addHistogram(String key, String histName, long maxYValue, int numBins,
@@
-107,7
+107,7
@@
public class AbstractStatistics implements ComponentStatistics {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#updateHistogram(java.lang.String, long)
+ * @see org.o
nap.aai
.sparky.analytics.ComponentStatistics#updateHistogram(java.lang.String, long)
*/
@Override
public void updateHistogram(String key, long value) {
*/
@Override
public void updateHistogram(String key, long value) {
@@
-119,7
+119,7
@@
public class AbstractStatistics implements ComponentStatistics {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.analytics.ComponentStatistics#reset()
+ * @see org.o
nap.aai
.sparky.analytics.ComponentStatistics#reset()
*/
@Override
public void reset() {
*/
@Override
public void reset() {
diff --git
a/src/main/java/org/openecomp/sparky/analytics/AveragingRingBuffer.java
b/src/main/java/org/onap/aai/sparky/analytics/AveragingRingBuffer.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/analytics/AveragingRingBuffer.java
rename to
src/main/java/org/onap/aai/sparky/analytics/AveragingRingBuffer.java
index
cda6f0b
..
50038ee
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/analytics/AveragingRingBuffer.java
+++ b/
src/main/java/org/onap/aai/sparky/analytics/AveragingRingBuffer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
diff --git
a/src/main/java/org/openecomp/sparky/analytics/ComponentStatistics.java
b/src/main/java/org/onap/aai/sparky/analytics/ComponentStatistics.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/analytics/ComponentStatistics.java
rename to
src/main/java/org/onap/aai/sparky/analytics/ComponentStatistics.java
index
cd48e9b
..
e83251f
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/analytics/ComponentStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/analytics/ComponentStatistics.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
/**
/**
diff --git
a/src/main/java/org/openecomp/sparky/analytics/HistogramSampler.java
b/src/main/java/org/onap/aai/sparky/analytics/HistogramSampler.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/analytics/HistogramSampler.java
rename to
src/main/java/org/onap/aai/sparky/analytics/HistogramSampler.java
index
029ed95
..
1e9f970
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/analytics/HistogramSampler.java
+++ b/
src/main/java/org/onap/aai/sparky/analytics/HistogramSampler.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
/**
* A class that models a histogram for reporting and tracking long values with variable steps, bins,
/**
* A class that models a histogram for reporting and tracking long values with variable steps, bins,
diff --git
a/src/main/java/org/openecomp/sparky/analytics/HistoricalCounter.java
b/src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/analytics/HistoricalCounter.java
rename to
src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java
index
6173a00
..
e7dabe7
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/analytics/HistoricalCounter.java
+++ b/
src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java
@@
-21,7
+21,7
@@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
/**
* A simple class to model a historical counter. A set of values will be tracked and basic
/**
* A simple class to model a historical counter. A set of values will be tracked and basic
diff --git
a/src/main/java/org/openecomp/sparky/config/Configurable.java
b/src/main/java/org/onap/aai/sparky/config/Configurable.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/config/Configurable.java
rename to
src/main/java/org/onap/aai/sparky/config/Configurable.java
index
2821754
..
d108bef
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/Configurable.java
+++ b/
src/main/java/org/onap/aai/sparky/config/Configurable.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config;
+package org.o
nap.aai
.sparky.config;
-import org.o
penecomp
.sparky.config.exception.ConfigurationException;
+import org.o
nap.aai
.sparky.config.exception.ConfigurationException;
/**
* The Interface Configurable.
/**
* The Interface Configurable.
diff --git
a/src/main/java/org/openecomp/sparky/config/exception/ConfigurationException.java
b/src/main/java/org/onap/aai/sparky/config/exception/ConfigurationException.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/config/exception/ConfigurationException.java
rename to
src/main/java/org/onap/aai/sparky/config/exception/ConfigurationException.java
index
3652aac
..
f796c38
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/exception/ConfigurationException.java
+++ b/
src/main/java/org/onap/aai/sparky/config/exception/ConfigurationException.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config.exception;
+package org.o
nap.aai
.sparky.config.exception;
/**
/**
diff --git
a/src/main/java/org/openecomp/sparky/config/oxm/CrossEntityReference.java
b/src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReference.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/config/oxm/CrossEntityReference.java
rename to
src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReference.java
index
9c67fca
..
3cb0a9d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/oxm/CrossEntityReference.java
+++ b/
src/main/java/org/onap/aai/sparky/config/oxm/CrossEntityReference.java
@@
-21,7
+21,7
@@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config.oxm;
+package org.o
nap.aai
.sparky.config.oxm;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/main/java/org/openecomp/sparky/config/oxm/OxmEntityDescriptor.java
b/src/main/java/org/onap/aai/sparky/config/oxm/OxmEntityDescriptor.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/config/oxm/OxmEntityDescriptor.java
rename to
src/main/java/org/onap/aai/sparky/config/oxm/OxmEntityDescriptor.java
index
6b165bd
..
a62f22e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/oxm/OxmEntityDescriptor.java
+++ b/
src/main/java/org/onap/aai/sparky/config/oxm/OxmEntityDescriptor.java
@@
-20,11
+20,11
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config.oxm;
+package org.o
nap.aai
.sparky.config.oxm;
import java.util.List;
import java.util.List;
-import org.o
penecomp
.sparky.synchronizer.entity.SuggestionSearchEntity;
+import org.o
nap.aai
.sparky.synchronizer.entity.SuggestionSearchEntity;
/**
* The Class OxmEntityDescriptor.
/**
* The Class OxmEntityDescriptor.
diff --git
a/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
b/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
rename to
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
index
2a19551
..
9f370c8
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
+++ b/
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoader.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config.oxm;
+package org.o
nap.aai
.sparky.config.oxm;
import java.io.File;
import java.io.FileInputStream;
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.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.mappings.DatabaseMapping;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactor
y;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.synchronizer.entity.SuggestionSearchEntity
;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.SuggestionSearchEntit
y;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstant
s;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class OxmModelLoader.
/**
* The Class OxmModelLoader.
diff --git
a/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoaderFilter.java
b/src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoaderFilter.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoaderFilter.java
rename to
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoaderFilter.java
index
f1efe02
..
cf25c72
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoaderFilter.java
+++ b/
src/main/java/org/onap/aai/sparky/config/oxm/OxmModelLoaderFilter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.config.oxm;
+package org.o
nap.aai
.sparky.config.oxm;
import java.io.IOException;
import java.net.UnknownHostException;
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 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.
/**
* The Class OxmModelLoaderFilter.
diff --git
a/src/main/java/org/openecomp/sparky/dal/NetworkTransaction.java
b/src/main/java/org/onap/aai/sparky/dal/NetworkTransaction.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/dal/NetworkTransaction.java
rename to
src/main/java/org/onap/aai/sparky/dal/NetworkTransaction.java
index
43e4be7
..
16644f0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/NetworkTransaction.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/NetworkTransaction.java
@@
-20,11
+20,11
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal;
+package org.o
nap.aai
.sparky.dal;
-import org.o
penecomp
.sparky.config.oxm.OxmEntityDescriptor;
-import org.o
penecomp
.sparky.dal.rest.HttpMethod;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.config.oxm.OxmEntityDescriptor;
+import org.o
nap.aai
.sparky.dal.rest.HttpMethod;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class NetworkTransaction.
/**
* The Class NetworkTransaction.
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryAdapter.java
b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryAdapter.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java
index
0f1ed36
..
b81619a
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryAdapter.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryAdapter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai;
+package org.o
nap.aai
.sparky.dal.aai;
import java.io.IOException;
import java.net.URLEncoder;
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 java.util.NoSuchElementException;
import org.apache.http.client.utils.URIBuilder;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoader
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryRestConfig
;
-import org.o
penecomp.sparky.dal.aai.enums.RestAuthenticationMode
;
-import org.o
penecomp.sparky.dal.exception.ElasticSearchOperationException
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.dal.rest.RestClientBuilder
;
-import org.o
penecomp.sparky.dal.rest.RestfulDataAccessor
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.security.SecurityContextFactory
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoader
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig
;
+import org.o
nap.aai.sparky.dal.aai.enums.RestAuthenticationMode
;
+import org.o
nap.aai.sparky.dal.exception.ElasticSearchOperationException
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.rest.RestClientBuilder
;
+import org.o
nap.aai.sparky.dal.rest.RestfulDataAccessor
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.security.SecurityContextFactory
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.WebResource.Builder;
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)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestfulDataAccessor#setClientDefaults(com.sun.jersey.api.client.Client, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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,
*/
@Override
protected Builder setClientDefaults(Client client, String url, String payloadContentType,
@@
-194,7
+194,7
@@
public class ActiveInventoryAdapter extends RestfulDataAccessor
/* (non-Javadoc)
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinksByEntityType(java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinksByEntityType(java.lang.String)
*/
@Override
public OperationResult getSelfLinksByEntityType(String entityType) throws Exception {
*/
@Override
public OperationResult getSelfLinksByEntityType(String entityType) throws Exception {
@@
-231,7
+231,7
@@
public class ActiveInventoryAdapter extends RestfulDataAccessor
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinkForEntity(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider#getSelfLinkForEntity(java.lang.String, java.lang.String, java.lang.String)
*/
@Override
public OperationResult getSelfLinkForEntity(String entityType, String primaryKeyName,
*/
@Override
public OperationResult getSelfLinkForEntity(String entityType, String primaryKeyName,
@@
-322,7
+322,7
@@
public class ActiveInventoryAdapter extends RestfulDataAccessor
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider#queryActiveInventoryWithRetries(java.lang.String, java.lang.String, int)
+ * @see org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider#queryActiveInventoryWithRetries(java.lang.String, java.lang.String, int)
*/
@Override
public OperationResult queryActiveInventoryWithRetries(String url, String responseType,
*/
@Override
public OperationResult queryActiveInventoryWithRetries(String url, String responseType,
@@
-398,7
+398,7
@@
public class ActiveInventoryAdapter extends RestfulDataAccessor
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestfulDataAccessor#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestfulDataAccessor#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryDataProvider.java
b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryDataProvider.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryDataProvider.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryDataProvider.java
index
4696a73
..
ae7c852
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryDataProvider.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryDataProvider.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai;
+package org.o
nap.aai
.sparky.dal.aai;
import java.util.List;
import java.util.List;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
/**
* The Interface ActiveInventoryDataProvider.
/**
* The Interface ActiveInventoryDataProvider.
@@
-80,7
+80,7
@@
public interface ActiveInventoryDataProvider extends RestDataProvider {
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#shutdown()
*/
@Override
void shutdown();
*/
@Override
void shutdown();
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryEntityStatistics.java
b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryEntityStatistics.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryEntityStatistics.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryEntityStatistics.java
index
a9acdcc
..
69e7808
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryEntityStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryEntityStatistics.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai;
+package org.o
nap.aai
.sparky.dal.aai;
import java.util.Comparator;
import java.util.HashMap;
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 java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.config.oxm.OxmEntityDescriptor;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.config.oxm.OxmEntityDescriptor;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class ActiveInventoryEntityStatistics.
/**
* The Class ActiveInventoryEntityStatistics.
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
b/src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
index
112bd6b
..
eb4eb6c
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/ActiveInventoryProcessingExceptionStatistics.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai;
-
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.analytics.AbstractStatistics
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+package org.o
nap.aai
.sparky.dal.aai;
+
+import org.o
nap.aai.sparky.analytics.AbstractStatistics
;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class ActiveInventoryProcessingExceptionStatistics.
/**
* The Class ActiveInventoryProcessingExceptionStatistics.
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfig.java
b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfig.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfig.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfig.java
index
2a5507b
..
c1b0f4e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfig.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URI;
import java.net.URISyntaxException;
@@
-28,13
+28,13
@@
import java.util.Properties;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriBuilder;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.config.TaskProcessorConfig
;
-import org.o
penecomp.sparky.util.ConfigHelper
;
-import org.o
penecomp.sparky.util.Encrypto
r;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.config.TaskProcessorConfig
;
+import org.o
nap.aai.sparky.util.ConfigHelper
;
+import org.o
nap.aai.sparky.util.Encryptor
;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.cl.api.Logge
r;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class ActiveInventoryConfig.
*/
/**
* The Class ActiveInventoryConfig.
*/
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfig.java
b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfig.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java
index
b83bb2f
..
a99e6c3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import org.o
penecomp
.sparky.dal.aai.enums.RestAuthenticationMode;
-import org.o
penecomp
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.dal.aai.enums.RestAuthenticationMode;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
/**
* The Class ActiveInventoryRestConfig.
/**
* The Class ActiveInventoryRestConfig.
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfig.java
b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfig.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java
index
0d89799
..
230c445
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import java.util.Properties;
import org.eclipse.jetty.util.security.Password;
import java.util.Properties;
import org.eclipse.jetty.util.security.Password;
-import org.o
penecomp
.sparky.util.ConfigHelper;
-import org.o
penecomp
.sparky.util.Encryptor;
-import org.o
penecomp
.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.util.Encryptor;
+import org.o
nap.aai
.sparky.viewandinspect.config.TierSupportUiConstants;
/**
* The Class ActiveInventorySslConfig.
/**
* The Class ActiveInventorySslConfig.
diff --git
a/src/main/java/org/openecomp/sparky/dal/aai/enums/RestAuthenticationMode.java
b/src/main/java/org/onap/aai/sparky/dal/aai/enums/RestAuthenticationMode.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/dal/aai/enums/RestAuthenticationMode.java
rename to
src/main/java/org/onap/aai/sparky/dal/aai/enums/RestAuthenticationMode.java
index
f8672c6
..
743b031
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/aai/enums/RestAuthenticationMode.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/aai/enums/RestAuthenticationMode.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.enums;
+package org.o
nap.aai
.sparky.dal.aai.enums;
/**
* Authentication Modes:
/**
* Authentication Modes:
diff --git
a/src/main/java/org/openecomp/sparky/dal/cache/EntityCache.java
b/src/main/java/org/onap/aai/sparky/dal/cache/EntityCache.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/dal/cache/EntityCache.java
rename to
src/main/java/org/onap/aai/sparky/dal/cache/EntityCache.java
index
7a77747
..
c1b6efa
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/cache/EntityCache.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/cache/EntityCache.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.cache;
+package org.o
nap.aai
.sparky.dal.cache;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Interface EntityCache.
/**
* The Interface EntityCache.
diff --git
a/src/main/java/org/openecomp/sparky/dal/cache/InMemoryEntityCache.java
b/src/main/java/org/onap/aai/sparky/dal/cache/InMemoryEntityCache.java
similarity index 80%
rename from
src/main/java/org/openecomp/sparky/dal/cache/InMemoryEntityCache.java
rename to
src/main/java/org/onap/aai/sparky/dal/cache/InMemoryEntityCache.java
index
7a2102b
..
6967d16
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/cache/InMemoryEntityCache.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/cache/InMemoryEntityCache.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.cache;
+package org.o
nap.aai
.sparky.dal.cache;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class InMemoryEntityCache.
/**
* The Class InMemoryEntityCache.
@@
-48,7
+48,7
@@
public class InMemoryEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp.sparky.dal.cache.EntityCache#put(java.lang.String, org.openecomp
.sparky.dal.rest.OperationResult)
+ * @see org.o
nap.aai.sparky.dal.cache.EntityCache#put(java.lang.String, org.onap.aai
.sparky.dal.rest.OperationResult)
*/
@Override
public void put(String key, OperationResult data) {
*/
@Override
public void put(String key, OperationResult data) {
@@
-65,7
+65,7
@@
public class InMemoryEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
*/
@Override
public OperationResult get(String entityKey, String link) {
*/
@Override
public OperationResult get(String entityKey, String link) {
@@
-78,7
+78,7
@@
public class InMemoryEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-88,7
+88,7
@@
public class InMemoryEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#clear()
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#clear()
*/
@Override
public void clear() {
*/
@Override
public void clear() {
diff --git
a/src/main/java/org/openecomp/sparky/dal/cache/PersistentEntityCache.java
b/src/main/java/org/onap/aai/sparky/dal/cache/PersistentEntityCache.java
similarity index 88%
rename from
src/main/java/org/openecomp/sparky/dal/cache/PersistentEntityCache.java
rename to
src/main/java/org/onap/aai/sparky/dal/cache/PersistentEntityCache.java
index
9ee7680
..
c2b4b42
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/cache/PersistentEntityCache.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/cache/PersistentEntityCache.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.cache;
+package org.o
nap.aai
.sparky.dal.cache;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import org.o
penecomp.cl.api.Logg
er;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryAdapter
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.task.PersistOperationResultToDisk
;
-import org.o
penecomp.sparky.synchronizer.task.RetrieveOperationResultFromDisk
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryAdapt
er;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.task.PersistOperationResultToDisk
;
+import org.o
nap.aai.sparky.synchronizer.task.RetrieveOperationResultFromDisk
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
@@
-168,7
+168,7
@@
public class PersistentEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#get(java.lang.String, java.lang.String)
*/
@Override
public OperationResult get(String key, String link) {
*/
@Override
public OperationResult get(String key, String link) {
@@
-196,7
+196,7
@@
public class PersistentEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp.sparky.dal.cache.EntityCache#put(java.lang.String, org.openecomp
.sparky.dal.rest.OperationResult)
+ * @see org.o
nap.aai.sparky.dal.cache.EntityCache#put(java.lang.String, org.onap.aai
.sparky.dal.rest.OperationResult)
*/
@Override
public void put(String key, OperationResult data) {
*/
@Override
public void put(String key, OperationResult data) {
@@
-223,7
+223,7
@@
public class PersistentEntityCache implements EntityCache {
/* (non-Javadoc)
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-234,7
+234,7
@@
public class PersistentEntityCache implements EntityCache {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.cache.EntityCache#clear()
+ * @see org.o
nap.aai
.sparky.dal.cache.EntityCache#clear()
*/
@Override
public void clear() {
*/
@Override
public void clear() {
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchAdapter.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java
similarity index 74%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchAdapter.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java
index
99f09a9
..
d99d51e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchAdapter.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
-import org.o
penecomp
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.o
penecomp
.sparky.dal.rest.HttpMethod;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
-import org.o
penecomp
.sparky.dal.rest.RestfulDataAccessor;
+import org.o
nap.aai
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.o
nap.aai
.sparky.dal.rest.HttpMethod;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.RestfulDataAccessor;
/**
* The Class ElasticSearchAdapter.
/**
* The Class ElasticSearchAdapter.
@@
-52,7
+52,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doGet(String url, String acceptContentType) {
*/
@Override
public OperationResult doGet(String url, String acceptContentType) {
@@
-60,7
+60,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doDelete(String url, String acceptContentType) {
*/
@Override
public OperationResult doDelete(String url, String acceptContentType) {
@@
-68,7
+68,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
@@
-76,7
+76,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPut(String url, String jsonPayload, String acceptContentType) {
@@
-84,7
+84,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPatch(String url, String jsonPayload, String acceptContentType) {
@@
-92,7
+92,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doHead(String url, String acceptContentType) {
*/
@Override
public OperationResult doHead(String url, String acceptContentType) {
@@
-100,7
+100,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#clearCache()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#clearCache()
*/
@Override
public void clearCache() {
*/
@Override
public void clearCache() {
@@
-108,7
+108,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.elasticsearch.ElasticSearchDataProvider#doBulkOperation(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.elasticsearch.ElasticSearchDataProvider#doBulkOperation(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doBulkOperation(String url, String payload) {
*/
@Override
public OperationResult doBulkOperation(String url, String payload) {
@@
-119,7
+119,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.elasticsearch.ElasticSearchDataProvider#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.elasticsearch.ElasticSearchDataProvider#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-127,7
+127,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp.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.o
nap.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,
*/
@Override
public OperationResult doRestfulOperation(HttpMethod method, String url, String payload,
@@
-137,7
+137,7
@@
public class ElasticSearchAdapter implements ElasticSearchDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.elasticsearch.ElasticSearchDataProvider#buildBulkImportOperationRequest(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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,
*/
@Override
public String buildBulkImportOperationRequest(String index, String type, String id,
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
index
c83c078
..
78aea91
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchDataProvider.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
/**
* The Interface ElasticSearchDataProvider.
/**
* The Interface ElasticSearchDataProvider.
@@
-55,7
+55,7
@@
public interface ElasticSearchDataProvider extends RestDataProvider {
OperationResult retrieveEntityById(String entityId) throws Exception;
/* (non-Javadoc)
OperationResult retrieveEntityById(String entityId) throws Exception;
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#shutdown()
*/
@Override
void shutdown();
*/
@Override
void shutdown();
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
index
bb2b3f1
..
42a0fcd
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchEntityStatistics.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
import java.util.Comparator;
import java.util.HashMap;
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 java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.config.oxm.OxmEntityDescriptor;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.rest.HttpMethod;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.config.oxm.OxmEntityDescriptor;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.rest.HttpMethod;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class ElasticSearchEntityStatistics.
/**
* The Class ElasticSearchEntityStatistics.
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/HashQueryResponse.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/HashQueryResponse.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/HashQueryResponse.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/HashQueryResponse.java
index
516b204
..
7b6dc95
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/HashQueryResponse.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/HashQueryResponse.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
import org.json.JSONObject;
import org.json.JSONObject;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
public class HashQueryResponse {
private String jsonPayload = null;
public class HashQueryResponse {
private String jsonPayload = null;
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/SearchAdapter.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java
similarity index 80%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/SearchAdapter.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java
index
92e55c6
..
59c0e5b
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/SearchAdapter.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Arrays;
import java.util.HashMap;
@@
-29,20
+29,20
@@
import java.util.Map;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MediaType;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.dal.sas.config.SearchServiceConfig
;
-import org.o
penecomp.sparky.util.Encrypto
r;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.sas.config.SearchServiceConfig
;
+import org.o
nap.aai.sparky.util.Encryptor
;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.cl.api.Logge
r;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
import org.slf4j.MDC;
-import org.o
penecomp
.restclient.client.RestClient;
-import org.o
penecomp
.restclient.enums.RestAuthenticationMode;
-import org.o
penecomp
.restclient.client.Headers;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.restclient.client.RestClient;
+import org.o
nap.aai
.restclient.enums.RestAuthenticationMode;
+import org.o
nap.aai
.restclient.client.Headers;
+import org.o
nap.aai
.cl.mdc.MdcContext;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
/**
* The Class SearchAdapter.
/**
* The Class SearchAdapter.
@@
-83,26
+83,26
@@
public class SearchAdapter {
}
public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
}
public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
- org.o
penecomp
.restclient.client.OperationResult or = client.post(url, jsonPayload, getTxnHeader(),
+ org.o
nap.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) {
MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_JSON_TYPE);
return new OperationResult(or.getResultCode(), or.getResult());
}
public OperationResult doGet(String url, String acceptContentType) {
- org.o
penecomp
.restclient.client.OperationResult or =
+ org.o
nap.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) {
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.o
penecomp
.restclient.client.OperationResult or = client.put(url, payload, getTxnHeader(),
+ org.o
nap.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) {
MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_JSON_TYPE);
return new OperationResult(or.getResultCode(), or.getResult());
}
public OperationResult doDelete(String url, String acceptContentType) {
- org.o
penecomp
.restclient.client.OperationResult or =
+ org.o
nap.aai
.restclient.client.OperationResult or =
client.delete(url, getTxnHeader(), MediaType.APPLICATION_JSON_TYPE);
return new OperationResult(or.getResultCode(), or.getResult());
}
client.delete(url, getTxnHeader(), MediaType.APPLICATION_JSON_TYPE);
return new OperationResult(or.getResultCode(), or.getResult());
}
diff --git
a/src/main/java/org/openecomp/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
rename to
src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
index
4e5fd0b
..
863fa4b
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java
@@
-20,17
+20,17
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.config;
+package org.o
nap.aai
.sparky.dal.elasticsearch.config;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import org.o
penecomp
.sparky.dal.exception.ElasticSearchOperationException;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
-import org.o
penecomp
.sparky.util.ConfigHelper;
-import org.o
penecomp
.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.o
nap.aai
.sparky.dal.exception.ElasticSearchOperationException;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.viewandinspect.config.TierSupportUiConstants;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/src/main/java/org/openecomp/sparky/dal/exception/ElasticSearchOperationException.java
b/src/main/java/org/onap/aai/sparky/dal/exception/ElasticSearchOperationException.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/dal/exception/ElasticSearchOperationException.java
rename to
src/main/java/org/onap/aai/sparky/dal/exception/ElasticSearchOperationException.java
index
549962d
..
a9f5ca2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/exception/ElasticSearchOperationException.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/exception/ElasticSearchOperationException.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.exception;
+package org.o
nap.aai
.sparky.dal.exception;
/**
* The Class ElasticSearchOperationException.
/**
* The Class ElasticSearchOperationException.
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/HttpMethod.java
b/src/main/java/org/onap/aai/sparky/dal/rest/HttpMethod.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/dal/rest/HttpMethod.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/HttpMethod.java
index
5c28771
..
145c895
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/HttpMethod.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/HttpMethod.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
/**
/**
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/OperationResult.java
b/src/main/java/org/onap/aai/sparky/dal/rest/OperationResult.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/dal/rest/OperationResult.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/OperationResult.java
index
c727739
..
c147cb0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/OperationResult.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/OperationResult.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
/**
* The Class OperationResult.
/**
* The Class OperationResult.
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/RestClientBuilder.java
b/src/main/java/org/onap/aai/sparky/dal/rest/RestClientBuilder.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/dal/rest/RestClientBuilder.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/RestClientBuilder.java
index
9a8c4c9
..
c32a9b9
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/RestClientBuilder.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/RestClientBuilder.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
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 javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
-import org.o
penecomp
.sparky.security.SecurityContextFactory;
-import org.o
penecomp
.sparky.security.SecurityContextFactoryImpl;
+import org.o
nap.aai
.sparky.security.SecurityContextFactory;
+import org.o
nap.aai
.sparky.security.SecurityContextFactoryImpl;
/**
* This is a generic REST Client builder with flexible security validation. Sometimes it's nice to
/**
* This is a generic REST Client builder with flexible security validation. Sometimes it's nice to
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/RestDataProvider.java
b/src/main/java/org/onap/aai/sparky/dal/rest/RestDataProvider.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/dal/rest/RestDataProvider.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/RestDataProvider.java
index
6c022a9
..
b8780a5
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/RestDataProvider.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/RestDataProvider.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
/**
* The Interface RestDataProvider.
/**
* The Interface RestDataProvider.
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/RestOperationalStatistics.java
b/src/main/java/org/onap/aai/sparky/dal/rest/RestOperationalStatistics.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/dal/rest/RestOperationalStatistics.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/RestOperationalStatistics.java
index
227d8f2
..
258e1e8
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/RestOperationalStatistics.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/RestOperationalStatistics.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
-import org.o
penecomp
.sparky.analytics.AbstractStatistics;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.analytics.AbstractStatistics;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
/**
* The Class RestOperationalStatistics.
/**
* The Class RestOperationalStatistics.
diff --git
a/src/main/java/org/openecomp/sparky/dal/rest/RestfulDataAccessor.java
b/src/main/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessor.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/dal/rest/RestfulDataAccessor.java
rename to
src/main/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessor.java
index
7d5e1cf
..
78da999
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/rest/RestfulDataAccessor.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessor.java
@@
-20,15
+20,15
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
import java.security.SecureRandom;
import java.security.SecureRandom;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.cache.EntityCache
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.dal.cache.EntityCache
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
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)
}
/* (non-Javadoc)
- * @see org.o
penecomp.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.o
nap.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,
*/
@Override
public OperationResult doRestfulOperation(HttpMethod method, String url, String payload,
@@
-256,7
+256,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doGet(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doGet(String url, String acceptContentType) {
*/
@Override
public OperationResult doGet(String url, String acceptContentType) {
@@
-264,7
+264,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doDelete(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doDelete(String url, String acceptContentType) {
*/
@Override
public OperationResult doDelete(String url, String acceptContentType) {
@@
-272,7
+272,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPost(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPost(String url, String jsonPayload, String acceptContentType) {
@@
-281,7
+281,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPut(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPut(String url, String jsonPayload, String acceptContentType) {
@@
-290,7
+290,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doPatch(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.o
nap.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) {
*/
@Override
public OperationResult doPatch(String url, String jsonPayload, String acceptContentType) {
@@
-299,7
+299,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#doHead(java.lang.String, java.lang.String)
*/
@Override
public OperationResult doHead(String url, String acceptContentType) {
*/
@Override
public OperationResult doHead(String url, String acceptContentType) {
@@
-329,7
+329,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#shutdown()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-341,7
+341,7
@@
public class RestfulDataAccessor implements RestDataProvider {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.dal.rest.RestDataProvider#clearCache()
+ * @see org.o
nap.aai
.sparky.dal.rest.RestDataProvider#clearCache()
*/
@Override
public void clearCache() {
*/
@Override
public void clearCache() {
diff --git
a/src/main/java/org/openecomp/sparky/dal/sas/config/SearchServiceConfig.java
b/src/main/java/org/onap/aai/sparky/dal/sas/config/SearchServiceConfig.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/dal/sas/config/SearchServiceConfig.java
rename to
src/main/java/org/onap/aai/sparky/dal/sas/config/SearchServiceConfig.java
index
5bb0dbf
..
66e7d7b
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/sas/config/SearchServiceConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/sas/config/SearchServiceConfig.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.config;
+package org.o
nap.aai
.sparky.dal.sas.config;
import java.util.Properties;
import java.util.Properties;
-import org.o
penecomp
.sparky.util.ConfigHelper;
-import org.o
penecomp
.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.viewandinspect.config.TierSupportUiConstants;
/**
* The Class ElasticSearchConfig.
/**
* The Class ElasticSearchConfig.
diff --git
a/src/main/java/org/openecomp/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
b/src/main/java/org/onap/aai/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
rename to
src/main/java/org/onap/aai/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
index
bc70113
..
9845330
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
+++ b/
src/main/java/org/onap/aai/sparky/dal/servlet/ResettableStreamHttpServletRequest.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.servlet;
+package org.o
nap.aai
.sparky.dal.servlet;
import com.google.common.primitives.Bytes;
import com.google.common.primitives.Bytes;
diff --git
a/src/main/java/org/openecomp/sparky/inventory/EntityHistoryQueryBuilder.java
b/src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/inventory/EntityHistoryQueryBuilder.java
rename to
src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java
index
1564afb
..
388fb2c
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/inventory/EntityHistoryQueryBuilder.java
+++ b/
src/main/java/org/onap/aai/sparky/inventory/EntityHistoryQueryBuilder.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory;
+package org.o
nap.aai
.sparky.inventory;
import javax.json.Json;
import javax.json.JsonArray;
import javax.json.Json;
import javax.json.JsonArray;
diff --git
a/src/main/java/org/openecomp/sparky/inventory/entity/GeoIndexDocument.java
b/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/inventory/entity/GeoIndexDocument.java
rename to
src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java
index
2a181e8
..
665d95b
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/inventory/entity/GeoIndexDocument.java
+++ b/
src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory.entity;
+package org.o
nap.aai
.sparky.inventory.entity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
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 javax.json.Json;
import javax.json.JsonObject;
-import org.o
penecomp
.sparky.config.oxm.OxmEntityDescriptor;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.synchronizer.entity.IndexDocument;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.config.oxm.OxmEntityDescriptor;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument;
+import org.o
nap.aai
.sparky.util.NodeUtils;
/**
* The Class GeoIndexDocument.
/**
* The Class GeoIndexDocument.
@@
-191,7
+191,7
@@
public class GeoIndexDocument implements Serializable, IndexDocument {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.entity.IndexDocument#deriveFields()
+ * @see org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument#deriveFields()
*/
@Override
public void deriveFields() {
*/
@Override
public void deriveFields() {
diff --git
a/src/main/java/org/openecomp/sparky/inventory/entity/TopographicalEntity.java
b/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/inventory/entity/TopographicalEntity.java
rename to
src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java
index
af02ed1
..
5467238
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/inventory/entity/TopographicalEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory.entity;
+package org.o
nap.aai
.sparky.inventory.entity;
import java.io.IOException;
import java.io.Serializable;
import java.io.IOException;
import java.io.Serializable;
diff --git
a/src/main/java/org/openecomp/sparky/inventory/servlet/EntityCountHistoryServlet.java
b/src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/inventory/servlet/EntityCountHistoryServlet.java
rename to
src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java
index
114463e
..
c5d3a80
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/inventory/servlet/EntityCountHistoryServlet.java
+++ b/
src/main/java/org/onap/aai/sparky/inventory/servlet/EntityCountHistoryServlet.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory.servlet;
+package org.o
nap.aai
.sparky.inventory.servlet;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
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 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.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.
/**
* The Class EntityCountHistoryServlet.
diff --git
a/src/main/java/org/openecomp/sparky/inventory/servlet/GeoVisualizationServlet.java
b/src/main/java/org/onap/aai/sparky/inventory/servlet/GeoVisualizationServlet.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/inventory/servlet/GeoVisualizationServlet.java
rename to
src/main/java/org/onap/aai/sparky/inventory/servlet/GeoVisualizationServlet.java
index
9a51724
..
b0a0670
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/inventory/servlet/GeoVisualizationServlet.java
+++ b/
src/main/java/org/onap/aai/sparky/inventory/servlet/GeoVisualizationServlet.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory.servlet;
+package org.o
nap.aai
.sparky.inventory.servlet;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
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 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.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.
/**
* The Class GeoVisualizationServlet.
diff --git
a/src/main/java/org/openecomp/sparky/logging/AaiUiMsgs.java
b/src/main/java/org/onap/aai/sparky/logging/AaiUiMsgs.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/logging/AaiUiMsgs.java
rename to
src/main/java/org/onap/aai/sparky/logging/AaiUiMsgs.java
index
6a62d4a
..
d6cc218
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/logging/AaiUiMsgs.java
+++ b/
src/main/java/org/onap/aai/sparky/logging/AaiUiMsgs.java
@@
-20,11
+20,11
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.logging;
+package org.o
nap.aai
.sparky.logging;
import com.att.eelf.i18n.EELFResourceManager;
import com.att.eelf.i18n.EELFResourceManager;
-import org.o
penecomp
.cl.eelf.LogMessageEnum;
+import org.o
nap.aai
.cl.eelf.LogMessageEnum;
/**
* The Enum AaiUiMsgs.
/**
* The Enum AaiUiMsgs.
diff --git
a/src/main/java/org/openecomp/sparky/logging/util/LoggingUtils.java
b/src/main/java/org/onap/aai/sparky/logging/util/LoggingUtils.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/logging/util/LoggingUtils.java
rename to
src/main/java/org/onap/aai/sparky/logging/util/LoggingUtils.java
index
b588865
..
d8ac110
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/logging/util/LoggingUtils.java
+++ b/
src/main/java/org/onap/aai/sparky/logging/util/LoggingUtils.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.logging.util;
+package org.o
nap.aai
.sparky.logging.util;
/**
* The Class LoggingUtils.
/**
* The Class LoggingUtils.
diff --git
a/src/main/java/org/openecomp/sparky/search/EntityTypeSummary.java
b/src/main/java/org/onap/aai/sparky/search/EntityTypeSummary.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/search/EntityTypeSummary.java
rename to
src/main/java/org/onap/aai/sparky/search/EntityTypeSummary.java
index
d6d79fe
..
cfc7a61
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/EntityTypeSummary.java
+++ b/
src/main/java/org/onap/aai/sparky/search/EntityTypeSummary.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/main/java/org/openecomp/sparky/search/EntityTypeSummaryBucket.java
b/src/main/java/org/onap/aai/sparky/search/EntityTypeSummaryBucket.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/search/EntityTypeSummaryBucket.java
rename to
src/main/java/org/onap/aai/sparky/search/EntityTypeSummaryBucket.java
index
c64589d
..
bc08e60
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/EntityTypeSummaryBucket.java
+++ b/
src/main/java/org/onap/aai/sparky/search/EntityTypeSummaryBucket.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
public class EntityTypeSummaryBucket {
private int count;
public class EntityTypeSummaryBucket {
private int count;
diff --git
a/src/main/java/org/openecomp/sparky/search/SearchEntityProperties.java
b/src/main/java/org/onap/aai/sparky/search/SearchEntityProperties.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/search/SearchEntityProperties.java
rename to
src/main/java/org/onap/aai/sparky/search/SearchEntityProperties.java
index
ab62555
..
c65811e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/SearchEntityProperties.java
+++ b/
src/main/java/org/onap/aai/sparky/search/SearchEntityProperties.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/main/java/org/openecomp/sparky/search/Suggestion.java
b/src/main/java/org/onap/aai/sparky/search/Suggestion.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/search/Suggestion.java
rename to
src/main/java/org/onap/aai/sparky/search/Suggestion.java
index
8a11862
..
51ddb63
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/Suggestion.java
+++ b/
src/main/java/org/onap/aai/sparky/search/Suggestion.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
public class Suggestion {
private String entityType;
public class Suggestion {
private String entityType;
diff --git
a/src/main/java/org/openecomp/sparky/search/SuggestionList.java
b/src/main/java/org/onap/aai/sparky/search/SuggestionList.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/search/SuggestionList.java
rename to
src/main/java/org/onap/aai/sparky/search/SuggestionList.java
index
69ef70b
..
6cd2c9a
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/SuggestionList.java
+++ b/
src/main/java/org/onap/aai/sparky/search/SuggestionList.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedList;
import java.util.List;
diff --git
a/src/main/java/org/openecomp/sparky/search/VnfSearchQueryBuilder.java
b/src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/search/VnfSearchQueryBuilder.java
rename to
src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java
index
f82272b
..
946a2ac
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/VnfSearchQueryBuilder.java
+++ b/
src/main/java/org/onap/aai/sparky/search/VnfSearchQueryBuilder.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
import java.util.Date;
import java.util.Map;
import java.util.Date;
import java.util.Map;
diff --git
a/src/main/java/org/openecomp/sparky/search/VnfSearchService.java
b/src/main/java/org/onap/aai/sparky/search/VnfSearchService.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/search/VnfSearchService.java
rename to
src/main/java/org/onap/aai/sparky/search/VnfSearchService.java
index
c09f2c1
..
b8ab56a
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/VnfSearchService.java
+++ b/
src/main/java/org/onap/aai/sparky/search/VnfSearchService.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search;
+package org.o
nap.aai
.sparky.search;
import java.io.IOException;
import java.io.PrintWriter;
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.json.JSONArray;
import org.json.JSONObject;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.elasticsearch.HashQueryResponse
;
-import org.o
penecomp.sparky.dal.elasticsearch.SearchAdapter
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.suggestivesearch.SuggestionEntity
;
-import org.o
penecomp.sparky.util.NodeUtils
;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
-import org.o
penecomp.sparky.viewandinspect.entity.QuerySearchEntit
y;
+import org.o
nap.aai.sparky.dal.elasticsearch.HashQueryResponse
;
+import org.o
nap.aai.sparky.dal.elasticsearch.SearchAdapter
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.suggestivesearch.SuggestionEntity
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.viewandinspect.entity.QuerySearchEntity
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactor
y;
/**
/**
diff --git
a/src/main/java/org/openecomp/sparky/search/config/SuggestionConfig.java
b/src/main/java/org/onap/aai/sparky/search/config/SuggestionConfig.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/search/config/SuggestionConfig.java
rename to
src/main/java/org/onap/aai/sparky/search/config/SuggestionConfig.java
index
441f445
..
7cffb43
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/search/config/SuggestionConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/search/config/SuggestionConfig.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.search.config;
+package org.o
nap.aai
.sparky.search.config;
import java.util.Arrays;
import java.util.Collection;
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 java.util.Map;
import java.util.Properties;
-import org.o
penecomp
.sparky.util.ConfigHelper;
-import org.o
penecomp
.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.viewandinspect.config.TierSupportUiConstants;
public class SuggestionConfig {
public static final String CONFIG_FILE =
public class SuggestionConfig {
public static final String CONFIG_FILE =
diff --git
a/src/main/java/org/openecomp/sparky/security/EcompSso.java
b/src/main/java/org/onap/aai/sparky/security/EcompSso.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/security/EcompSso.java
rename to
src/main/java/org/onap/aai/sparky/security/EcompSso.java
index
c771e6c
..
51047cc
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/EcompSso.java
+++ b/
src/main/java/org/onap/aai/sparky/security/EcompSso.java
@@
-20,16
+20,16
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security;
+package org.o
nap.aai
.sparky.security;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
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.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;
import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
diff --git
a/src/main/java/org/openecomp/sparky/security/SecurityContextFactory.java
b/src/main/java/org/onap/aai/sparky/security/SecurityContextFactory.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/security/SecurityContextFactory.java
rename to
src/main/java/org/onap/aai/sparky/security/SecurityContextFactory.java
index
cddaca7
..
2fe1283
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/SecurityContextFactory.java
+++ b/
src/main/java/org/onap/aai/sparky/security/SecurityContextFactory.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security;
+package org.o
nap.aai
.sparky.security;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git
a/src/main/java/org/openecomp/sparky/security/SecurityContextFactoryImpl.java
b/src/main/java/org/onap/aai/sparky/security/SecurityContextFactoryImpl.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/security/SecurityContextFactoryImpl.java
rename to
src/main/java/org/onap/aai/sparky/security/SecurityContextFactoryImpl.java
index
e669d13
..
1e15f11
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/SecurityContextFactoryImpl.java
+++ b/
src/main/java/org/onap/aai/sparky/security/SecurityContextFactoryImpl.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security;
+package org.o
nap.aai
.sparky.security;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.ByteArrayInputStream;
import java.io.File;
diff --git
a/src/main/java/org/openecomp/sparky/security/filter/LoginFilter.java
b/src/main/java/org/onap/aai/sparky/security/filter/LoginFilter.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/security/filter/LoginFilter.java
rename to
src/main/java/org/onap/aai/sparky/security/filter/LoginFilter.java
index
b27559e
..
6822eba
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/filter/LoginFilter.java
+++ b/
src/main/java/org/onap/aai/sparky/security/filter/LoginFilter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.filter;
+package org.o
nap.aai
.sparky.security.filter;
import java.io.IOException;
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 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.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
/**
* This filter checks every request for proper ECOMP Portal single sign on initialization. The
diff --git
a/src/main/java/org/openecomp/sparky/security/portal/PortalRestAPIServiceImpl.java
b/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/security/portal/PortalRestAPIServiceImpl.java
rename to
src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java
index
d9c7a0e
..
79e9344
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/portal/PortalRestAPIServiceImpl.java
+++ b/
src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal;
+package org.o
nap.aai
.sparky.security.portal;
import java.io.File;
import java.io.IOException;
import java.io.File;
import java.io.IOException;
@@
-30,13
+30,13
@@
import java.util.List;
import javax.servlet.http.HttpServletRequest;
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.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;
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
* @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();
}
LOG.debug("Get available roles");
return UserManager.getRoles();
}
diff --git
a/src/main/java/org/openecomp/sparky/security/portal/UserManager.java
b/src/main/java/org/onap/aai/sparky/security/portal/UserManager.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/security/portal/UserManager.java
rename to
src/main/java/org/onap/aai/sparky/security/portal/UserManager.java
index
6d9689c
..
acd6f55
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/portal/UserManager.java
+++ b/
src/main/java/org/onap/aai/sparky/security/portal/UserManager.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal;
+package org.o
nap.aai
.sparky.security.portal;
import java.io.File;
import java.io.IOException;
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 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.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;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git
a/src/main/java/org/openecomp/sparky/security/portal/config/PortalAuthenticationConfig.java
b/src/main/java/org/onap/aai/sparky/security/portal/config/PortalAuthenticationConfig.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/security/portal/config/PortalAuthenticationConfig.java
rename to
src/main/java/org/onap/aai/sparky/security/portal/config/PortalAuthenticationConfig.java
index
e1046bf
..
a4511b2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/portal/config/PortalAuthenticationConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/security/portal/config/PortalAuthenticationConfig.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal.config;
+package org.o
nap.aai
.sparky.security.portal.config;
import java.util.Properties;
import java.util.Properties;
-import org.o
penecomp
.sparky.util.ConfigHelper;
-import org.o
penecomp
.sparky.util.Encryptor;
-import org.o
penecomp
.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.util.Encryptor;
+import org.o
nap.aai
.sparky.viewandinspect.config.TierSupportUiConstants;
/**
* Provides Portal authentication configuration.
/**
* Provides Portal authentication configuration.
diff --git
a/src/main/java/org/openecomp/sparky/security/portal/config/RolesConfig.java
b/src/main/java/org/onap/aai/sparky/security/portal/config/RolesConfig.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/security/portal/config/RolesConfig.java
rename to
src/main/java/org/onap/aai/sparky/security/portal/config/RolesConfig.java
index
b023dc8
..
4bab100
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/security/portal/config/RolesConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/security/portal/config/RolesConfig.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal.config;
+package org.o
nap.aai
.sparky.security.portal.config;
import java.io.IOException;
import java.lang.reflect.Type;
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 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.portalsdk.core.restful.domain.EcompRole;
-import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
diff --git
a/src/main/java/org/openecomp/sparky/suggestivesearch/SuggestionEntity.java
b/src/main/java/org/onap/aai/sparky/suggestivesearch/SuggestionEntity.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/suggestivesearch/SuggestionEntity.java
rename to
src/main/java/org/onap/aai/sparky/suggestivesearch/SuggestionEntity.java
index
1d0e87b
..
96511c1
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/suggestivesearch/SuggestionEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/suggestivesearch/SuggestionEntity.java
@@
-20,7
+20,7
@@
*
\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
*/
\r
*
\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
*/
\r
-package org.o
penecomp
.sparky.suggestivesearch;
\r
+package org.o
nap.aai
.sparky.suggestivesearch;
\r
\r
public class SuggestionEntity {
\r
private String route;
\r
\r
public class SuggestionEntity {
\r
private String route;
\r
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/AbstractEntitySynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/AbstractEntitySynchronizer.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/synchronizer/AbstractEntitySynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/AbstractEntitySynchronizer.java
index
55578b4
..
c6b03ae
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/AbstractEntitySynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/AbstractEntitySynchronizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import java.net.InetAddress;
import java.net.UnknownHostException;
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 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;
/**
import com.fasterxml.jackson.databind.ObjectMapper;
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/AggregationSuggestionSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/AggregationSuggestionSynchronizer.java
similarity index 88%
rename from
src/main/java/org/openecomp/sparky/synchronizer/AggregationSuggestionSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSuggestionSynchronizer.java
index
7900193
..
b65a1b4
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/AggregationSuggestionSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSuggestionSynchronizer.java
@@
-20,25
+20,25
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import java.util.Map;
import java.util.concurrent.ExecutorService;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.cl.mdc.MdcContex
t;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.entity.AggregationSuggestionEntity
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchPut
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResul
t;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.AggregationSuggestionEntity
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchPut
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
+import org.o
nap.aai.cl.mdc.MdcContext
;
import org.slf4j.MDC;
public class AggregationSuggestionSynchronizer extends AbstractEntitySynchronizer
import org.slf4j.MDC;
public class AggregationSuggestionSynchronizer extends AbstractEntitySynchronizer
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/AggregationSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/AggregationSynchronizer.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/AggregationSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSynchronizer.java
index
2fd67c3
..
dd4daf0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/AggregationSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/AggregationSynchronizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.concurrent.CompletableFuture.supplyAsync;
@@
-47,29
+47,29
@@
import java.util.function.Supplier;
import javax.json.Json;
import javax.json.Json;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConfiguration
;
-import org.o
penecomp.sparky.synchronizer.entity.AggregationEntity
;
-import org.o
penecomp.sparky.synchronizer.entity.MergableEntity
;
-import org.o
penecomp.sparky.synchronizer.entity.SelfLinkDescriptor
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformActiveInventory
Retrieval;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchPut
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchUpdate
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConfiguration
;
+import org.o
nap.aai.sparky.synchronizer.entity.AggregationEntity
;
+import org.o
nap.aai.sparky.synchronizer.entity.MergableEntity
;
+import org.o
nap.aai.sparky.synchronizer.entity.SelfLinkDescriptor
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchPut
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearch
Retrieval;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
import org.slf4j.MDC;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectReader;
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)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-701,7
+701,7
@@
public class AggregationSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-720,7
+720,7
@@
public class AggregationSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-749,7
+749,7
@@
public class AggregationSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+ * @see org.o
nap.aai
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
*/
@Override
public void clearCache() {
*/
@Override
public void clearCache() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/AutosuggestionSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/AutosuggestionSynchronizer.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/synchronizer/AutosuggestionSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/AutosuggestionSynchronizer.java
index
ae36240
..
9da86d5
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/AutosuggestionSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/AutosuggestionSynchronizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.cl.mdc.MdcContext
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConfiguration
;
-import org.o
penecomp.sparky.synchronizer.entity.SelfLinkDescriptor
;
-import org.o
penecomp.sparky.synchronizer.entity.SuggestionSearchEntity
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchPut
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval
;
-import org.o
penecomp.sparky.util.NodeUtils
;
-import org.o
penecomp.sparky.util.SuggestionsPermutation
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConfiguration
;
+import org.o
nap.aai.sparky.synchronizer.entity.SelfLinkDescriptor
;
+import org.o
nap.aai.sparky.synchronizer.entity.SuggestionSearchEntity
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchPut
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchRetrieval
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.util.SuggestionsPermutation
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
+import org.o
nap.aai.cl.mdc.MdcContext
;
import org.slf4j.MDC;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.slf4j.MDC;
import com.fasterxml.jackson.core.JsonProcessingException;
@@
-221,7
+221,7
@@
public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-669,7
+669,7
@@
public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-680,7
+680,7
@@
public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-709,7
+709,7
@@
public class AutosuggestionSynchronizer extends AbstractEntitySynchronizer
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*
- * @see org.o
penecomp
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+ * @see org.o
nap.aai
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
*/
@Override
public void clearCache() {
*/
@Override
public void clearCache() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
index
1e3e85c
..
2b2580f
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/CrossEntityReferenceSynchronizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.CrossEntityReference
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConfiguration
;
-import org.o
penecomp.sparky.synchronizer.entity.IndexableCrossEntityReference
;
-import org.o
penecomp.sparky.synchronizer.entity.MergableEntity
;
-import org.o
penecomp.sparky.synchronizer.entity.SelfLinkDescriptor
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformActiveInventory
Retrieval;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchPut
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchUpdate
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.CrossEntityReference
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescriptor
;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConfiguration
;
+import org.o
nap.aai.sparky.synchronizer.entity.IndexableCrossEntityReference
;
+import org.o
nap.aai.sparky.synchronizer.entity.MergableEntity
;
+import org.o
nap.aai.sparky.synchronizer.entity.SelfLinkDescriptor
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchPut
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearch
Retrieval;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
import org.slf4j.MDC;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectReader;
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)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-159,7
+159,7
@@
public class CrossEntityReferenceSynchronizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-168,7
+168,7
@@
public class CrossEntityReferenceSynchronizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java
b/src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java
index
9ef4fe6
..
74cb1cb
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/ElasticSearchIndexCleaner.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
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 java.util.Iterator;
import java.util.List;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
-import org.o
penecomp.sparky.synchronizer.entity.ObjectIdCollection
;
-import org.o
penecomp.sparky.synchronizer.entity.SearchableEntity
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.ObjectIdCollection
;
+import org.o
nap.aai.sparky.synchronizer.entity.SearchableEntity
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class ElasticSearchIndexCleaner.
/**
* The Class ElasticSearchIndexCleaner.
@@
-95,7
+95,7
@@
public class ElasticSearchIndexCleaner implements IndexCleaner {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexCleaner#populatePreOperationCollection()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexCleaner#populatePreOperationCollection()
*/
@Override
public OperationState populatePreOperationCollection() {
*/
@Override
public OperationState populatePreOperationCollection() {
@@
-111,7
+111,7
@@
public class ElasticSearchIndexCleaner implements IndexCleaner {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexCleaner#populatePostOperationCollection()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexCleaner#populatePostOperationCollection()
*/
@Override
public OperationState populatePostOperationCollection() {
*/
@Override
public OperationState populatePostOperationCollection() {
@@
-125,7
+125,7
@@
public class ElasticSearchIndexCleaner implements IndexCleaner {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexCleaner#performCleanup()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexCleaner#performCleanup()
*/
@Override
public OperationState performCleanup() {
*/
@Override
public OperationState performCleanup() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/GeoSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/GeoSynchronizer.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/GeoSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/GeoSynchronizer.java
index
493f3c9
..
0f3926d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/GeoSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/GeoSynchronizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.ConcurrentLinkedDeque;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.cl.mdc.MdcContext
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.inventory.entity.GeoIndexDocument
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.entity.SelfLinkDescriptor
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
-import org.o
penecomp.sparky.synchronizer.task.StoreDocumentTask
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.inventory.entity.GeoIndexDocument
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.SelfLinkDescriptor
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
+import org.o
nap.aai.sparky.synchronizer.task.StoreDocumentTask
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
+import org.o
nap.aai.cl.mdc.MdcContext
;
import org.slf4j.MDC;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.slf4j.MDC;
import com.fasterxml.jackson.core.JsonProcessingException;
@@
-90,7
+90,7
@@
public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
/* (non-Javadoc)
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-394,7
+394,7
@@
public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-403,7
+403,7
@@
public class GeoSynchronizer extends AbstractEntitySynchronizer implements Index
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/HistoricalEntitySummarizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/HistoricalEntitySummarizer.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/HistoricalEntitySummarizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/HistoricalEntitySummarizer.java
index
5c97ef9
..
714e016
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/HistoricalEntitySummarizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/HistoricalEntitySummarizer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.concurrent.CompletableFuture.supplyAsync;
@@
-38,16
+38,16
@@
import java.util.function.Supplier;
import javax.json.Json;
import javax.json.Json;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.cl.mdc.MdcContex
t;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResul
t;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
+import org.o
nap.aai.cl.mdc.MdcContext
;
import org.slf4j.MDC;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.MDC;
import com.fasterxml.jackson.databind.JsonNode;
@@
-186,7
+186,7
@@
public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-309,7
+309,7
@@
public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-318,7
+318,7
@@
public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
@@
-345,7
+345,7
@@
public class HistoricalEntitySummarizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
+ * @see org.o
nap.aai
.sparky.synchronizer.AbstractEntitySynchronizer#clearCache()
*/
@Override
public void clearCache() {
*/
@Override
public void clearCache() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/IndexCleaner.java
b/src/main/java/org/onap/aai/sparky/synchronizer/IndexCleaner.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/IndexCleaner.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/IndexCleaner.java
index
f0fcbb3
..
4edab03
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/IndexCleaner.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/IndexCleaner.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
-import org.o
penecomp
.sparky.synchronizer.enumeration.OperationState;
+import org.o
nap.aai
.sparky.synchronizer.enumeration.OperationState;
/**
* The Interface IndexCleaner.
/**
* The Interface IndexCleaner.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/IndexIntegrityValidator.java
b/src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java
similarity index 88%
rename from
src/main/java/org/openecomp/sparky/synchronizer/IndexIntegrityValidator.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java
index
a3c8c83
..
492fddf
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/IndexIntegrityValidator.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.dal.rest.RestDataProvid
er;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.rest.RestDataProvider
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logg
er;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class IndexIntegrityValidator.
/**
* The Class IndexIntegrityValidator.
@@
-84,7
+84,7
@@
public class IndexIntegrityValidator implements IndexValidator {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexValidator#exists()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexValidator#exists()
*/
@Override
public boolean exists() {
*/
@Override
public boolean exists() {
@@
-103,7
+103,7
@@
public class IndexIntegrityValidator implements IndexValidator {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexValidator#integrityValid()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexValidator#integrityValid()
*/
@Override
public boolean integrityValid() {
*/
@Override
public boolean integrityValid() {
@@
-115,7
+115,7
@@
public class IndexIntegrityValidator implements IndexValidator {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexValidator#createOrRepair()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexValidator#createOrRepair()
*/
@Override
public void createOrRepair() {
*/
@Override
public void createOrRepair() {
@@
-140,7
+140,7
@@
public class IndexIntegrityValidator implements IndexValidator {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexValidator#destroyIndex()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexValidator#destroyIndex()
*/
@Override
public void destroyIndex() {
*/
@Override
public void destroyIndex() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/IndexSynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/IndexSynchronizer.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/synchronizer/IndexSynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/IndexSynchronizer.java
index
2ebfc3c
..
f1c6741
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/IndexSynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/IndexSynchronizer.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
-import org.o
penecomp
.sparky.synchronizer.enumeration.OperationState;
-import org.o
penecomp
.sparky.synchronizer.enumeration.SynchronizerState;
+import org.o
nap.aai
.sparky.synchronizer.enumeration.OperationState;
+import org.o
nap.aai
.sparky.synchronizer.enumeration.SynchronizerState;
/**
* The Interface IndexSynchronizer.
/**
* The Interface IndexSynchronizer.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/IndexValidator.java
b/src/main/java/org/onap/aai/sparky/synchronizer/IndexValidator.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/synchronizer/IndexValidator.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/IndexValidator.java
index
c0dbfb0
..
ae2f6f9
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/IndexValidator.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/IndexValidator.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
/**
* The Interface IndexValidator.
/**
* The Interface IndexValidator.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/MyErrorHandler.java
b/src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/synchronizer/MyErrorHandler.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java
index
8f59651
..
90665aa
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/MyErrorHandler.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import java.io.PrintWriter;
import java.io.PrintWriter;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/SearchableEntitySynchronizer.java
b/src/main/java/org/onap/aai/sparky/synchronizer/SearchableEntitySynchronizer.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/SearchableEntitySynchronizer.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/SearchableEntitySynchronizer.java
index
0097786
..
32019a6
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/SearchableEntitySynchronizer.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/SearchableEntitySynchronizer.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.concurrent.CompletableFuture.supplyAsync;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
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 java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.dal.NetworkTransaction
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.HttpMethod
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConfiguration
;
-import org.o
penecomp.sparky.synchronizer.entity.MergableEntity
;
-import org.o
penecomp.sparky.synchronizer.entity.SearchableEntity
;
-import org.o
penecomp.sparky.synchronizer.entity.SelfLinkDescriptor
;
-import org.o
penecomp.sparky.synchronizer.enumeration.OperationState
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.synchronizer.task.PerformActiveInventory
Retrieval;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchPut
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchRetrieval
;
-import org.o
penecomp.sparky.synchronizer.task.PerformElasticSearchUpdate
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.dal.NetworkTransaction
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.HttpMethod
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConfiguration
;
+import org.o
nap.aai.sparky.synchronizer.entity.MergableEntity
;
+import org.o
nap.aai.sparky.synchronizer.entity.SearchableEntity
;
+import org.o
nap.aai.sparky.synchronizer.entity.SelfLinkDescriptor
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.OperationState
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformActiveInventoryRetrieval
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchPut
;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearch
Retrieval;
+import org.o
nap.aai.sparky.synchronizer.task.PerformElasticSearchUpdate
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
@@
-223,7
+223,7
@@
public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#doSync()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#doSync()
*/
@Override
public OperationState doSync() {
*/
@Override
public OperationState doSync() {
@@
-730,7
+730,7
@@
public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#getStatReport(boolean)
*/
@Override
public String getStatReport(boolean showFinalReport) {
*/
@Override
public String getStatReport(boolean showFinalReport) {
@@
-739,7
+739,7
@@
public class SearchableEntitySynchronizer extends AbstractEntitySynchronizer
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.IndexSynchronizer#shutdown()
+ * @see org.o
nap.aai
.sparky.synchronizer.IndexSynchronizer#shutdown()
*/
@Override
public void shutdown() {
*/
@Override
public void shutdown() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
b/src/main/java/org/onap/aai/sparky/synchronizer/SyncController.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/SyncController.java
index
4ed7136
..
6a6c5e3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/SyncController.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/SyncController.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class SyncController.
/**
* The Class SyncController.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/SyncHelper.java
b/src/main/java/org/onap/aai/sparky/synchronizer/SyncHelper.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/SyncHelper.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/SyncHelper.java
index
002bc58
..
48331d0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/SyncHelper.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/SyncHelper.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
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 java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescripto
r;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoader
;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryAdapter
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryRestConfig
;
-import org.o
penecomp.sparky.dal.cache.
EntityCache;
-import org.o
penecomp.sparky.dal.cache.InMemoryEntityCache
;
-import org.o
penecomp.sparky.dal.cache.PersistentEntityCache
;
-import org.o
penecomp.sparky.dal.elasticsearch.ElasticSearchAdapt
er;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.RestClientBuilder
;
-import org.o
penecomp.sparky.dal.rest.RestfulDataAccessor
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.synchronizer.SyncController.SyncAction
s;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConfiguration
;
-import org.o
penecomp.sparky.synchronizer.config.SynchronizerConstants
;
-import org.o
penecomp.sparky.synchronizer.enumeration.SynchronizerState
;
-import org.o
penecomp.sparky.util.ErrorUtil
;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoader
;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryAdapte
r;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig
;
+import org.o
nap.aai.sparky.dal.cache.EntityCache
;
+import org.o
nap.aai.sparky.dal.cache.InMemoryEntityCache
;
+import org.o
nap.aai.sparky.dal.cache.Persistent
EntityCache;
+import org.o
nap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.RestClientBuild
er;
+import org.o
nap.aai.sparky.dal.rest.RestfulDataAccessor
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.SyncController.SyncActions
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConfiguration
;
+import org.o
nap.aai.sparky.synchronizer.config.SynchronizerConstant
s;
+import org.o
nap.aai.sparky.synchronizer.enumeration.SynchronizerState
;
+import org.o
nap.aai.sparky.util.ErrorUtil
;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/TaskProcessingStats.java
b/src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/synchronizer/TaskProcessingStats.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java
index
e54395c
..
ea0c2d2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/TaskProcessingStats.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
-import org.o
penecomp
.sparky.analytics.AbstractStatistics;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.analytics.AbstractStatistics;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
/**
* The Class TaskProcessingStats.
/**
* The Class TaskProcessingStats.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/TransactionRateController.java
b/src/main/java/org/onap/aai/sparky/synchronizer/TransactionRateController.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/TransactionRateController.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/TransactionRateController.java
index
14ae67f
..
76deef3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/TransactionRateController.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/TransactionRateController.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.analytics.AveragingRingBuffer;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.analytics.AveragingRingBuffer;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
/**
* TODO: Fill in description.
/**
* TODO: Fill in description.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConfiguration.java
b/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConfiguration.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java
index
51095d8
..
e6fd31d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConfiguration.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.config;
+package org.o
nap.aai
.sparky.synchronizer.config;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
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 java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.util.ConfigHelp
er;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.util.ConfigHelper
;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstant
s;
+import org.o
nap.aai.cl.api.Logg
er;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConstants.java
b/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConstants.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConstants.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConstants.java
index
057b91b
..
a548c30
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/config/SynchronizerConstants.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConstants.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.config;
+package org.o
nap.aai
.sparky.synchronizer.config;
import java.util.Date;
import java.util.Date;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/config/TaskProcessorConfig.java
b/src/main/java/org/onap/aai/sparky/synchronizer/config/TaskProcessorConfig.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/synchronizer/config/TaskProcessorConfig.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/config/TaskProcessorConfig.java
index
970c463
..
73f4f77
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/config/TaskProcessorConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/config/TaskProcessorConfig.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.config;
+package org.o
nap.aai
.sparky.synchronizer.config;
import java.util.Properties;
import java.util.Properties;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationEntity.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationEntity.java
index
8e2f725
..
ff22ba0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationEntity.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.util.NodeUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
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)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.entity.IndexDocument#deriveFields()
+ * @see org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument#deriveFields()
*/
@Override
public void deriveFields() {
*/
@Override
public void deriveFields() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationSuggestionEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationSuggestionEntity.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationSuggestionEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationSuggestionEntity.java
index
9f6a2c3
..
d7755e2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/AggregationSuggestionEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/AggregationSuggestionEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
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.json.JSONArray;
import org.json.JSONObject;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.util.NodeUtils;
public class AggregationSuggestionEntity extends IndexableEntity implements IndexDocument {
public class AggregationSuggestionEntity extends IndexableEntity implements IndexDocument {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/IndexDocument.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexDocument.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexDocument.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexDocument.java
index
f1de89d
..
6e23c62
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexDocument.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexDocument.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableCrossEntityReference.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableCrossEntityReference.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableCrossEntityReference.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableCrossEntityReference.java
index
76ef5c0
..
aa604fb
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableCrossEntityReference.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableCrossEntityReference.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import java.util.ArrayList;
import java.util.ArrayList;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.util.NodeUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
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)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.entity.IndexDocument#deriveFields()
+ * @see org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument#deriveFields()
*/
@Override
public void deriveFields() {
*/
@Override
public void deriveFields() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntity.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntity.java
index
4999b3e
..
342f8df
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/IndexableEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntity.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
/**
* The Class IndexableEntity.
/**
* The Class IndexableEntity.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/MergableEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/MergableEntity.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/MergableEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/MergableEntity.java
index
e40383a
..
1935ed9
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/MergableEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/MergableEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/ObjectIdCollection.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/ObjectIdCollection.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/ObjectIdCollection.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/ObjectIdCollection.java
index
ee79eb8
..
e423934
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/ObjectIdCollection.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/ObjectIdCollection.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import java.util.Collection;
import java.util.List;
import java.util.Collection;
import java.util.List;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/SearchableEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/SearchableEntity.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/SearchableEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/SearchableEntity.java
index
d80ced2
..
46ef7f6
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/SearchableEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/SearchableEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
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 java.util.ArrayList;
import java.util.List;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.util.NodeUtils;
/**
* The Class SearchableEntity.
/**
* The Class SearchableEntity.
@@
-69,7
+69,7
@@
public class SearchableEntity extends IndexableEntity implements IndexDocument {
}
/* (non-Javadoc)
}
/* (non-Javadoc)
- * @see org.o
penecomp
.sparky.synchronizer.entity.IndexDocument#deriveFields()
+ * @see org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument#deriveFields()
*/
@Override
public void deriveFields() {
*/
@Override
public void deriveFields() {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/SelfLinkDescriptor.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/SelfLinkDescriptor.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/SelfLinkDescriptor.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/SelfLinkDescriptor.java
index
a2a2ba3
..
453b47c
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/SelfLinkDescriptor.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/SelfLinkDescriptor.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
/**
* The Class SelfLinkDescriptor.
/**
* The Class SelfLinkDescriptor.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/SuggestionSearchEntity.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/SuggestionSearchEntity.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/SuggestionSearchEntity.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/SuggestionSearchEntity.java
index
0f06322
..
4f6188d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/SuggestionSearchEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/SuggestionSearchEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
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.json.JSONArray;
import org.json.JSONObject;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.util.NodeUtils;
public class SuggestionSearchEntity extends IndexableEntity implements IndexDocument {
public class SuggestionSearchEntity extends IndexableEntity implements IndexDocument {
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/entity/TransactionStorageType.java
b/src/main/java/org/onap/aai/sparky/synchronizer/entity/TransactionStorageType.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/synchronizer/entity/TransactionStorageType.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/entity/TransactionStorageType.java
index
b7557f3
..
2f0ffa8
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/entity/TransactionStorageType.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/entity/TransactionStorageType.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.entity;
+package org.o
nap.aai
.sparky.synchronizer.entity;
/**
* The Enum TransactionStorageType.
/**
* The Enum TransactionStorageType.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/enumeration/OperationState.java
b/src/main/java/org/onap/aai/sparky/synchronizer/enumeration/OperationState.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/enumeration/OperationState.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/OperationState.java
index
f32cc06
..
87d1b88
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/enumeration/OperationState.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/OperationState.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.enumeration;
+package org.o
nap.aai
.sparky.synchronizer.enumeration;
/**
* The Enum OperationState.
/**
* The Enum OperationState.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/enumeration/SynchronizerState.java
b/src/main/java/org/onap/aai/sparky/synchronizer/enumeration/SynchronizerState.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/synchronizer/enumeration/SynchronizerState.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/SynchronizerState.java
index
1791893
..
0ce5f70
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/enumeration/SynchronizerState.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/enumeration/SynchronizerState.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.enumeration;
+package org.o
nap.aai
.sparky.synchronizer.enumeration;
/**
* The Enum SynchronizerState.
/**
* The Enum SynchronizerState.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
b/src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
similarity index 90%
rename from
src/main/java/org/openecomp/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
index
1214097
..
d5c2c12
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.filter;
+package org.o
nap.aai
.sparky.synchronizer.filter;
import java.io.IOException;
import java.net.InetAddress;
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 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
/*
* This is a wire-frame for an experiment to get the jetty filter-lifecyle initialization method to
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
index
e2273cc
..
3dfef93
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.function.Supplier;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class CollectEntitySelfLinkTask.
/**
* The Class CollectEntitySelfLinkTask.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
index
98f4425
..
de3f971
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.function.Supplier;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class CollectEntityTypeSelfLinksTask.
/**
* The Class CollectEntityTypeSelfLinksTask.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
index
aaad6c9
..
d9e889d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java
@@
-20,13
+20,13
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.function.Supplier;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class GetCrossEntityReferenceEntityTask.
/**
* The Class GetCrossEntityReferenceEntityTask.
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
index
920427e
..
53c17e2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchPut.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchPut.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java
index
f318c9d
..
241a64d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchPut.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
index
17652b4
..
1605ee1
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchUpdate.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchUpdate.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java
index
52505a2
..
1890032
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/PerformElasticSearchUpdate.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java
@@
-20,14
+20,14
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.elasticsearch.ElasticSearchDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/PersistOperationResultToDisk.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/PersistOperationResultToDisk.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java
index
c63e6a3
..
dee1761
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/PersistOperationResultToDisk.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java
@@
-20,15
+20,15
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.io.File;
import java.util.Map;
import java.util.function.Supplier;
import java.io.File;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
import org.slf4j.MDC;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.MDC;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
similarity index 93%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
index
3701879
..
e92462a
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.io.File;
import java.io.IOException;
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 java.nio.file.Paths;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/synchronizer/task/StoreDocumentTask.java
b/src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/synchronizer/task/StoreDocumentTask.java
rename to
src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java
index
5b7ec00
..
a1c745e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/synchronizer/task/StoreDocumentTask.java
+++ b/
src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java
@@
-20,15
+20,15
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer.task;
+package org.o
nap.aai
.sparky.synchronizer.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.NetworkTransaction;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
-import org.o
penecomp
.sparky.synchronizer.entity.IndexDocument;
+import org.o
nap.aai
.sparky.dal.NetworkTransaction;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.synchronizer.entity.IndexDocument;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/util/ConfigHelper.java
b/src/main/java/org/onap/aai/sparky/util/ConfigHelper.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/util/ConfigHelper.java
rename to
src/main/java/org/onap/aai/sparky/util/ConfigHelper.java
index
9a09637
..
bad916b
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/ConfigHelper.java
+++ b/
src/main/java/org/onap/aai/sparky/util/ConfigHelper.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.io.BufferedReader;
import java.io.File;
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 java.util.Properties;
import java.util.Set;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
/**
* The Class ConfigHelper.
/**
* The Class ConfigHelper.
diff --git
a/src/main/java/org/openecomp/sparky/util/EncryptConvertor.java
b/src/main/java/org/onap/aai/sparky/util/EncryptConvertor.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/util/EncryptConvertor.java
rename to
src/main/java/org/onap/aai/sparky/util/EncryptConvertor.java
index
2b9dcc9
..
fd5cb26
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/EncryptConvertor.java
+++ b/
src/main/java/org/onap/aai/sparky/util/EncryptConvertor.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
/**
* The Class EncryptConvertor.
/**
* The Class EncryptConvertor.
diff --git
a/src/main/java/org/openecomp/sparky/util/Encryptor.java
b/src/main/java/org/onap/aai/sparky/util/Encryptor.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/util/Encryptor.java
rename to
src/main/java/org/onap/aai/sparky/util/Encryptor.java
index
f874d22
..
1587cca
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/Encryptor.java
+++ b/
src/main/java/org/onap/aai/sparky/util/Encryptor.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
diff --git
a/src/main/java/org/openecomp/sparky/util/ErrorUtil.java
b/src/main/java/org/onap/aai/sparky/util/ErrorUtil.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/util/ErrorUtil.java
rename to
src/main/java/org/onap/aai/sparky/util/ErrorUtil.java
index
c21005c
..
0bf6d38
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/ErrorUtil.java
+++ b/
src/main/java/org/onap/aai/sparky/util/ErrorUtil.java
@@
-21,7
+21,7
@@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
/**
* The Class ErrorUtil.
/**
* The Class ErrorUtil.
diff --git
a/src/main/java/org/openecomp/sparky/util/JsonXmlConverter.java
b/src/main/java/org/onap/aai/sparky/util/JsonXmlConverter.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/util/JsonXmlConverter.java
rename to
src/main/java/org/onap/aai/sparky/util/JsonXmlConverter.java
index
96e2027
..
ae8d39c
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/JsonXmlConverter.java
+++ b/
src/main/java/org/onap/aai/sparky/util/JsonXmlConverter.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONArray;
import org.json.JSONException;
diff --git
a/src/main/java/org/openecomp/sparky/util/KeystoreBuilder.java
b/src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/util/KeystoreBuilder.java
rename to
src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java
index
916b1e9
..
d7863c0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/KeystoreBuilder.java
+++ b/
src/main/java/org/onap/aai/sparky/util/KeystoreBuilder.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.io.File;
import java.io.FileInputStream;
import java.io.File;
import java.io.FileInputStream;
diff --git
a/src/main/java/org/openecomp/sparky/util/NodeUtils.java
b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/util/NodeUtils.java
rename to
src/main/java/org/onap/aai/sparky/util/NodeUtils.java
index
10fb90a
..
092afd1
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/NodeUtils.java
+++ b/
src/main/java/org/onap/aai/sparky/util/NodeUtils.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.io.BufferedReader;
import java.io.IOException;
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 javax.servlet.http.HttpServletRequest;
import javax.xml.stream.XMLStreamConstants;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstant
s;
+import org.o
nap.aai.cl.api.Logger
;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/src/main/java/org/openecomp/sparky/util/RawByteHelper.java
b/src/main/java/org/onap/aai/sparky/util/RawByteHelper.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/util/RawByteHelper.java
rename to
src/main/java/org/onap/aai/sparky/util/RawByteHelper.java
index
e294a9b
..
fcd54d1
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/RawByteHelper.java
+++ b/
src/main/java/org/onap/aai/sparky/util/RawByteHelper.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
/**
* The Class RawByteHelper.
/**
* The Class RawByteHelper.
diff --git
a/src/main/java/org/openecomp/sparky/util/ServletUtils.java
b/src/main/java/org/onap/aai/sparky/util/ServletUtils.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/util/ServletUtils.java
rename to
src/main/java/org/onap/aai/sparky/util/ServletUtils.java
index
6068ee8
..
ec8b555
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/ServletUtils.java
+++ b/
src/main/java/org/onap/aai/sparky/util/ServletUtils.java
@@
-20,18
+20,18
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.http.HttpServletResponse;
-import org.o
penecomp.cl.api.Logg
er;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.dal.elasticsearch.SearchAdapter
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.elasticsearch.SearchAdapt
er;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.cl.api.Logger
;
/**
* The Class ServletUtils.
/**
* The Class ServletUtils.
diff --git
a/src/main/java/org/openecomp/sparky/util/SuggestionsPermutation.java
b/src/main/java/org/onap/aai/sparky/util/SuggestionsPermutation.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/util/SuggestionsPermutation.java
rename to
src/main/java/org/onap/aai/sparky/util/SuggestionsPermutation.java
index
31106cf
..
205534f
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/SuggestionsPermutation.java
+++ b/
src/main/java/org/onap/aai/sparky/util/SuggestionsPermutation.java
@@
-20,7
+20,7
@@
*
\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
*/
\r
*
\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
*/
\r
-package org.o
penecomp
.sparky.util;
\r
+package org.o
nap.aai
.sparky.util;
\r
\r
import java.util.ArrayList;
\r
import java.util.List;
\r
\r
import java.util.ArrayList;
\r
import java.util.List;
\r
diff --git
a/src/main/java/org/openecomp/sparky/util/TreeWalker.java
b/src/main/java/org/onap/aai/sparky/util/TreeWalker.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/util/TreeWalker.java
rename to
src/main/java/org/onap/aai/sparky/util/TreeWalker.java
index
00bc27c
..
6306a30
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/util/TreeWalker.java
+++ b/
src/main/java/org/onap/aai/sparky/util/TreeWalker.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/EntityTypeAggregation.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java
similarity index 94%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/EntityTypeAggregation.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java
index
a5eca04
..
bf851a8
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/EntityTypeAggregation.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java
@@
-20,14
+20,15
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import com.fasterxml.jackson.core.JsonProcessingException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
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.
/**
* The Class EntityTypeAggregation.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/config/TierSupportUiConstants.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/config/TierSupportUiConstants.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java
index
c2232f0
..
4e1b102
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/config/TierSupportUiConstants.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.config;
+package org.o
nap.aai
.sparky.viewandinspect.config;
/**
* The Class TierSupportUiConstants.
/**
* The Class TierSupportUiConstants.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/config/VisualizationConfig.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/config/VisualizationConfig.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java
index
6bf1ed0
..
cb842c5
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/config/VisualizationConfig.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java
@@
-20,11
+20,11
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.config;
+package org.o
nap.aai
.sparky.viewandinspect.config;
import java.util.Properties;
import java.util.Properties;
-import org.o
penecomp
.sparky.util.ConfigHelper;
+import org.o
nap.aai
.sparky.util.ConfigHelper;
/**
* The Class VisualizationConfig.
/**
* The Class VisualizationConfig.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/ActiveInventoryNode.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/ActiveInventoryNode.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java
index
fc0f074
..
d1a289d
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/ActiveInventoryNode.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import java.io.IOException;
import java.util.ArrayList;
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 java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.o
penecomp.cl.api.Logg
er;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoader
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.viewandinspect.config.VisualizationConfig
;
-import org.o
penecomp.sparky.viewandinspect.enumeration.NodeProcessingAction
;
-import org.o
penecomp.sparky.viewandinspect.enumeration.NodeProcessingState
;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoad
er;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.viewandinspect.config.VisualizationConfig
;
+import org.o
nap.aai.sparky.viewandinspect.enumeration.NodeProcessingAction
;
+import org.o
nap.aai.sparky.viewandinspect.enumeration.NodeProcessingState
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/D3VisualizationOutput.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/D3VisualizationOutput.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java
index
b695899
..
3022524
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/D3VisualizationOutput.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/EntityEntry.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntry.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/EntityEntry.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntry.java
index
b50914e
..
d2e5854
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/EntityEntry.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntry.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* The Class EntityEntry.
/**
* The Class EntityEntry.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/GraphMeta.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/GraphMeta.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/GraphMeta.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/GraphMeta.java
index
e7d069f
..
4c6f1f4
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/GraphMeta.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/GraphMeta.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
-import org.o
penecomp
.sparky.viewandinspect.EntityTypeAggregation;
+import org.o
nap.aai
.sparky.viewandinspect.EntityTypeAggregation;
/**
* The Class GraphMeta.
/**
* The Class GraphMeta.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/InlineMessage.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/InlineMessage.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/InlineMessage.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/InlineMessage.java
index
172e379
..
7db12d3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/InlineMessage.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/InlineMessage.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* The Class InlineMessage.
/**
* The Class InlineMessage.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNode.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java
similarity index 99%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNode.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java
index
735899a
..
c6f70a7
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNode.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNodeLink.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNodeLink.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNodeLink.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNodeLink.java
index
e85c4d7
..
6e1a078
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/JsonNodeLink.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNodeLink.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/*
* Expected JSON Output:
/*
* Expected JSON Output:
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeDebug.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeDebug.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeDebug.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeDebug.java
index
46516cf
..
4586a8e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeDebug.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeDebug.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* The Class NodeDebug.
/**
* The Class NodeDebug.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeMeta.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeMeta.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeMeta.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeMeta.java
index
29e5a05
..
c55f838
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeMeta.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeMeta.java
@@
-20,10
+20,10
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
-import org.o
penecomp
.sparky.viewandinspect.config.VisualizationConfig;
-import org.o
penecomp
.sparky.viewandinspect.enumeration.NodeProcessingState;
+import org.o
nap.aai
.sparky.viewandinspect.config.VisualizationConfig;
+import org.o
nap.aai
.sparky.viewandinspect.enumeration.NodeProcessingState;
/**
* The Class NodeMeta.
/**
* The Class NodeMeta.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeProcessingTransaction.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeProcessingTransaction.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeProcessingTransaction.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeProcessingTransaction.java
index
a2ebb35
..
971a68e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/NodeProcessingTransaction.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/NodeProcessingTransaction.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class NodeProcessingTransaction.
/**
* The Class NodeProcessingTransaction.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryParams.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryParams.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryParams.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryParams.java
index
1c19d9d
..
1a1f24c
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryParams.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryParams.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* The Class QueryParams.
/**
* The Class QueryParams.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryRequest.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryRequest.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryRequest.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryRequest.java
index
98bb5d1
..
766b470
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/QueryRequest.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QueryRequest.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* The Class QueryRequest.
/**
* The Class QueryRequest.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/QuerySearchEntity.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/QuerySearchEntity.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/QuerySearchEntity.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QuerySearchEntity.java
index
fcfccea
..
222a2f7
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/QuerySearchEntity.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/QuerySearchEntity.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/RelatedToProperty.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelatedToProperty.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelatedToProperty.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelatedToProperty.java
index
9b7adbb
..
7ce9de0
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelatedToProperty.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelatedToProperty.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/Relationship.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Relationship.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/Relationship.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Relationship.java
index
da2c5c7
..
2ed8e51
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/Relationship.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Relationship.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipData.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipData.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipData.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipData.java
index
cff3f6f
..
d2400a9
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipData.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipData.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipDirectionality.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipDirectionality.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipDirectionality.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipDirectionality.java
index
eae61d4
..
6ceede3
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipDirectionality.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipDirectionality.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
/**
* This enumeration is intended to be used to help us discriminate neighbor relationships for the
/**
* This enumeration is intended to be used to help us discriminate neighbor relationships for the
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipList.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipList.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java
index
ab6ee0c
..
013a5bd
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/RelationshipList.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/SearchResponse.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/SearchResponse.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/SearchResponse.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SearchResponse.java
index
236ca15
..
44c828e
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/SearchResponse.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SearchResponse.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
-import org.o
penecomp
.sparky.suggestivesearch.SuggestionEntity;
+import org.o
nap.aai
.sparky.suggestivesearch.SuggestionEntity;
/**
* The Class SearchResponse.
/**
* The Class SearchResponse.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
index
30b9f03
..
21af9cf
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/SelfLinkDeterminationTransaction.java
@@
-20,9
+20,9
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
public class SelfLinkDeterminationTransaction {
public class SelfLinkDeterminationTransaction {
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/entity/Violations.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java
similarity index 98%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/entity/Violations.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java
index
52ab332
..
909afb8
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/entity/Violations.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import com.att.aft.dme2.internal.jackson.annotate.JsonProperty;
import com.att.aft.dme2.internal.jackson.annotate.JsonProperty;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingAction.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingAction.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingAction.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingAction.java
index
9598007
..
c85b8d4
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingAction.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingAction.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.enumeration;
+package org.o
nap.aai
.sparky.viewandinspect.enumeration;
/**
* The Enum NodeProcessingAction.
/**
* The Enum NodeProcessingAction.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingState.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingState.java
similarity index 95%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingState.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingState.java
index
730796e
..
21c27f6
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/enumeration/NodeProcessingState.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/enumeration/NodeProcessingState.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.enumeration;
+package org.o
nap.aai
.sparky.viewandinspect.enumeration;
/**
* The Enum NodeProcessingState.
/**
* The Enum NodeProcessingState.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/services/SearchServiceWrapper.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java
similarity index 96%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/services/SearchServiceWrapper.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java
index
a7ea18c
..
deca9a5
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/services/SearchServiceWrapper.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.services;
+package org.o
nap.aai
.sparky.viewandinspect.services;
import java.io.BufferedReader;
import java.io.IOException;
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.json.JSONException;
import org.json.JSONObject;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescriptor
;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoad
er;
-import org.o
penecomp.sparky.dal.elasticsearch.HashQueryResponse
;
-import org.o
penecomp.sparky.dal.elasticsearch.SearchAdapter
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.dal.sas.config.SearchServiceConfig
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.search.VnfSearchService
;
-import org.o
penecomp.sparky.search.config.SuggestionConfig
;
-import org.o
penecomp.sparky.suggestivesearch.Suggestion
Entity;
-import org.o
penecomp.sparky.util.NodeUtils
;
-import org.o
penecomp.sparky.viewandinspect.entity.QuerySearchEntity
;
-import org.o
penecomp.sparky.viewandinspect.entity.SearchResponse
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoader
;
+import org.o
nap.aai.sparky.dal.elasticsearch.HashQueryResponse
;
+import org.o
nap.aai.sparky.dal.elasticsearch.SearchAdapt
er;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.sas.config.SearchServiceConfig
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.search.VnfSearchService
;
+import org.o
nap.aai.sparky.search.config.SuggestionConfig
;
+import org.o
nap.aai.sparky.suggestivesearch.SuggestionEntity
;
+import org.o
nap.aai.sparky.util.NodeUtils
;
+import org.o
nap.aai.sparky.viewandinspect.entity.QuerySearch
Entity;
+import org.o
nap.aai.sparky.viewandinspect.entity.SearchResponse
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationContext.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationContext.java
similarity index 97%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationContext.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationContext.java
index
3bcd06e
..
a803283
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationContext.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationContext.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.services;
+package org.o
nap.aai
.sparky.viewandinspect.services;
import static java.util.concurrent.CompletableFuture.supplyAsync;
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 java.util.concurrent.atomic.AtomicInteger;
import org.apache.http.client.utils.URIBuilder;
-import org.o
penecomp.cl.api.Logge
r;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmEntityDescripto
r;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoader
;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryDataProvider
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.synchronizer.entity.SearchableEntity
;
-import org.o
penecomp.sparky.util.NodeUtils
;
-import org.o
penecomp.sparky.viewandinspect.config.TierSupportUiConstants
;
-import org.o
penecomp.sparky.viewandinspect.config.VisualizationConfig
;
-import org.o
penecomp.sparky.viewandinspect.entity.ActiveInventoryNode
;
-import org.o
penecomp.sparky.viewandinspect.entity.InlineMessage
;
-import org.o
penecomp.sparky.viewandinspect.entity.NodeProcessingTransaction
;
-import org.o
penecomp.sparky.viewandinspect.entity.QueryParams
;
-import org.o
penecomp.sparky.viewandinspect.entity.Relationship
;
-import org.o
penecomp.sparky.viewandinspect.entity.RelationshipData
;
-import org.o
penecomp.sparky.viewandinspect.entity.RelationshipList
;
-import org.o
penecomp.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction
;
-import org.o
penecomp.sparky.viewandinspect.enumeration.NodeProcessingAction
;
-import org.o
penecomp.sparky.viewandinspect.enumeration.NodeProcessingState
;
-import org.o
penecomp.sparky.viewandinspect.task.PerformNodeSelfLinkProcessingTask
;
-import org.o
penecomp.sparky.viewandinspect.task.PerformSelfLinkDeterminationTask
;
+import org.o
nap.aai.sparky.config.oxm.OxmEntityDescripto
r;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoader
;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryDataProvide
r;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.SearchableEntity
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.sparky.viewandinspect.config.TierSupportUiConstants
;
+import org.o
nap.aai.sparky.viewandinspect.config.VisualizationConfig
;
+import org.o
nap.aai.sparky.viewandinspect.entity.ActiveInventoryNode
;
+import org.o
nap.aai.sparky.viewandinspect.entity.InlineMessage
;
+import org.o
nap.aai.sparky.viewandinspect.entity.NodeProcessingTransaction
;
+import org.o
nap.aai.sparky.viewandinspect.entity.QueryParams
;
+import org.o
nap.aai.sparky.viewandinspect.entity.Relationship
;
+import org.o
nap.aai.sparky.viewandinspect.entity.RelationshipData
;
+import org.o
nap.aai.sparky.viewandinspect.entity.RelationshipList
;
+import org.o
nap.aai.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction
;
+import org.o
nap.aai.sparky.viewandinspect.enumeration.NodeProcessingAction
;
+import org.o
nap.aai.sparky.viewandinspect.enumeration.NodeProcessingState
;
+import org.o
nap.aai.sparky.viewandinspect.task.PerformNodeSelfLinkProcessingTask
;
+import org.o
nap.aai.sparky.viewandinspect.task.PerformSelfLinkDeterminationTask
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationService.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationService.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationService.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationService.java
index
e3f57aa
..
924d026
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationService.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationService.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.services;
+package org.o
nap.aai
.sparky.viewandinspect.services;
import java.io.IOException;
import java.security.SecureRandom;
import java.io.IOException;
import java.security.SecureRandom;
@@
-30,30
+30,30
@@
import java.util.concurrent.ExecutorService;
import javax.servlet.ServletException;
import javax.servlet.ServletException;
-import org.o
penecomp.cl.api.Logg
er;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.config.oxm.OxmModelLoa
der;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryAdapter
;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryDataProvider
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryRestConfig
;
-import org.o
penecomp.sparky.dal.cache.EntityCache
;
-import org.o
penecomp.sparky.dal.cache.PersistentEntityCache
;
-import org.o
penecomp.sparky.dal.elasticsearch.ElasticSearchAdapter
;
-import org.o
penecomp.sparky.dal.elasticsearch.ElasticSearchDataProvider
;
-import org.o
penecomp.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.dal.rest.RestClientBuilder
;
-import org.o
penecomp.sparky.dal.rest.RestfulDataAccessor
;
-import org.o
penecomp.sparky.logging.AaiUiMsg
s;
-import org.o
penecomp.sparky.synchronizer.entity.SearchableEntity
;
-import org.o
penecomp.sparky.util.NodeUtils
;
-import org.o
penecomp.sparky.viewandinspect.config.VisualizationConfig
;
-import org.o
penecomp.sparky.viewandinspect.entity.ActiveInventoryNode
;
-import org.o
penecomp.sparky.viewandinspect.entity.D3VisualizationOutput
;
-import org.o
penecomp.sparky.viewandinspect.entity.GraphMeta
;
-import org.o
penecomp.sparky.viewandinspect.entity.QueryParams
;
-import org.o
penecomp.sparky.viewandinspect.entity.QueryRequest
;
+import org.o
nap.aai.sparky.config.oxm.OxmModelLoad
er;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryAdapter
;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryDataProvi
der;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig
;
+import org.o
nap.aai.sparky.dal.cache.EntityCache
;
+import org.o
nap.aai.sparky.dal.cache.PersistentEntityCache
;
+import org.o
nap.aai.sparky.dal.elasticsearch.ElasticSearchAdapter
;
+import org.o
nap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider
;
+import org.o
nap.aai.sparky.dal.elasticsearch.config.ElasticSearchConfig
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.dal.rest.RestClientBuilder
;
+import org.o
nap.aai.sparky.dal.rest.RestfulDataAccessor
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.synchronizer.entity.SearchableEntity
;
+import org.o
nap.aai.sparky.util.NodeUtil
s;
+import org.o
nap.aai.sparky.viewandinspect.config.VisualizationConfig
;
+import org.o
nap.aai.sparky.viewandinspect.entity.ActiveInventoryNode
;
+import org.o
nap.aai.sparky.viewandinspect.entity.D3VisualizationOutput
;
+import org.o
nap.aai.sparky.viewandinspect.entity.GraphMeta
;
+import org.o
nap.aai.sparky.viewandinspect.entity.QueryParams
;
+import org.o
nap.aai.sparky.viewandinspect.entity.QueryRequest
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationTransformer.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java
similarity index 92%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationTransformer.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java
index
bbca21d
..
206d8d2
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/services/VisualizationTransformer.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.services;
+package org.o
nap.aai
.sparky.viewandinspect.services;
import java.io.IOException;
import java.util.ArrayList;
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 java.util.Set;
import java.util.UUID;
-import org.o
penecomp.cl.api.Logger
;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.util.ConfigHelper
;
-import org.o
penecomp.sparky.viewandinspect.config.VisualizationConfig
;
-import org.o
penecomp.sparky.viewandinspect.entity.ActiveInventoryNode
;
-import org.o
penecomp.sparky.viewandinspect.entity.D3VisualizationOutput
;
-import org.o
penecomp.sparky.viewandinspect.entity.GraphMeta
;
-import org.o
penecomp.sparky.viewandinspect.entity.JsonNode
;
-import org.o
penecomp.sparky.viewandinspect.entity.JsonNodeLink
;
-import org.o
penecomp.sparky.viewandinspect.entity.NodeDebug
;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.util.ConfigHelper
;
+import org.o
nap.aai.sparky.viewandinspect.config.VisualizationConfig
;
+import org.o
nap.aai.sparky.viewandinspect.entity.ActiveInventoryNode
;
+import org.o
nap.aai.sparky.viewandinspect.entity.D3VisualizationOutput
;
+import org.o
nap.aai.sparky.viewandinspect.entity.GraphMeta
;
+import org.o
nap.aai.sparky.viewandinspect.entity.JsonNode
;
+import org.o
nap.aai.sparky.viewandinspect.entity.JsonNodeLink
;
+import org.o
nap.aai.sparky.viewandinspect.entity.NodeDebug
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/servlet/SearchServlet.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java
similarity index 88%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/servlet/SearchServlet.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java
index
51e5b51
..
d7e8720
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/servlet/SearchServlet.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.servlet;
+package org.o
nap.aai
.sparky.viewandinspect.servlet;
import java.io.IOException;
import java.io.PrintWriter;
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.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.
/**
* The Class SearchServlet.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/servlet/VisualizationServlet.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/VisualizationServlet.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/servlet/VisualizationServlet.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/VisualizationServlet.java
index
583a308
..
f51eeac
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/servlet/VisualizationServlet.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/servlet/VisualizationServlet.java
@@
-20,7
+20,7
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.servlet;
+package org.o
nap.aai
.sparky.viewandinspect.servlet;
import java.io.IOException;
import java.io.PrintWriter;
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 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
/**
* A dedicated servlet for handling Front-End Visualization Requests and performing feats of magic
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
similarity index 91%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
index
460a7f7
..
1317948
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java
@@
-20,12
+20,12
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.task;
+package org.o
nap.aai
.sparky.viewandinspect.task;
import java.util.function.Supplier;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
/**
* The Class CollectNodeSelfLinkTask.
/**
* The Class CollectNodeSelfLinkTask.
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
similarity index 89%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
index
aa50443
..
54d4d6a
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformNodeSelfLinkProcessingTask.java
@@
-20,18
+20,18
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.task;
+package org.o
nap.aai
.sparky.viewandinspect.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp.cl.api.Logg
er;
-import org.o
penecomp.cl.eelf.LoggerFactory
;
-import org.o
penecomp.sparky.dal.aai.ActiveInventoryDataProvider
;
-import org.o
penecomp.sparky.dal.aai.config.ActiveInventoryConfig
;
-import org.o
penecomp.sparky.dal.rest.OperationResult
;
-import org.o
penecomp.sparky.logging.AaiUiMsgs
;
-import org.o
penecomp.sparky.viewandinspect.entity.NodeProcessingTransaction
;
+import org.o
nap.aai.sparky.dal.aai.ActiveInventoryDataProvid
er;
+import org.o
nap.aai.sparky.dal.aai.config.ActiveInventoryConfig
;
+import org.o
nap.aai.sparky.dal.rest.OperationResult
;
+import org.o
nap.aai.sparky.logging.AaiUiMsgs
;
+import org.o
nap.aai.sparky.viewandinspect.entity.NodeProcessingTransaction
;
+import org.o
nap.aai.cl.api.Logger
;
+import org.o
nap.aai.cl.eelf.LoggerFactory
;
import org.slf4j.MDC;
/**
import org.slf4j.MDC;
/**
diff --git
a/src/main/java/org/openecomp/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
b/src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
similarity index 87%
rename from
src/main/java/org/openecomp/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
rename to
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
index
5c9caa0
..
3433bbd
100644
(file)
--- a/
src/main/java/org/openecomp/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
+++ b/
src/main/java/org/onap/aai/sparky/viewandinspect/task/PerformSelfLinkDeterminationTask.java
@@
-20,18
+20,18
@@
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.task;
+package org.o
nap.aai
.sparky.viewandinspect.task;
import java.util.Map;
import java.util.function.Supplier;
import java.util.Map;
import java.util.function.Supplier;
-import org.o
penecomp
.sparky.dal.aai.ActiveInventoryDataProvider;
-import org.o
penecomp
.sparky.dal.aai.config.ActiveInventoryConfig;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.logging.AaiUiMsgs;
-import org.o
penecomp
.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
-import org.o
penecomp
.cl.api.Logger;
-import org.o
penecomp
.cl.eelf.LoggerFactory;
+import org.o
nap.aai
.sparky.dal.aai.ActiveInventoryDataProvider;
+import org.o
nap.aai
.sparky.dal.aai.config.ActiveInventoryConfig;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.logging.AaiUiMsgs;
+import org.o
nap.aai
.sparky.viewandinspect.entity.SelfLinkDeterminationTransaction;
+import org.o
nap.aai
.cl.api.Logger;
+import org.o
nap.aai
.cl.eelf.LoggerFactory;
import org.slf4j.MDC;
public class PerformSelfLinkDeterminationTask implements Supplier<SelfLinkDeterminationTransaction> {
import org.slf4j.MDC;
public class PerformSelfLinkDeterminationTask implements Supplier<SelfLinkDeterminationTransaction> {
diff --git
a/src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java
b/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java
rename to
src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
index
d8a558c
..
a317c29
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/analytics/AveragingRingBufferTest.java
+++ b/
src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
import static org.junit.Assert.assertEquals;
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.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.aai.sparky.analytics.AveragingRingBuffer;
import org.powermock.modules.junit4.PowerMockRunner;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**
diff --git
a/src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java
b/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java
rename to
src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
index
70e9e3c
..
7304096
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/analytics/HistogramSamplerTest.java
+++ b/
src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java
@@
-23,13
+23,14
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
import java.security.SecureRandom;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**
diff --git
a/src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java
b/src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java
rename to
src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
index
c5f14e6
..
9d92d11
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/analytics/TransactionRateControllerTest.java
+++ b/
src/test/java/org/onap/aai/sparky/analytics/TransactionRateControllerTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.analytics;
+package org.o
nap.aai
.sparky.analytics;
import org.junit.Before;
import org.junit.Before;
diff --git
a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java
index
be51f74
..
f00c2fa
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java
@@
-1,4
+1,4
@@
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertEquals;
@@
-10,8
+10,11
@@
import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
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 {
public class ActiveInventoryConfigTest {
diff --git
a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
index
e1421c4
..
6f2b917
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfigTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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.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 {
public class ActiveInventoryRestConfigTest {
diff --git
a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
index
834bbd1
..
e02a6a7
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.aai.config;
+package org.o
nap.aai
.sparky.dal.aai.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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.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;
//import com.att.aai.util.EncryptedConfiguration;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
index
c9d071f
..
6a70c67
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch;
+package org.o
nap.aai
.sparky.dal.elasticsearch;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
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.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;
import ch.qos.logback.classic.Level;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
index
b3abd14
..
dd04248
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
index
db0dc8c
..
eafef21
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestDocumentEntityFields.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
index
60ac538
..
8fd0c86
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
index
af74485
..
18dfdc4
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticHitsEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
index
9b6c9f5
..
40c9b6d
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/AutoSuggestElasticSearchResponse.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java
index
0a1a133
..
5a578aa
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/BucketEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/BucketEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java
index
32dc17a
..
74c00b9
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHit.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHit.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
public class ElasticHit {
public class ElasticHit {
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
index
b10532e
..
4158903
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticHitsEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
index
54c9278
..
6dd2d11
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggegrationResponse.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
index
ea954d9
..
7bcd318
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchAggregation.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
index
4b11f8c
..
5aec440
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/ElasticSearchCountResponse.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java
b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java
index
360abdf
..
5f5e333
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/elasticsearch/entity/PayloadEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/elasticsearch/entity/PayloadEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.elasticsearch.entity;
+package org.o
nap.aai
.sparky.dal.elasticsearch.entity;
public class PayloadEntity {
public class PayloadEntity {
diff --git
a/src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java
b/src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java
index
80ee21f
..
4dbcdea
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/rest/RestClientBuilderTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/rest/RestClientBuilderTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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.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;
import org.powermock.modules.junit4.PowerMockRunner;
import ch.qos.logback.classic.Level;
diff --git
a/src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java
b/src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java
rename to
src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java
index
b898d90
..
0c9967d
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/rest/RestfulDataAccessorTest.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/rest/RestfulDataAccessorTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.rest;
+package org.o
nap.aai
.sparky.dal.rest;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyObject;
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.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;
import org.powermock.modules.junit4.PowerMockRunner;
import com.sun.jersey.api.client.Client;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java
index
6285e9c
..
4d85bd6
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/DocumentEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/DocumentEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java
index
3940b28
..
d6e9971
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/EntityCountResponse.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/EntityCountResponse.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java
similarity index 94%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java
index
3ab5e30
..
0f1609b
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationEntity.java
@@
-22,12
+22,12
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.BucketEntity;
public class GroupByAggregationEntity {
private int totalChartHits;
public class GroupByAggregationEntity {
private int totalChartHits;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
index
4ef3be1
..
0af4600
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/GroupByAggregationResponseEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java
index
f5036e7
..
755e903
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/HitEntity.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/HitEntity.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
public class HitEntity {
public class HitEntity {
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
index
e665bc2
..
e815e0b
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java
index
0e6398f
..
d3d4a4c
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionResponse.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchAbstractionResponse.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
public class SearchAbstractionResponse {
public class SearchAbstractionResponse {
diff --git
a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java
b/src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java
rename to
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java
index
992d5b5
..
e484fa6
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/dal/sas/entity/SearchResult.java
+++ b/
src/test/java/org/onap/aai/sparky/dal/sas/entity/SearchResult.java
@@
-22,7
+22,7
@@
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
* ECOMP and OpenECOMP are trademarks
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.dal.sas.entity;
+package org.o
nap.aai
.sparky.dal.sas.entity;
import java.util.List;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java
b/src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java
rename to
src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
index
9274c30
..
2a8a945
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/inventory/GeoIndexDocumentTest.java
+++ b/
src/test/java/org/onap/aai/sparky/inventory/GeoIndexDocumentTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.inventory;
+package org.o
nap.aai
.sparky.inventory;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
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.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.o
penecomp
.sparky.inventory.entity.GeoIndexDocument;
+import org.o
nap.aai
.sparky.inventory.entity.GeoIndexDocument;
import org.powermock.modules.junit4.PowerMockRunner;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**
diff --git
a/src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java
b/src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java
rename to
src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
index
c387e49
..
cd4e69e
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/security/SecurityContextFactoryImplTest.java
+++ b/
src/test/java/org/onap/aai/sparky/security/SecurityContextFactoryImplTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security;
+package org.o
nap.aai
.sparky.security;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
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.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;
import ch.qos.logback.classic.Level;
diff --git
a/src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java
b/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java
rename to
src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java
index
a39c19d
..
815199f
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/security/portal/TestPortalRestAPIServiceImpl.java
+++ b/
src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal;
+package org.o
nap.aai
.sparky.security.portal;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
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.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.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;
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);
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);
portalApi.pushUser(user);
@@
-239,7
+241,7
@@
public class TestPortalRestAPIServiceImpl {
EcompUser user = new EcompUser();
user.setLoginId(LOGINID_1);
user.setFirstName("Bob");
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);
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");
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);
user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
portalApi.pushUser(user);
diff --git
a/src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java
b/src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java
similarity index 97%
rename from
src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java
rename to
src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java
index
1a8a9e9
..
16669fd
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/security/portal/TestUserManager.java
+++ b/
src/test/java/org/onap/aai/sparky/security/portal/TestUserManager.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.security.portal;
+package org.o
nap.aai
.sparky.security.portal;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
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.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.portalsdk.core.restful.domain.EcompUser;
-import org.openecomp.sparky.util.NodeUtils;
import org.powermock.modules.junit4.PowerMockRunner;
import com.google.gson.Gson;
import org.powermock.modules.junit4.PowerMockRunner;
import com.google.gson.Gson;
diff --git
a/src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java
b/src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java
rename to
src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
index
e52995d
..
3a1406f
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/synchronizer/AsyncRateControlTester.java
+++ b/
src/test/java/org/onap/aai/sparky/synchronizer/AsyncRateControlTester.java
@@
-23,11
+23,11
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java
b/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
similarity index 96%
rename from
src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java
rename to
src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
index
0f03f81
..
eeebac8
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/synchronizer/IndexDocumentTest.java
+++ b/
src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.synchronizer;
+package org.o
nap.aai
.sparky.synchronizer;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
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.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.util.LogValidator;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.util.LogValidator;
import org.powermock.modules.junit4.PowerMockRunner;
import ch.qos.logback.classic.Level;
import org.powermock.modules.junit4.PowerMockRunner;
import ch.qos.logback.classic.Level;
diff --git
a/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
b/src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
similarity index 93%
rename from
src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
rename to
src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
index
e09e08a
..
523f893
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
+++ b/
src/test/java/org/onap/aai/sparky/synchronizer/SyncControllerBuilder.java
@@
-23,20
+23,29
@@
* and service marks of AT&T Intellectual Property.
*/
* 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;
import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Level;
diff --git
a/src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java
b/src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java
rename to
src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
index
ec23544
..
31b425a
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/CaptureLoggerAppender.java
+++ b/
src/test/java/org/onap/aai/sparky/util/CaptureLoggerAppender.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.util.ArrayList;
import java.util.Deque;
import java.util.ArrayList;
import java.util.Deque;
diff --git
a/src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java
b/src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
similarity index 92%
rename from
src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java
rename to
src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
index
9709bb8
..
171c163
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/ElasticEntitySummarizer.java
+++ b/
src/test/java/org/onap/aai/sparky/util/ElasticEntitySummarizer.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.util.Collection;
import java.util.Comparator;
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 java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.o
penecomp
.sparky.dal.exception.ElasticSearchOperationException;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.o
nap.aai
.sparky.dal.exception.ElasticSearchOperationException;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
/**
* The Class ElasticEntitySummarizer.
/**
* The Class ElasticEntitySummarizer.
diff --git
a/src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java
b/src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java
rename to
src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
index
dc47713
..
5e47942
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/ElasticGarbageInjector.java
+++ b/
src/test/java/org/onap/aai/sparky/util/ElasticGarbageInjector.java
@@
-23,13
+23,13
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
-import org.o
penecomp
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
-import org.o
penecomp
.sparky.dal.rest.RestDataProvider;
-import org.o
penecomp
.sparky.synchronizer.config.TaskProcessorConfig;
+import org.o
nap.aai
.sparky.dal.elasticsearch.config.ElasticSearchConfig;
+import org.o
nap.aai
.sparky.dal.rest.RestDataProvider;
+import org.o
nap.aai
.sparky.synchronizer.config.TaskProcessorConfig;
/**
* The Class ElasticGarbageInjector.
/**
* The Class ElasticGarbageInjector.
diff --git
a/src/test/java/org/openecomp/sparky/util/ExceptionHelper.java
b/src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/util/ExceptionHelper.java
rename to
src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
index
6f647c7
..
6acb1bf
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/ExceptionHelper.java
+++ b/
src/test/java/org/onap/aai/sparky/util/ExceptionHelper.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
/**
* The Class ExceptionHelper.
/**
* The Class ExceptionHelper.
diff --git
a/src/test/java/org/openecomp/sparky/util/HttpServletHelper.java
b/src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/util/HttpServletHelper.java
rename to
src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
index
cf3933a
..
de90f85
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/HttpServletHelper.java
+++ b/
src/test/java/org/onap/aai/sparky/util/HttpServletHelper.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import static org.junit.Assert.fail;
import static org.junit.Assert.fail;
diff --git
a/src/test/java/org/openecomp/sparky/util/LogValidator.java
b/src/test/java/org/onap/aai/sparky/util/LogValidator.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/util/LogValidator.java
rename to
src/test/java/org/onap/aai/sparky/util/LogValidator.java
index
0771ff1
..
a16a586
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/LogValidator.java
+++ b/
src/test/java/org/onap/aai/sparky/util/LogValidator.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import java.util.List;
import java.util.List;
diff --git
a/src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java
b/src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
similarity index 94%
rename from
src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java
rename to
src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
index
6e2406c
..
ecad636
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/ModelLoaderTester.java
+++ b/
src/test/java/org/onap/aai/sparky/util/ModelLoaderTester.java
@@
-23,9
+23,9
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
/**
* The Class ModelLoaderTester.
/**
* The Class ModelLoaderTester.
diff --git
a/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
b/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
rename to
src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
index
c3c7f7f
..
0388b1c
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
+++ b/
src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
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.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;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git
a/src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java
b/src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java
rename to
src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
index
a830175
..
5c82316
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/OxmModelLoaderTest.java
+++ b/
src/test/java/org/onap/aai/sparky/util/OxmModelLoaderTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
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.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
/**
* The Class OxmModelLoaderTest.
/**
* The Class OxmModelLoaderTest.
diff --git
a/src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java
b/src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
similarity index 93%
rename from
src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java
rename to
src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
index
dd5d7ca
..
2d277bd
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/SuggestionsPermutationsTest.java
+++ b/
src/test/java/org/onap/aai/sparky/util/SuggestionsPermutationsTest.java
@@
-1,4
+1,4
@@
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
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 java.util.List;
import org.junit.Test;
+import org.onap.aai.sparky.util.SuggestionsPermutation;
public class SuggestionsPermutationsTest {
public class SuggestionsPermutationsTest {
diff --git
a/src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java
b/src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
similarity index 99%
rename from
src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java
rename to
src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
index
27eb0c0
..
36b11ed
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/util/TreeWalkerTest.java
+++ b/
src/test/java/org/onap/aai/sparky/util/TreeWalkerTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.util;
+package org.o
nap.aai
.sparky.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
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.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;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
index
d976dee
..
911de51
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/ActiveInventoryNodeTester.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
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 java.io.IOException;
import java.util.Iterator;
-import org.o
penecomp
.sparky.viewandinspect.config.VisualizationConfig;
-import org.o
penecomp
.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.o
nap.aai
.sparky.viewandinspect.config.VisualizationConfig;
+import org.o
nap.aai
.sparky.viewandinspect.entity.ActiveInventoryNode;
/**
* The Class ActiveInventoryNodeTester.
/**
* The Class ActiveInventoryNodeTester.
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
similarity index 93%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
index
f9605e8
..
bbee87c
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/SearchAdapterTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/SearchAdapterTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyObject;
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.junit.Before;
import org.junit.Test;
-import org.o
penecomp
.sparky.dal.elasticsearch.SearchAdapter;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.rest.RestClientBuilder;
+import org.o
nap.aai
.sparky.dal.elasticsearch.SearchAdapter;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.rest.RestClientBuilder;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
similarity index 93%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
index
41db58c
..
cae9290
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/SearchResponseTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import java.util.ArrayList;
import java.util.List;
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.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.o
penecomp
.sparky.viewandinspect.entity.EntityEntry;
-import org.o
penecomp
.sparky.viewandinspect.entity.SearchResponse;
+import org.o
nap.aai
.sparky.viewandinspect.entity.EntityEntry;
+import org.o
nap.aai
.sparky.viewandinspect.entity.SearchResponse;
import org.powermock.modules.junit4.PowerMockRunner;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
similarity index 92%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
index
9e14735
..
198bbb3
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/SearchServletTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/SearchServletTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
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.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import org.o
penecomp
.sparky.config.oxm.OxmEntityDescriptor;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.dal.elasticsearch.SearchAdapter;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.BucketEntity;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
-import org.o
penecomp
.sparky.dal.elasticsearch.entity.PayloadEntity;
-import org.o
penecomp
.sparky.dal.rest.OperationResult;
-import org.o
penecomp
.sparky.dal.sas.config.SearchServiceConfig;
-import org.o
penecomp
.sparky.dal.sas.entity.EntityCountResponse;
-import org.o
penecomp
.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
-import org.o
penecomp
.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
-import org.o
penecomp
.sparky.search.VnfSearchService;
-import org.o
penecomp
.sparky.search.config.SuggestionConfig;
-import org.o
penecomp
.sparky.suggestivesearch.SuggestionEntity;
-import org.o
penecomp
.sparky.util.ExceptionHelper;
-import org.o
penecomp
.sparky.util.HttpServletHelper;
-import org.o
penecomp
.sparky.util.NodeUtils;
-import org.o
penecomp
.sparky.viewandinspect.entity.QuerySearchEntity;
-import org.o
penecomp
.sparky.viewandinspect.entity.SearchResponse;
-import org.o
penecomp
.sparky.viewandinspect.services.SearchServiceWrapper;
-import org.o
penecomp
.sparky.viewandinspect.servlet.SearchServlet;
+import org.o
nap.aai
.sparky.config.oxm.OxmEntityDescriptor;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.dal.elasticsearch.SearchAdapter;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.AutoSuggestDocumentEntityFields;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.AutoSuggestElasticHitsEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.AutoSuggestElasticSearchResponse;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.BucketEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.ElasticHitsEntity;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.ElasticSearchAggegrationResponse;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.ElasticSearchAggregation;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.ElasticSearchCountResponse;
+import org.o
nap.aai
.sparky.dal.elasticsearch.entity.PayloadEntity;
+import org.o
nap.aai
.sparky.dal.rest.OperationResult;
+import org.o
nap.aai
.sparky.dal.sas.config.SearchServiceConfig;
+import org.o
nap.aai
.sparky.dal.sas.entity.EntityCountResponse;
+import org.o
nap.aai
.sparky.dal.sas.entity.GroupByAggregationResponseEntity;
+import org.o
nap.aai
.sparky.dal.sas.entity.SearchAbstractionEntityBuilder;
+import org.o
nap.aai
.sparky.search.VnfSearchService;
+import org.o
nap.aai
.sparky.search.config.SuggestionConfig;
+import org.o
nap.aai
.sparky.suggestivesearch.SuggestionEntity;
+import org.o
nap.aai
.sparky.util.ExceptionHelper;
+import org.o
nap.aai
.sparky.util.HttpServletHelper;
+import org.o
nap.aai
.sparky.util.NodeUtils;
+import org.o
nap.aai
.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.o
nap.aai
.sparky.viewandinspect.entity.SearchResponse;
+import org.o
nap.aai
.sparky.viewandinspect.services.SearchServiceWrapper;
+import org.o
nap.aai
.sparky.viewandinspect.servlet.SearchServlet;
import org.slf4j.MDC;
import org.slf4j.MDC;
-import org.o
penecomp
.cl.mdc.MdcContext;
+import org.o
nap.aai
.cl.mdc.MdcContext;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
similarity index 98%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
index
13088ba
..
d378c3a
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/SearchableGroupsTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/SearchableGroupsTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
/**
* The Class SearchableGroupsTest.
/**
* The Class SearchableGroupsTest.
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
similarity index 89%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
index
fe3a8f8
..
41efbab
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/SelfLinkNodeCollectorTester.java
@@
-23,11
+23,11
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
-import org.o
penecomp
.sparky.config.oxm.OxmModelLoader;
-import org.o
penecomp
.sparky.viewandinspect.entity.ActiveInventoryNode;
-import org.o
penecomp
.sparky.viewandinspect.services.VisualizationContext;
+import org.o
nap.aai
.sparky.config.oxm.OxmModelLoader;
+import org.o
nap.aai
.sparky.viewandinspect.entity.ActiveInventoryNode;
+import org.o
nap.aai
.sparky.viewandinspect.services.VisualizationContext;
/**
* The Class SelfLinkNodeCollectorTester.
/**
* The Class SelfLinkNodeCollectorTester.
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
index
41ad2c6
..
0fff1fb
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect;
+package org.o
nap.aai
.sparky.viewandinspect;
import static org.junit.Assert.assertEquals;
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.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.o
penecomp
.sparky.viewandinspect.entity.QuerySearchEntity;
+import org.o
nap.aai
.sparky.viewandinspect.entity.QuerySearchEntity;
import org.powermock.modules.junit4.PowerMockRunner;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**
diff --git
a/src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java
b/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java
similarity index 95%
rename from
src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java
rename to
src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java
index
6dfa448
..
496ceb2
100644
(file)
--- a/
src/test/java/org/openecomp/sparky/viewandinspect/entity/EntityEntryTest.java
+++ b/
src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java
@@
-23,7
+23,7
@@
* and service marks of AT&T Intellectual Property.
*/
* and service marks of AT&T Intellectual Property.
*/
-package org.o
penecomp
.sparky.viewandinspect.entity;
+package org.o
nap.aai
.sparky.viewandinspect.entity;
import static org.junit.Assert.assertEquals;
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.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;
/**
import org.powermock.modules.junit4.PowerMockRunner;
/**