diff options
Diffstat (limited to 'blueprints-processor')
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/pom.xml | 10 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 16 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java) | 3 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java (renamed from blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java) | 22 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml | 12 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml | 14 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/pom.xml | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java) | 10 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java) | 9 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java) | 9 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 4 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java (renamed from blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties | 38 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/pom.xml | 10 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java) | 24 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java) | 14 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java) | 24 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java) | 12 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java) | 22 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java) | 22 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java) | 32 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java) | 7 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java) | 28 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java (renamed from blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java) | 10 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 18 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java) | 15 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java) | 25 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java) | 20 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java) | 25 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java) | 13 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java) | 11 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java (renamed from blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java) | 8 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/pom.xml | 8 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java) | 14 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java) | 12 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java (renamed from blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 12 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java (renamed from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java) | 21 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java (renamed from blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java) | 3 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/pom.xml | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java) | 18 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java) | 26 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java) | 22 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java) | 13 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java) | 13 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java) | 20 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java) | 2 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java) | 12 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java) | 25 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java) | 10 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java) | 17 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java) | 11 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java (renamed from blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java) | 21 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 20 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java) | 9 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java) | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java) | 20 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java) | 16 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java) | 6 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java) | 5 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java (renamed from blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java) | 18 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json | 10 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json | 4 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json | 2 |
172 files changed, 743 insertions, 677 deletions
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index f328ea954..0de0bab0a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -111,11 +111,11 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.onap.ccsdk.config.data.adaptor,
- org.onap.ccsdk.config.data.adaptor.dao,
- org.onap.ccsdk.config.data.adaptor.db,
- org.onap.ccsdk.config.data.adaptor.domain,
- org.onap.ccsdk.config.data.adaptor.service
+ <Export-Package>org.onap.ccsdk.features.data.adaptor,
+ org.onap.ccsdk.features.data.adaptor.dao,
+ org.onap.ccsdk.features.data.adaptor.db,
+ org.onap.ccsdk.features.data.adaptor.domain,
+ org.onap.ccsdk.features.data.adaptor.service
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java index cd4ac277a..d76ee4ef9 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/ConfigDataAdaptorException.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/ConfigDataAdaptorException.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor;
+package org.onap.ccsdk.features.data.adaptor;
/**
* ConfigDataAdaptorException.java Purpose: Provide Configuration Data Adaptor Exception
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java index 6a61370ea..df4912cf0 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/DataAdaptorConstants.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor;
+package org.onap.ccsdk.features.data.adaptor;
@SuppressWarnings("squid:S1118")
public class DataAdaptorConstants {
@@ -23,7 +23,7 @@ public class DataAdaptorConstants { public static final String OUTPUT_STATUS_SUCCESS = "success";
public static final String OUTPUT_STATUS_FAILURE = "failure";
- public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.config.rest.adaptors.envtype";
+ public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.features.rest.adaptors.envtype";
public static final String PROPERTY_ENV_PROD = "field";
public static final String PROPERTY_ENV_SOLO = "solo";
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java index 2bf9682de..4a77f7f05 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDao.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDao.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java index 65e241e7d..a5248d2a6 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.CannotGetJdbcConnectionException;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java index 63628864c..5e50d6f5f 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDao.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDao.java @@ -15,10 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
+
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface ConfigResourceDao {
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java index 42cbbd1b0..7661e96ee 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoImpl.java @@ -15,15 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java index 4cebb3081..7a06e234a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDao.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDao.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java index bcfe6b649..ac59c5149 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/NamedQueryExecutorDaoImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/NamedQueryExecutorDaoImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java index 0c39524cf..9077d09f7 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDao.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDao.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java index 076ec1d0f..f52c4c50f 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java index c4747e236..c9c5f8a73 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDao.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDao.java @@ -15,10 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.List;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface TransactionLogDao {
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java index fd3d810e7..ea6567e1e 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/TransactionLogDaoImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/dao/TransactionLogDaoImpl.java @@ -15,13 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java index 18ca9453c..5ec3eddca 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/db/DataSourceWrap.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/db/DataSourceWrap.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.db;
+package org.onap.ccsdk.features.data.adaptor.db;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java index 7d6bff98b..d9503b3be 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigPropertyMapData.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigPropertyMapData.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java index c8394a74d..501027021 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ConfigResource.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ConfigResource.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java index 75c1a4957..45e83c27e 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/ResourceAssignmentData.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/ResourceAssignmentData.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java index 77235d137..f45fdc64c 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/domain/TransactionLog.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/domain/TransactionLog.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.domain;
+package org.onap.ccsdk.features.data.adaptor.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java index f85da143b..2eca20731 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNode.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNode.java @@ -15,12 +15,12 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java index b99b74f87..2f01749a3 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceService.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceService.java @@ -15,12 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java index c8803092a..bf1990377 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceImpl.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceImpl.java @@ -15,17 +15,18 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 644fd77f4..e38bcd3ce 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -27,7 +27,7 @@ <!-- Data SourceInitialisation -->
<bean id="config.dataSource"
- class="org.onap.ccsdk.config.data.adaptor.db.DataSourceWrap">
+ class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">
<argument ref="dataSource" />
</bean>
@@ -43,34 +43,34 @@ <!-- DAO Initialisation -->
<bean id="transactionLogDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="configResourceDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<argument ref="namedParameterJdbcTemplate" />
</bean>
<bean id="configPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<argument ref="jdbcTemplate" />
</bean>
<!-- Expose the Common Component Bean -->
<bean id="configResourceService"
- class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">
+ class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">
<argument ref="transactionLogDao" />
<argument ref="configResourceDao" />
<argument ref="queryExecutorDao" />
@@ -79,6 +79,6 @@ </bean>
<service ref="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
</blueprint>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java index 28736386c..1915017a6 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigPropertyMapDaoTest.java @@ -15,13 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +46,7 @@ public class ConfigPropertyMapDaoTest { int result = queryExecutorDao.update(sql, data);
Assert.assertNotNull("Failed to get Query Result", result);
- String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.config.rest.adaptors.test");
+ String propKeyValye = configPropertyMapDao.getConfigPropertyByKey("org.onap.ccsdk.features.rest.adaptors.test");
Assert.assertNull("propKeyValue is null", propKeyValye);
}
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java index 0e57d3b5f..7bc9189c9 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigResourceDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigResourceDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -28,8 +28,9 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java index ba150d510..22e9be9b7 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigTransactionLogDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/ConfigTransactionLogDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.HashMap;
import java.util.List;
@@ -26,8 +26,10 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java index 257bc3183..ee7029f0d 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/dao/QueryExecutorDaoTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/dao/QueryExecutorDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.dao;
+package org.onap.ccsdk.features.data.adaptor.dao;
import java.util.Date;
import org.junit.Assert;
@@ -24,6 +24,7 @@ import org.junit.FixMethodOrder; import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java index b2f24bf60..53724c5c9 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceNodeTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.util.HashMap;
import java.util.Map;
@@ -23,12 +23,15 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceNode;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java index 6f861a3be..2d599e2f1 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/config/data/adaptor/service/ConfigResourceServiceTest.java +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/java/org/onap/ccsdk/features/data/adaptor/service/ConfigResourceServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.data.adaptor.service;
+package org.onap.ccsdk.features.data.adaptor.service;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -29,15 +29,17 @@ import org.junit.Assert; import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDao;
-import org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoTest;
-import org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDao;
-import org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDao;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDao;
+import org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoTest;
+import org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDao;
+import org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDao;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml index f0a50f440..baffb54e6 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context-h2db.xml @@ -53,31 +53,31 @@ </bean>
<bean id="configResourceDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="configPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<bean id="transactionLogDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.TransactionLogDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml index 17189f2f2..ee3d33120 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/test/resources/test-context.xml @@ -53,10 +53,10 @@ <!-- <jdbc:script location="sql/schema.sql" /> -->
<!-- </jdbc:initialize-database> -->
<!-- <bean id="dataSetup" -->
- <!-- class="org.onap.ccsdk.config.data.adaptor.db.utils.DataSetup"> -->
+ <!-- class="org.onap.ccsdk.features.data.adaptor.db.utils.DataSetup"> -->
<!-- <property name="testDb" ref="testDb" /> -->
<!-- </bean> -->
- <!-- <bean id="testDb" class="org.onap.ccsdk.config.data.adaptor.db.utils.TestDb"> -->
+ <!-- <bean id="testDb" class="org.onap.ccsdk.features.data.adaptor.db.utils.TestDb"> -->
<!-- <property name="jdbcTemplate" ref="jdbcTemplate" /> -->
<!-- </bean> -->
@@ -71,26 +71,26 @@ </bean>
<bean id="configResourcelDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigResourceDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="ConfigPropertyMapDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.ConfigPropertyMapDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigPropertyMapDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="queryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.QueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
<constructor-arg ref="jdbcTemplate" />
</bean>
<bean id="namedQueryExecutorDao"
- class="org.onap.ccsdk.config.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
<constructor-arg ref="namedParameterJdbcTemplate" />
</bean>
<context:component-scan
- base-package="org.onap.ccsdk.config.data.adaptor" />
+ base-package="org.onap.ccsdk.features.data.adaptor" />
</beans>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index ee5f9f675..0bf0d73d7 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -97,10 +97,10 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.onap.ccsdk.config.rest.adaptor,
- org.onap.ccsdk.config.rest.adaptor.data,
- org.onap.ccsdk.config.rest.adaptor.service,
- org.onap.ccsdk.config.rest.adaptor.utils
+ <Export-Package>org.onap.ccsdk.features.rest.adaptor,
+ org.onap.ccsdk.features.rest.adaptor.data,
+ org.onap.ccsdk.features.rest.adaptor.service,
+ org.onap.ccsdk.features.rest.adaptor.utils
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java index af6b9f2b8..2f1ad0af2 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorConstants.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
public class ConfigRestAdaptorConstants {
private ConfigRestAdaptorConstants() {
@@ -33,7 +33,7 @@ public class ConfigRestAdaptorConstants { public static final String PROPERTY_ENV_PROD = "field";
public static final String PROPERTY_ENV_SOLO = "solo";
- public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.config.rest.adaptors.";
+ public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";
public static final String REST_ADAPTOR_ENV_TYPE = "envtype";
public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";
public static final String REST_ADAPTOR_TYPE_SSL = "ssl";
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java index c6593f128..163c30423 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/ConfigRestAdaptorException.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorException.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor;
+package org.onap.ccsdk.features.rest.adaptor;
/**
* ConfigRestAdaptorException.java Purpose: Provide Configuration Rest Adaptor Exception
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java index d31aa7e8a..f1a3c7290 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/data/RestResponse.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/data/RestResponse.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.data;
+package org.onap.ccsdk.features.rest.adaptor.data;
import java.util.Map;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java index 7829ee6a8..207e87fc3 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapter.java @@ -12,7 +12,7 @@ * the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -30,10 +30,10 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.TrustStrategy;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
-import org.onap.ccsdk.config.rest.adaptor.utils.BasicAuthorizationInterceptor;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.utils.BasicAuthorizationInterceptor;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java index 98c598acb..12e734ad3 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorService.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorService.java @@ -15,10 +15,10 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
public interface ConfigRestAdaptorService {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java index 65b9defd3..c05d6979a 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestAdaptorServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.File;
import java.io.FileInputStream;
@@ -27,9 +27,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java index 46e954fb6..7ebc0ef48 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/ConfigRestClientServiceAdapter.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/ConfigRestClientServiceAdapter.java @@ -15,10 +15,10 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
interface ConfigRestClientServiceAdapter {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java index 8cb5e9bea..6f9840a0b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientAdapterImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientAdapterImpl.java @@ -15,14 +15,14 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java index e444d9f17..44736deb1 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/SSLRestClientAdapterImpl.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/service/SSLRestClientAdapterImpl.java @@ -15,13 +15,14 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.util.Map;
import java.util.UUID;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.data.RestResponse;
+
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.data.RestResponse;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java index b28c2c1a1..53b4ddf96 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/BasicAuthorizationInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
import java.io.IOException;
import java.nio.charset.Charset;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java index 4095d62fe..cb618d05a 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/LoggingRequestInterceptor.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/utils/LoggingRequestInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 0b6a6ae11..dbc8b5231 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -23,11 +23,11 @@ <!-- Expose the Common Component Bean -->
<bean id="configRestAdaptorService"
- class="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
+ class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
<argument value="/opt/sdnc/data/properties" />
</bean>
<service ref="configRestAdaptorService"
- interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
</blueprint>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java index 6c7f114eb..2e091591b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/AbstractConfigRestClientAdapterTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import java.io.FileInputStream;
import java.util.HashMap;
@@ -25,6 +25,9 @@ import java.util.stream.Collectors; import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestClientServiceAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.GenericRestClientAdapterImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.SSLRestClientAdapterImpl;
public class AbstractConfigRestClientAdapterTest {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java index 7e7f52261..f660cca10 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/GenericRestClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/GenericRestClientServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java index a5e757213..e8b3a02ed 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/service/SSLClientServiceTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/service/SSLClientServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.service;
+package org.onap.ccsdk.features.rest.adaptor.service;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -25,7 +25,10 @@ import org.junit.Before; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.AbstractConfigRestClientAdapter;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java index e1d0268e1..cee91d297 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/config/rest/adaptor/utils/RestTemplateFactoryTest.java +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/java/org/onap/ccsdk/features/rest/adaptor/utils/RestTemplateFactoryTest.java @@ -15,11 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.rest.adaptor.utils;
+package org.onap.ccsdk.features.rest.adaptor.utils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl;
@SuppressWarnings("squid:S2187")
public class RestTemplateFactoryTest {
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties index 4527e8977..22748259b 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/config-rest-adaptor.properties @@ -18,28 +18,28 @@ # Configuration file for SDNC Controller Module
#
-org.onap.ccsdk.config.rest.adaptors.envtype=solo
+org.onap.ccsdk.features.rest.adaptors.envtype=solo
# Config Generator Microservices
-org.onap.ccsdk.config.rest.adaptors.modelservice.type=generic
-org.onap.ccsdk.config.rest.adaptors.modelservice.enable=true
-org.onap.ccsdk.config.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
-org.onap.ccsdk.config.rest.adaptors.modelservice.user=admin
-org.onap.ccsdk.config.rest.adaptors.modelservice.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
# Generic RESTCONF Adaptor
-org.onap.ccsdk.config.rest.adaptors.restconf.type=generic
-org.onap.ccsdk.config.rest.adaptors.restconf.enable=true
-org.onap.ccsdk.config.rest.adaptors.restconf.user=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.passwd=admin
-org.onap.ccsdk.config.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
# SSL AAI Adaptor
-org.onap.ccsdk.config.rest.adaptors.aai.propertyfile=aai.properties
-org.onap.ccsdk.config.rest.adaptors.aai.type=ssl
-org.onap.ccsdk.config.rest.adaptors.aai.enable=true
-org.onap.ccsdk.config.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.trust.psswd=changeme
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
-org.onap.ccsdk.config.rest.adaptors.aai.ssl.key.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
+org.onap.ccsdk.features.rest.adaptors.aai.enable=true
+org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index 4f6b2936e..5ca679baf 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -105,11 +105,11 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> - <Export-Package>org.onap.ccsdk.config.assignment,
- org.onap.ccsdk.config.assignment.data,
- org.onap.ccsdk.config.assignment.service,
- org.onap.ccsdk.config.assignment.processor,
- org.onap.ccsdk.config.assignment.processor.custom
+ <Export-Package>org.onap.ccsdk.features.assignment,
+ org.onap.ccsdk.features.assignment.data,
+ org.onap.ccsdk.features.assignment.service,
+ org.onap.ccsdk.features.assignment.processor,
+ org.onap.ccsdk.features.assignment.processor.custom
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java index 10e217b8c..3052a8611 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/ConfigAssignmentConstants.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/ConfigAssignmentConstants.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment;
+package org.onap.ccsdk.features.assignment;
@SuppressWarnings("squid:S1118")
public class ConfigAssignmentConstants {
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java index 816c943f3..2bd067461 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/data/ResourceAssignmentData.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/data/ResourceAssignmentData.java @@ -15,12 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.data;
+package org.onap.ccsdk.features.assignment.data;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
+
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
public class ResourceAssignmentData {
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java index 5f3e6094c..132d03c4f 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessor.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.util.HashMap;
import java.util.List;
@@ -23,17 +23,17 @@ import java.util.Map; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.utils.JsonUtils;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.utils.JsonUtils;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java index aac13cb9d..563d5b523 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessor.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessor.java @@ -15,18 +15,18 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java index e32e7af51..6c73b08de 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessor.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessor.java @@ -15,17 +15,17 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java index 15528e13e..dfc041cee 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessor.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessor.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.util.HashMap;
import java.util.List;
@@ -23,17 +23,17 @@ import java.util.Map; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.service.ConfigAssignmentUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java index 5fcedd87f..bb620a1a3 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ProcessorFactory.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ProcessorFactory.java @@ -15,13 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.service.ComponentNodeService;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.service.ComponentNodeService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
public class ProcessorFactory {
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java index 70d9abc68..3ee49f085 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/processor/ResourceAssignmentProcessor.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/processor/ResourceAssignmentProcessor.java @@ -15,15 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.TopologicalSortingUtils;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java index 8ed0b71fc..aaeadcabd 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNode.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNode.java @@ -15,23 +15,23 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.service.ComponentNodeService;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.service.ComponentNodeService;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java index 320f4369b..c4083f86d 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentPersistService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentPersistService.java @@ -15,20 +15,20 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -43,7 +43,7 @@ public class ConfigAssignmentPersistService { this.configResourceService = configResourceService;
}
- public void saveResourceMapping(org.onap.ccsdk.config.assignment.data.ResourceAssignmentData resourceAssignmentData,
+ public void saveResourceMapping(org.onap.ccsdk.features.assignment.data.ResourceAssignmentData resourceAssignmentData,
String templateName, List<ResourceAssignment> resourceAssignments) throws SvcLogicException {
try {
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java index 85ff82db6..61c035960 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentProcessService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentProcessService.java @@ -15,28 +15,28 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.assignment.processor.ProcessorFactory;
-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.service.ComponentNodeService;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.assignment.processor.ProcessorFactory;
+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.service.ComponentNodeService;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java index 4866f258b..969f84679 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentService.java @@ -15,11 +15,12 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.List;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
+
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface ConfigAssignmentService {
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java index 9e2bdcf8d..560d0b1ff 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentServiceImpl.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentServiceImpl.java @@ -15,16 +15,17 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.List;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.service.ComponentNodeService;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.service.ComponentNodeService;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java index 32adbe249..1d7df6b58 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentUtils.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.ArrayList;
import java.util.List;
@@ -24,19 +24,19 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.ResourceAssignmentData;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.EntrySchema;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.domain.ResourceDictionary;
-import org.onap.ccsdk.config.model.utils.JsonUtils;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.ResourceAssignmentData;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.EntrySchema;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.domain.ResourceDictionary;
+import org.onap.ccsdk.features.model.utils.JsonUtils;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java index ae5c01c88..071b5a548 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewService.java @@ -15,20 +15,20 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java index 50562b0e8..ec586f493 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceDictionaryService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceDictionaryService.java @@ -15,20 +15,20 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.domain.ResourceDictionary;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.domain.ResourceDictionary;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java index 9f3013b73..befa36a34 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/config/assignment/service/ResourceModelService.java +++ b/blueprints-processor/plugin/assignment-provider/src/main/java/org/onap/ccsdk/features/assignment/service/ResourceModelService.java @@ -15,17 +15,17 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index baa6bdbc5..f15429dfe 100644 --- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -21,23 +21,23 @@ odl:use-default-for-reference-types="true">
<reference id="componentNodeService"
- interface="org.onap.ccsdk.config.model.service.ComponentNodeService" />
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
<reference id="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
<reference id="configModelService"
- interface="org.onap.ccsdk.config.model.service.ConfigModelService" />
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
<reference id="configRestAdaptorService"
- interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
<reference id="configGeneratorService"
- interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
<!-- Expose the Common Component Bean -->
<bean id="configAssignmentNode"
- class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">
<argument ref="configResourceService" />
<argument ref="configRestAdaptorService" />
<argument ref="configModelService" />
@@ -46,10 +46,10 @@ </bean>
<service ref="configAssignmentNode"
- interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode" />
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />
<bean id="configAssignmentService"
- class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentServiceImpl">
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">
<argument ref="configResourceService" />
<argument ref="configRestAdaptorService" />
<argument ref="configModelService" />
@@ -58,6 +58,6 @@ </bean>
<service ref="configAssignmentService"
- interface="org.onap.ccsdk.config.assignment.service.ConfigAssignmentService" />
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />
</blueprint>
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java index 5a704e995..43a4881d5 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DBResourceProcessorTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DBResourceProcessorTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import static org.mockito.Matchers.any;
import java.io.File;
@@ -37,13 +37,14 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.assignment.processor.DBResourceProcessor;
+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java index 7e8d14201..df3800387 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/DefaultResourceProcessorTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/DefaultResourceProcessorTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import static org.mockito.Matchers.any;
import java.io.File;
@@ -35,13 +35,14 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.assignment.processor.DefaultResourceProcessor;
+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java index 2aabdb3d9..cd0b7828e 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/InputResourceProcessorTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/InputResourceProcessorTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import static org.mockito.Matchers.any;
import java.io.File;
@@ -35,13 +35,14 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.assignment.processor.InputResourceProcessor;
+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java index 2d651c836..5f73f32e3 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/processor/MdsalResourceProcessorTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/processor/MdsalResourceProcessorTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.processor;
+package org.onap.ccsdk.features.assignment.processor;
import java.io.File;
import java.nio.charset.Charset;
@@ -33,12 +33,13 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.assignment.service.ConfigResourceAssignmentTestUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.processor.MdsalResourceProcessor;
+import org.onap.ccsdk.features.assignment.service.ConfigResourceAssignmentTestUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java index 9ad94dcd0..41911e91d 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigAssignmentNodeTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigAssignmentNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.io.File;
import java.nio.charset.Charset;
@@ -33,17 +33,18 @@ import org.junit.runner.RunWith; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.config.assignment.ConfigAssignmentConstants;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;
-import org.onap.ccsdk.config.model.service.ComponentNodeService;
-import org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.ConfigAssignmentConstants;
+import org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;
+import org.onap.ccsdk.features.model.service.ComponentNodeService;
+import org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.osgi.framework.BundleContext;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java index 75b7f2e28..1e0b4a299 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigPreviewServiceTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigPreviewServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.io.File;
import java.nio.charset.Charset;
@@ -29,14 +29,16 @@ import org.junit.runner.RunWith; import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.config.assignment.data.ResourceAssignmentData;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorService;
-import org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.assignment.data.ResourceAssignmentData;
+import org.onap.ccsdk.features.assignment.service.ConfigPreviewService;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorService;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java index ee1c076ae..5ce2c9a1d 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ConfigResourceAssignmentTestUtils.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ConfigResourceAssignmentTestUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@@ -33,14 +33,15 @@ import org.mockito.Matchers; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.domain.ConfigModel;
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.domain.ConfigModel;
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -68,10 +69,10 @@ public class ConfigResourceAssignmentTestUtils { Mockito.doAnswer(new Answer<ConfigModel>() {
@Override
- public org.onap.ccsdk.config.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)
+ public org.onap.ccsdk.features.model.domain.ConfigModel answer(InvocationOnMock invocationOnMock)
throws Throwable {
Object[] args = invocationOnMock.getArguments();
- org.onap.ccsdk.config.model.domain.ConfigModel serviceArtifact = null;
+ org.onap.ccsdk.features.model.domain.ConfigModel serviceArtifact = null;
if (args != null && args.length == 3) {
logger.info("Artifact info " + Arrays.asList(args));
@@ -102,7 +103,7 @@ public class ConfigResourceAssignmentTestUtils { configModelContents.add(configModelTemplateContent);
}
- serviceArtifact = new org.onap.ccsdk.config.model.domain.ConfigModel();
+ serviceArtifact = new org.onap.ccsdk.features.model.domain.ConfigModel();
serviceArtifact.setArtifactName(String.valueOf(args[0]));
serviceArtifact.setArtifactVersion(String.valueOf(args[1]));
serviceArtifact.setPublished("Y");
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java index 3dc7da7eb..04147d90f 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentGenerationTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentGenerationTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.nio.charset.Charset;
import java.util.HashMap;
@@ -24,11 +24,12 @@ import java.util.Map; import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.ResourceAssignmentUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java index d708404f5..a3be02920 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/ResourceAssignmentValidation.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/ResourceAssignmentValidation.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -25,10 +25,11 @@ import org.junit.Assert; import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.model.validator.ResourceAssignmentValidator;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.validator.ResourceAssignmentValidator;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java index e4b7f5dee..f6e8871a6 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/config/assignment/service/TopologicalSortingTest.java +++ b/blueprints-processor/plugin/assignment-provider/src/test/java/org/onap/ccsdk/features/assignment/service/TopologicalSortingTest.java @@ -15,16 +15,16 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.assignment.service;
+package org.onap.ccsdk.features.assignment.service;
import java.nio.charset.Charset;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test;
-import org.onap.ccsdk.config.assignment.processor.ResourceAssignmentProcessor;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.assignment.processor.ResourceAssignmentProcessor;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json index 0e29fe160..cbea6a82c 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json +++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment.json @@ -139,7 +139,7 @@ "resource-assignment": {
"type": "component-resource-assignment",
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
@@ -243,7 +243,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json index 6347f4223..4cbb8fa25 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json +++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/resource_assignment/resource_assignment.json @@ -139,7 +139,7 @@ "resource-assignment": {
"type": "component-resource-assignment",
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
@@ -245,7 +245,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
diff --git a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json index 20207a87b..7113b70c2 100644 --- a/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json +++ b/blueprints-processor/plugin/assignment-provider/src/test/resources/service_templates/vpe-201802-baseconfig/vpe-201802-baseconfig.json @@ -224,7 +224,7 @@ "resource-assignment": {
"type": "component-resource-assignment",
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
@@ -328,7 +328,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index 006e378a2..e8a2ab026 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -108,10 +108,10 @@ <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.onap.ccsdk.config.generator,
- org.onap.ccsdk.config.generator.data,
- org.onap.ccsdk.config.generator.service,
- org.onap.ccsdk.config.generator.tool
+ org.onap.ccsdk.features.generator,
+ org.onap.ccsdk.features.generator.data,
+ org.onap.ccsdk.features.generator.service,
+ org.onap.ccsdk.features.generator.tool
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java index b859b69cd..06c423b5e 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/ConfigGeneratorConstant.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/ConfigGeneratorConstant.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator;
+package org.onap.ccsdk.features.generator;
public class ConfigGeneratorConstant {
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java index ec461549a..0b7ea0435 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/data/ConfigGeneratorInfo.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/data/ConfigGeneratorInfo.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.data;
+package org.onap.ccsdk.features.generator.data;
public class ConfigGeneratorInfo {
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java index 136ba7f25..421692b89 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNode.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNode.java @@ -15,16 +15,16 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNode;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNode;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java index 710d47d25..b8a943083 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorService.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorService.java @@ -15,9 +15,9 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
public interface ConfigGeneratorService {
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java index 472f5b291..6292b8def 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorServiceImpl.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorServiceImpl.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import java.io.StringWriter;
import java.util.Iterator;
@@ -24,11 +24,11 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.data.ConfigGeneratorInfo;
-import org.onap.ccsdk.config.generator.tool.CustomJsonNodeFactory;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.data.ConfigGeneratorInfo;
+import org.onap.ccsdk.features.generator.tool.CustomJsonNodeFactory;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java index 3e69ef355..f20cef2a6 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomJsonNodeFactory.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomJsonNodeFactory.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.TextNode;
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java index cf42c552b..1a62dd6a9 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/CustomTextNode.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/CustomTextNode.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import com.fasterxml.jackson.core.io.CharTypes;
import com.fasterxml.jackson.databind.node.TextNode;
diff --git a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java index 3009f87f9..d3246e045 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/config/generator/tool/EscapeUtils.java +++ b/blueprints-processor/plugin/generator-provider/src/main/java/org/onap/ccsdk/features/generator/tool/EscapeUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import org.apache.commons.lang3.StringUtils;
diff --git a/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 7bf65fa4e..78cb28189 100644 --- a/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/blueprints-processor/plugin/generator-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -21,29 +21,29 @@ odl:use-default-for-reference-types="true">
<reference id="configModelService"
- interface="org.onap.ccsdk.config.model.service.ConfigModelService" />
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
<reference id="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
<!-- Expose the Common Component Bean -->
<bean id="configGeneratorService"
- class="org.onap.ccsdk.config.generator.service.ConfigGeneratorServiceImpl">
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl">
<argument ref="configResourceService" />
</bean>
<service ref="configGeneratorService"
- interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
<bean id="configGeneratorNode"
- class="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode">
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode">
<argument ref="configResourceService" />
<argument ref="configModelService" />
</bean>
<service ref="configGeneratorNode"
- interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorNode" />
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode" />
</blueprint>
diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java index 941387347..58a22ac14 100644 --- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/service/ConfigGeneratorNodeTest.java +++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/service/ConfigGeneratorNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.service;
+package org.onap.ccsdk.features.generator.service;
import static org.mockito.Matchers.any;
import java.nio.charset.Charset;
@@ -35,15 +35,16 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.data.adaptor.domain.ConfigResource;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.generator.ConfigGeneratorConstant;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.domain.ConfigResource;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.generator.ConfigGeneratorConstant;
+import org.onap.ccsdk.features.generator.service.ConfigGeneratorNode;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java index 0bd2384bf..58918685d 100644 --- a/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/config/generator/tool/EscapeUtilsTest.java +++ b/blueprints-processor/plugin/generator-provider/src/test/java/org/onap/ccsdk/features/generator/tool/EscapeUtilsTest.java @@ -15,10 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.generator.tool;
+package org.onap.ccsdk.features.generator.tool;
import org.junit.Assert;
import org.junit.Test;
+import org.onap.ccsdk.features.generator.tool.EscapeUtils;
public class EscapeUtilsTest {
diff --git a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json index 0d569ef85..326d2e8ec 100644 --- a/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json +++ b/blueprints-processor/plugin/generator-provider/src/test/resources/service_templates/generate_configuration.json @@ -67,7 +67,7 @@ "generate-configuration": {
"type": "component-config-generator",
"interfaces": {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {
"operations": {
"process": {
"inputs": {
@@ -164,7 +164,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode": {
"operations": {
"process": {
"inputs": {
@@ -211,7 +211,7 @@ "type": "string"
},
"mask-info": {
- "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",
+ "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.features.model.data.custom.MaskInfo ",
"required": false,
"type": "string"
},
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index e548c2e2e..1092b486f 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -120,14 +120,14 @@ <instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.onap.ccsdk.config.model,
- org.onap.ccsdk.config.model.data,
- org.onap.ccsdk.config.model.data.api,
- org.onap.ccsdk.config.model.data.dict,
- org.onap.ccsdk.config.model.domain,
- org.onap.ccsdk.config.model.service,
- org.onap.ccsdk.config.model.utils,
- org.onap.ccsdk.config.model.validator
+ <Export-Package>org.onap.ccsdk.features.model,
+ org.onap.ccsdk.features.model.data,
+ org.onap.ccsdk.features.model.data.api,
+ org.onap.ccsdk.features.model.data.dict,
+ org.onap.ccsdk.features.model.domain,
+ org.onap.ccsdk.features.model.service,
+ org.onap.ccsdk.features.model.utils,
+ org.onap.ccsdk.features.model.validator
</Export-Package>
</instructions>
</configuration>
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java index a9a3b2546..28572f666 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelConstant.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model;
+package org.onap.ccsdk.features.model;
public class ConfigModelConstant {
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java index 4936c3b23..aa71c265a 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ConfigModelException.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelException.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model;
+package org.onap.ccsdk.features.model;
/**
* ConfigGeneratorException.java Purpose: Provide Configuration Generator ConfigGeneratorException
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java index 6cadcc8a0..1be6089d5 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/ValidTypes.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ValidTypes.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model;
+package org.onap.ccsdk.features.model;
import java.util.ArrayList;
import java.util.List;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java index 7fcd79066..a26209425 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java index b651b54fd..3add0a3f5 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ArtifactType.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ArtifactType.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java index 45c79fb4d..f40388ce0 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityAssignment.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityAssignment.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java index b64fa5eaa..467e9bbdc 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/CapabilityDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/CapabilityDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java index 12842b537..2066e8f7a 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ConstraintClause.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ConstraintClause.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java index 2a3bfa84f..6df6ba2a8 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/DataType.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/DataType.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java index b98cfd338..663442161 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/EntrySchema.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/EntrySchema.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
/**
* EntrySchema.java Purpose: Provide EntrySchema TOSCO Model POJO bean.
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java index 016a8cfa0..46facdb69 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Implementation.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Implementation.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java index fc7f56f71..9007dd027 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceAssignment.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceAssignment.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java index d3cbbd539..bcd0ef375 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/InterfaceDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/InterfaceDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java index 489a89b65..c62b719e3 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeTemplate.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeTemplate.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java index 5d55846ad..f97910995 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/NodeType.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/NodeType.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java index 8df81f5f5..cbb14067d 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationAssignment.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationAssignment.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java index 9a1d3ddc4..eeb333500 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/OperationDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/OperationDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java index b4a3a8fac..a300d2386 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/PropertyDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/PropertyDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.HashMap;
import java.util.List;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java index b0de5878f..172d5a846 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RelationshipTemplate.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RelationshipTemplate.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java index b6d35d6c1..c26de45e5 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementAssignment.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementAssignment.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java index 68b2c41c0..623a76031 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/RequirementDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/RequirementDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java index b84f6e3a2..b288041d8 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ResourceAssignment.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Date;
import java.util.List;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java index ea9efa1a9..f66d73727 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/ServiceTemplate.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ServiceTemplate.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java index 5e775f1a6..1f609386a 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/TopologyTemplate.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/TopologyTemplate.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java index 733743cbd..09742a3d0 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/Workflow.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/Workflow.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data;
+package org.onap.ccsdk.features.model.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java index cadfe1b62..2b54a2c8b 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/ActionIdentifiers.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/ActionIdentifiers.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java index d816307d1..4a4011ef1 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/CommonHeader.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/CommonHeader.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java index 81adc7416..b1f2a9399 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Flags.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Flags.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
public class Flags {
private boolean force;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java index 7c678e9ab..2cdd839d6 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/Status.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/Status.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java index ebfa97f5d..56148eeef 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionRequest.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionRequest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java index 6a7b2e335..cc935e813 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/api/TransactionResponse.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/api/TransactionResponse.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.api;
+package org.onap.ccsdk.features.model.data.api;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java index e374aeb95..3b115b729 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/ResourceDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java @@ -15,10 +15,12 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.dict;
+package org.onap.ccsdk.features.model.data.dict;
import java.util.Map;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
+
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java index 6b9fc0ab6..8ba4471e3 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesDefinition.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.dict;
+package org.onap.ccsdk.features.model.data.dict;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java index 5be164768..2a57617ec 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/SourcesProperties.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.data.dict;
+package org.onap.ccsdk.features.model.data.dict;
import java.util.List;
import java.util.Map;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java index 9821fd0eb..97862b8ce 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModel.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.domain;
+package org.onap.ccsdk.features.model.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java index d1ef5fef8..b820b1214 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ConfigModelContent.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.domain;
+package org.onap.ccsdk.features.model.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java index 163566c3c..c62bf69b2 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/domain/ResourceDictionary.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ResourceDictionary.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.domain;
+package org.onap.ccsdk.features.model.domain;
import java.io.Serializable;
import java.util.Date;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java index fd8e79c49..92ccee223 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNode.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNode.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.Map;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java index e2d332cd9..4b9743fb7 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeDelegate.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeDelegate.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.Map;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java index 6c954518a..12efc6569 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeService.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeService.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.Map;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java index a2f1e7af3..df0dae10f 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ComponentNodeServiceImpl.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ComponentNodeServiceImpl.java @@ -15,19 +15,19 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.DataAdaptorConstants;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.osgi.framework.BundleContext;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java index 49c64abc9..3b30d3bb4 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigBlueprintService.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigBlueprintService.java @@ -15,18 +15,18 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.domain.ConfigModel;
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;
-import org.onap.ccsdk.config.model.utils.PrepareContextUtils;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorConstants;
-import org.onap.ccsdk.config.rest.adaptor.ConfigRestAdaptorException;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.domain.ConfigModel;
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;
+import org.onap.ccsdk.features.model.utils.PrepareContextUtils;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorConstants;
+import org.onap.ccsdk.features.rest.adaptor.ConfigRestAdaptorException;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java index 3347424fe..cb652bd68 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelNode.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelNode.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java index 0c112baa8..b0df3e607 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelService.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java @@ -15,11 +15,12 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.List;
import java.util.Map;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
+
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java index a3014b6b8..231f76af9 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/service/ConfigModelServiceImpl.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelServiceImpl.java @@ -15,23 +15,23 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.service;
+package org.onap.ccsdk.features.model.service;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.utils.NodePropertyUtils;
-import org.onap.ccsdk.config.model.utils.PrepareContextUtils;
-import org.onap.ccsdk.config.model.utils.ServiceTemplateUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.model.validator.ServiceTemplateValidator;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.utils.NodePropertyUtils;
+import org.onap.ccsdk.features.model.utils.PrepareContextUtils;
+import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java index 06b4c3005..cdc8fc330 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ExpressionUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ExpressionUtils.java @@ -15,15 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java index 3555ee739..d9cc3507f 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonParserUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonParserUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import static com.jayway.jsonpath.JsonPath.using;
import java.util.List;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java index 5bc663234..11f4de3e0 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/JsonUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java @@ -15,9 +15,10 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
+
+import org.onap.ccsdk.features.model.ValidTypes;
-import org.onap.ccsdk.config.model.ValidTypes;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.NullNode;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java index 59da39bb5..0feb8b5a7 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/NodePropertyUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/NodePropertyUtils.java @@ -15,22 +15,22 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;
-import org.onap.ccsdk.config.model.data.CapabilityDefinition;
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.OperationAssignment;
-import org.onap.ccsdk.config.model.data.OperationDefinition;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;
+import org.onap.ccsdk.features.model.data.CapabilityDefinition;
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.OperationAssignment;
+import org.onap.ccsdk.features.model.data.OperationDefinition;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java index ed215d2ad..6678a1245 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/PrepareContextUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java @@ -15,12 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java index 3cdf95c86..371acddf6 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.Date;
import java.util.HashSet;
@@ -24,11 +24,12 @@ import java.util.Map; import java.util.Set;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java index fccf86534..c73f67c05 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ResourceDictionaryUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.Map;
import java.util.Optional;
@@ -23,11 +23,12 @@ import java.util.function.Supplier; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java index c60d624c1..c63719875 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtils.java @@ -15,20 +15,20 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.Map;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.InterfaceAssignment;
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.OperationAssignment;
-import org.onap.ccsdk.config.model.data.OperationDefinition;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.data.TopologyTemplate;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.InterfaceAssignment;
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.OperationAssignment;
+import org.onap.ccsdk.features.model.data.OperationDefinition;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.data.TopologyTemplate;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java index 8aa4a454a..4f16a0c5f 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TopologicalSortingUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TopologicalSortingUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java index 311be9db7..138745ccf 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/utils/TransformationUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/TransformationUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java index c603040a3..32d546eed 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/DataTypeValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/DataTypeValidator.java @@ -15,16 +15,16 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
/**
* DataTypeValidator.java Purpose: Provide Configuration Generator DataTypeValidator
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java index f46d6483c..4c719768d 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/NodeTypeValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java @@ -15,22 +15,23 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.CapabilityDefinition;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.InterfaceDefinition;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.OperationDefinition;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.RequirementDefinition;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.CapabilityDefinition;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.InterfaceDefinition;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.OperationDefinition;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.RequirementDefinition;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java index dc8638349..080fee2b6 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/PropertyDefinitionValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/PropertyDefinitionValidator.java @@ -15,14 +15,14 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
/**
* PropertyDefinitionValidator.java Purpose: Provide Configuration Generator
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java index cd486cf7f..83e9f6e9d 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ResourceAssignmentValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.HashMap;
import java.util.HashSet;
@@ -23,13 +23,14 @@ import java.util.List; import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.utils.TopologicalSortingUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java index c329c7fc1..83927913a 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java @@ -15,15 +15,16 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java index dc1e314ea..0f1258a9c 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/validator/TopologyTemplateValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java @@ -15,20 +15,21 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.RequirementAssignment;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.data.TopologyTemplate;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.RequirementAssignment;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.data.TopologyTemplate;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 2bfab86f8..5a07f94c6 100644 --- a/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/blueprints-processor/plugin/model-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -23,46 +23,46 @@ <!-- Dependency -->
<reference id="configResourceService"
- interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
<reference id="configRestAdaptorService"
- interface="org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService" />
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
<!-- Expose the Common Component Bean -->
<bean id="configModelNode"
- class="org.onap.ccsdk.config.model.service.ConfigModelNode">
+ class="org.onap.ccsdk.features.model.service.ConfigModelNode">
</bean>
<service ref="configModelNode"
- interface="org.onap.ccsdk.config.model.service.ConfigModelNode" />
+ interface="org.onap.ccsdk.features.model.service.ConfigModelNode" />
<bean id="configModelService"
- class="org.onap.ccsdk.config.model.service.ConfigModelServiceImpl">
+ class="org.onap.ccsdk.features.model.service.ConfigModelServiceImpl">
<argument ref="configRestAdaptorService" />
</bean>
<service ref="configModelService"
- interface="org.onap.ccsdk.config.model.service.ConfigModelService" />
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
<!-- ComponentNode -->
<bean id="componentNodeService"
- class="org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl">
+ class="org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl">
<argument ref="blueprintBundleContext" />
<argument ref="configResourceService" />
<argument ref="configRestAdaptorService" />
</bean>
<service ref="componentNodeService"
- interface="org.onap.ccsdk.config.model.service.ComponentNodeService" />
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
<bean id="componentNodeDelegate"
- class="org.onap.ccsdk.config.model.service.ComponentNodeDelegate">
+ class="org.onap.ccsdk.features.model.service.ComponentNodeDelegate">
<argument ref="componentNodeService" />
</bean>
<service ref="componentNodeDelegate"
- interface="org.onap.ccsdk.config.model.service.ComponentNodeDelegate" />
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeDelegate" />
</blueprint>
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java index 1b3dc9c1f..a84f52f50 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/ResourceDictionaryUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java @@ -15,18 +15,20 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model;
+package org.onap.ccsdk.features.model;
import java.util.Arrays;
import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesDefinition;
-import org.onap.ccsdk.config.model.data.dict.SourcesProperties;
-import org.onap.ccsdk.config.model.utils.ResourceDictionaryUtils;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesDefinition;
+import org.onap.ccsdk.features.model.data.dict.SourcesProperties;
+import org.onap.ccsdk.features.model.utils.ResourceDictionaryUtils;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java index 693c505e3..98943db7e 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonParserUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java @@ -15,10 +15,12 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import org.junit.Assert;
import org.junit.Test;
+import org.onap.ccsdk.features.model.utils.JsonParserUtils;
+
import com.fasterxml.jackson.databind.JsonNode;
public class JsonParserUtilsTest {
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java index 5dd0fae27..d5db17008 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/JsonUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java @@ -15,11 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.onap.ccsdk.config.model.ValidTypes;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.utils.JsonUtils;
+
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java index 034d70d7d..53eb624b5 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ResourceAssignmentUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import static org.junit.Assert.assertTrue;
import java.io.File;
@@ -24,12 +24,14 @@ import java.util.HashMap; import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.ConfigModelException;
-import org.onap.ccsdk.config.model.ValidTypes;
-import org.onap.ccsdk.config.model.data.PropertyDefinition;
-import org.onap.ccsdk.config.model.data.ResourceAssignment;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.ConfigModelException;
+import org.onap.ccsdk.features.model.ValidTypes;
+import org.onap.ccsdk.features.model.data.PropertyDefinition;
+import org.onap.ccsdk.features.model.data.ResourceAssignment;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils;
+
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java index 5364ae924..df330b69e 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/ServiceTemplateUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ServiceTemplateUtilsTest.java @@ -15,15 +15,16 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import java.util.HashMap;
import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-import org.onap.ccsdk.config.model.data.ArtifactDefinition;
-import org.onap.ccsdk.config.model.data.CapabilityAssignment;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.ArtifactDefinition;
+import org.onap.ccsdk.features.model.data.CapabilityAssignment;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.utils.ServiceTemplateUtils;
public class ServiceTemplateUtilsTest {
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java index ca57e5fab..cfcf246cd 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/utils/TransformationUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java @@ -15,13 +15,15 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.utils;
+package org.onap.ccsdk.features.model.utils;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+
import com.fasterxml.jackson.databind.JsonNode;
public class TransformationUtilsTest {
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java index 4c5e6a99c..83ac18022 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java @@ -15,11 +15,13 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.model.validator;
+package org.onap.ccsdk.features.model.validator;
import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
+import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java index d73a622c6..9c048f48e 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ComponentNodeTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ComponentNodeTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
import static org.mockito.Matchers.any;
import java.io.File;
@@ -36,15 +36,15 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.onap.ccsdk.config.data.adaptor.domain.TransactionLog;
-import org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.service.ComponentNodeDelegate;
-import org.onap.ccsdk.config.model.service.ComponentNodeServiceImpl;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.data.adaptor.domain.TransactionLog;
+import org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.service.ComponentNodeDelegate;
+import org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.osgi.framework.BundleContext;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java index 77972a63e..3e62fafd0 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ConfigModelServiceTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ConfigModelServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
import static org.junit.Assert.fail;
import java.io.File;
@@ -32,13 +32,13 @@ import org.mockito.Matchers; import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.domain.ConfigModel;
-import org.onap.ccsdk.config.model.domain.ConfigModelContent;
-import org.onap.ccsdk.config.model.service.ConfigModelService;
-import org.onap.ccsdk.config.model.service.ConfigModelServiceImpl;
-import org.onap.ccsdk.config.rest.adaptor.service.ConfigRestAdaptorService;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.domain.ConfigModel;
+import org.onap.ccsdk.features.model.domain.ConfigModelContent;
+import org.onap.ccsdk.features.model.service.ConfigModelService;
+import org.onap.ccsdk.features.model.service.ConfigModelServiceImpl;
+import org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java index e72b0531f..a1e273a84 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ExpressionUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ExpressionUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
import java.io.File;
import java.nio.charset.Charset;
@@ -25,8 +25,8 @@ import java.util.List; import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
-import org.onap.ccsdk.config.model.utils.ExpressionUtils;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.utils.ExpressionUtils;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java index 00260c9e3..35f23bcb1 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/MockComponentNode.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java @@ -15,10 +15,11 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
import java.util.Map;
-import org.onap.ccsdk.config.model.service.ComponentNode;
+
+import org.onap.ccsdk.features.model.service.ComponentNode;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import com.att.eelf.configuration.EELFLogger;
diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java index 52f540565..5c89d45ae 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/ServiceTemplateCreateUtils.java @@ -15,7 +15,7 @@ * limitations under the License.
*/
-package org.onap.ccsdk.config.params.service;
+package org.onap.ccsdk.features.params.service;
import java.io.File;
import java.io.IOException;
@@ -24,14 +24,14 @@ import java.util.HashMap; import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.config.model.ConfigModelConstant;
-import org.onap.ccsdk.config.model.data.DataType;
-import org.onap.ccsdk.config.model.data.NodeTemplate;
-import org.onap.ccsdk.config.model.data.NodeType;
-import org.onap.ccsdk.config.model.data.ServiceTemplate;
-import org.onap.ccsdk.config.model.data.TopologyTemplate;
-import org.onap.ccsdk.config.model.data.dict.ResourceDefinition;
-import org.onap.ccsdk.config.model.utils.TransformationUtils;
+import org.onap.ccsdk.features.model.ConfigModelConstant;
+import org.onap.ccsdk.features.model.data.DataType;
+import org.onap.ccsdk.features.model.data.NodeTemplate;
+import org.onap.ccsdk.features.model.data.NodeType;
+import org.onap.ccsdk.features.model.data.ServiceTemplate;
+import org.onap.ccsdk.features.model.data.TopologyTemplate;
+import org.onap.ccsdk.features.model.data.dict.ResourceDefinition;
+import org.onap.ccsdk.features.model.utils.TransformationUtils;
public class ServiceTemplateCreateUtils {
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json index 0129195c2..e538b0c48 100644 --- a/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json +++ b/blueprints-processor/plugin/model-provider/src/test/resources/componentnode/default.json @@ -41,7 +41,7 @@ "generate-configuration": {
"type": "mock-component-generateConfig",
"interfaces": {
- "org-onap-ccsdk-config-params-service-MockComponentNode": {
+ "org-onap-ccsdk-features-params-service-MockComponentNode": {
"operations": {
"process": {
"inputs": {
@@ -63,7 +63,7 @@ "node_types": {
"mock-component-generateConfig": {
"interfaces": {
- "org-onap-ccsdk-config-params-service-MockComponentNode": {
+ "org-onap-ccsdk-features-params-service-MockComponentNode": {
"operations": {
"process": {
"inputs": {
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json index d3dd9934a..e53f0f6cd 100644 --- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json +++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json @@ -146,7 +146,7 @@ "resource-assignment" : {
"type" : "component-resource-assignment",
"interfaces" : {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode" : {
"operations" : {
"process" : {
"inputs" : {
@@ -171,7 +171,7 @@ "generate-configuration" : {
"type" : "component-config-generator",
"interfaces" : {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode" : {
"operations" : {
"process" : {
"inputs" : {
@@ -403,7 +403,7 @@ }
},
"interfaces" : {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode" : {
"operations" : {
"process" : {
"inputs" : {
@@ -465,7 +465,7 @@ }
},
"interfaces" : {
- "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {
+ "org-onap-ccsdk-features-generator-service-ConfigGeneratorNode" : {
"operations" : {
"process" : {
"inputs" : {
@@ -512,7 +512,7 @@ "type" : "string"
},
"mask-info" : {
- "description" : "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",
+ "description" : "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.features.model.data.custom.MaskInfo ",
"required" : false,
"type" : "string"
},
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json index 0e29fe160..cbea6a82c 100644 --- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json +++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/resource_assignment.json @@ -139,7 +139,7 @@ "resource-assignment": {
"type": "component-resource-assignment",
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
@@ -243,7 +243,7 @@ }
},
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
diff --git a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json index fdfb12799..8c87f2d34 100644 --- a/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json +++ b/blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json @@ -139,7 +139,7 @@ "resource-assignment": {
"type": "component-resource-assignment",
"interfaces": {
- "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {
+ "org-onap-ccsdk-features-assignment-service-ConfigAssignmentNode": {
"operations": {
"process": {
"inputs": {
|