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