move aai-client into its own project 65/106765/2
authorBenjamin, Max <max.benjamin@att.com>
Tue, 28 Apr 2020 19:13:12 +0000 (15:13 -0400)
committerBenjamin, Max (mb388a) <mb388a@att.com>
Tue, 28 Apr 2020 19:26:09 +0000 (15:26 -0400)
move aai-client into its own project

Issue-ID: SO-2837
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I20b700d160efbdf81ff22c9ca0fab73b28d3649b

196 files changed:
adapters/pom.xml
asdc-controller/pom.xml
bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java
bpmn/pom.xml
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java [new file with mode: 0644]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java [moved from common/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java [moved from common/src/main/java/org/onap/so/client/sdno/SDNOValidator.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java [moved from common/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/Body.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/Input.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java with 100% similarity]
bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java [moved from common/src/main/java/org/onap/so/client/sdno/beans/SDNO.java with 100% similarity]
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java [moved from common/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java with 100% similarity]
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java [moved from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java with 92% similarity]
bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java [moved from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json [moved from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json [moved from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json [moved from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json [moved from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json [moved from common/src/test/resources/org/onap/so/client/sdno/output-failure.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json [moved from common/src/test/resources/org/onap/so/client/sdno/output-success.json with 100% similarity]
bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json [moved from common/src/test/resources/org/onap/so/client/sdno/response.json with 100% similarity]
common/pom.xml
common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java [deleted file]
common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java [deleted file]
graph-inventory/aai-client/pom.xml [new file with mode: 0644]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAIClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java [moved from common/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java [moved from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java [moved from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java [moved from common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java [moved from common/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectBase.java [moved from common/src/main/java/org/onap/so/client/aai/AAIObjectBase.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java [moved from common/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectType.java [moved from common/src/main/java/org/onap/so/client/aai/AAIObjectType.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIProperties.java [moved from common/src/main/java/org/onap/so/client/aai/AAIProperties.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java [moved from common/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java [moved from common/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAIRestClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientI.java [moved from common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java [moved from common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java [moved from common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdator.java [moved from common/src/main/java/org/onap/so/client/aai/AAIUpdator.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java [moved from common/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidator.java [moved from common/src/main/java/org/onap/so/client/aai/AAIValidator.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java [moved from common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIVersion.java [moved from common/src/main/java/org/onap/so/client/aai/AAIVersion.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java [moved from common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java [moved from common/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java [moved from common/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIError.java [moved from common/src/main/java/org/onap/so/client/aai/entities/AAIError.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java [moved from common/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Configuration.java [moved from common/src/main/java/org/onap/so/client/aai/entities/Configuration.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java [moved from common/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/QueryStep.java [moved from common/src/main/java/org/onap/so/client/aai/entities/QueryStep.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Relationships.java [moved from common/src/main/java/org/onap/so/client/aai/entities/Relationships.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/RequestError.java [moved from common/src/main/java/org/onap/so/client/aai/entities/RequestError.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Results.java [moved from common/src/main/java/org/onap/so/client/aai/entities/Results.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/ServiceException.java [moved from common/src/main/java/org/onap/so/client/aai/entities/ServiceException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java [moved from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java [moved from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java [moved from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java [moved from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java [moved from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java [moved from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java [moved from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java [moved from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java [moved from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java [moved from common/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java [moved from common/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/Format.java [moved from common/src/main/java/org/onap/so/client/graphinventory/Format.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java with 98% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java [moved from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java [moved from common/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Id.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Id.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Node.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Node.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Output.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Output.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Start.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/Start.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/__.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/__.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java [moved from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java with 100% similarity]
graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java [moved from common/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIPServerTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIURITest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIURITest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java [moved from common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java [moved from common/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java [moved from common/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java [moved from common/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java [moved from common/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java [moved from common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java [moved from common/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java with 100% similarity]
graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java [moved from common/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-failure.json [moved from common/src/test/resources/__files/aai/bulkprocess/response-failure.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-success.json [moved from common/src/test/resources/__files/aai/bulkprocess/response-success.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request-small.json [moved from common/src/test/resources/__files/aai/bulkprocess/test-request-small.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request.json [moved from common/src/test/resources/__files/aai/bulkprocess/test-request.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/error-message.json [moved from common/src/test/resources/__files/aai/error-message.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/pserver.json [moved from common/src/test/resources/__files/aai/pserver.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/query/pathed-result.json [moved from common/src/test/resources/__files/aai/query/pathed-result.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/query/single-query-result.json [moved from common/src/test/resources/__files/aai/query/single-query-result.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/resources/e2e-complex.json [moved from common/src/test/resources/__files/aai/resources/e2e-complex.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/resources/empty-query-result.json [moved from common/src/test/resources/__files/aai/resources/empty-query-result.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/resources/mockObject.json [moved from common/src/test/resources/__files/aai/resources/mockObject.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/resources/service-instance-pathed-query.json [moved from common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-request.json [moved from common/src/test/resources/__files/aai/singletransaction/sample-request.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response-failure.json [moved from common/src/test/resources/__files/aai/singletransaction/sample-response-failure.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response.json [moved from common/src/test/resources/__files/aai/singletransaction/sample-response.json with 100% similarity]
graph-inventory/aai-client/src/test/resources/aai.properties [moved from common/src/test/resources/aai.properties with 100% similarity]
graph-inventory/pom.xml [new file with mode: 0644]
mso-api-handlers/pom.xml
pom.xml
so-simulator/pom.xml

index 7d2ad74..1355b65 100644 (file)
       <artifactId>spring-cloud-contract-wiremock</artifactId>
       <version>1.2.4.RELEASE</version>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>aai-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>
index 1059e89..60a3b5a 100644 (file)
       <groupId>javax.interceptor</groupId>
       <artifactId>javax.interceptor-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>aai-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>
index 3791c5d..5a9ef25 100644 (file)
@@ -27,8 +27,6 @@ import org.onap.so.client.aai.entities.AAIResultWrapper;
 import org.onap.so.client.cds.CDSProcessingClient;
 import org.onap.so.client.cds.CDSProcessingListener;
 import org.onap.so.client.policy.PolicyClientImpl;
-import org.onap.so.client.sdno.SDNOValidator;
-import org.onap.so.client.sdno.SDNOValidatorImpl;
 import org.springframework.stereotype.Component;
 
 /*
@@ -51,10 +49,6 @@ public class InjectionHelper {
         return new AAIQueryClient();
     }
 
-    public SDNOValidator getSdnoValidator() {
-        return new SDNOValidatorImpl();
-    }
-
     public AAICommonObjectMapperProvider getAaiCommonObjectMapperProvider() {
         return new AAICommonObjectMapperProvider();
     }
index 4ef4eb7..36fb17c 100644 (file)
       <artifactId>spring-boot-starter-data-jpa</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>aai-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java
new file mode 100644 (file)
index 0000000..411bc73
--- /dev/null
@@ -0,0 +1,16 @@
+package org.onap.so.client.helper;
+
+import org.onap.so.client.sdno.SDNOValidator;
+import org.onap.so.client.sdno.SDNOValidatorImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TasksInjectionHelper {
+
+
+
+    public SDNOValidator getSdnoValidator() {
+        return new SDNOValidatorImpl();
+    }
+
+}
index e93b80c..59f75b1 100644 (file)
 package org.onap.so.client.orchestration;
 
 import java.util.UUID;
-import org.onap.so.bpmn.common.InjectionHelper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.client.helper.TasksInjectionHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class SDNOHealthCheckResources {
     @Autowired
-    private InjectionHelper injectionHelper;
+    private TasksInjectionHelper injectionHelper;
 
     /**
      * SDNO Call to Check Health Status
index 265bb5d..a2a1c8a 100644 (file)
@@ -21,9 +21,8 @@
 package org.onap.so.client.orchestration;
 
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,9 +31,9 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.so.bpmn.common.data.TestDataSetup;
-import org.onap.so.bpmn.common.InjectionHelper;
 import org.onap.so.bpmn.servicedecomposition.bbobjects.GenericVnf;
 import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
+import org.onap.so.client.helper.TasksInjectionHelper;
 import org.onap.so.client.sdno.SDNOValidator;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
@@ -49,7 +48,7 @@ public class SDNOHealthCheckResourcesTest extends TestDataSetup {
     protected SDNOValidator MOCK_sdnoValidator;
 
     @Mock
-    protected InjectionHelper MOCK_injectionHelper;
+    protected TasksInjectionHelper MOCK_injectionHelper;
 
     @Before
     public void before() {
@@ -20,6 +20,7 @@
 
 package org.onap.so.client.sdno;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -30,7 +31,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.UUID;
-import org.hamcrest.core.StringContains;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -38,8 +38,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.so.BaseIntegrationTest;
 import org.onap.so.client.dmaap.Consumer;
 import org.onap.so.client.dmaap.exceptions.DMaaPConsumerFailure;
 import org.onap.so.client.exceptions.SDNOException;
@@ -48,12 +48,12 @@ import org.onap.so.client.sdno.dmaap.SDNOHealthCheckDmaapConsumer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 
-public class SDNOValidatorTest {
+
+public class SDNOValidatorIT extends BaseIntegrationTest {
 
 
     @Mock
     private Consumer mrConsumer;
-    @Spy
     private SDNOHealthCheckDmaapConsumer dmaapConsumer;
     private final String fileLocation = "src/test/resources/org/onap/so/client/sdno/";
     private final String uuid = "xyz123";
@@ -63,10 +63,12 @@ public class SDNOValidatorTest {
     @Before
     public void setUpTests() {
         MockitoAnnotations.initMocks(this);
+
     }
 
     @Test
     public void success() throws IOException, Exception {
+        dmaapConsumer = spy(new SDNOHealthCheckDmaapConsumer());
         when(dmaapConsumer.getConsumer()).thenReturn(mrConsumer);
         when(mrConsumer.fetch())
                 .thenReturn(Arrays.asList(new String[] {getJson("response.json"), getJson("output-success.json")}));
@@ -81,6 +83,8 @@ public class SDNOValidatorTest {
 
     @Test
     public void failure() throws IOException, Exception {
+        dmaapConsumer = spy(new SDNOHealthCheckDmaapConsumer());
+
         when(dmaapConsumer.getConsumer()).thenReturn(mrConsumer);
         when(mrConsumer.fetch())
                 .thenReturn(Arrays.asList(new String[] {getJson("response.json"), getJson("output-failure.json")}));
@@ -90,7 +94,7 @@ public class SDNOValidatorTest {
         when(dmaapConsumer.getRequestId()).thenReturn("xyz123");
         doReturn(dmaapConsumer).when(spy).getConsumer(any(String.class));
         thrown.expect(SDNOException.class);
-        thrown.expectMessage(new StringContains("my error message"));
+        thrown.expectMessage(containsString("my error message"));
         boolean result = spy.pollForResponse("xyz123");
 
     }
index 199274e..b64fc33 100644 (file)
@@ -205,7 +205,15 @@ spring:
       naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
       enable-lazy-load-no-trans: true
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-
+sdno:
+  health-check:
+    dmaap:
+      password: password
+      publisher:
+        topic: sdno.test-health-diagnostic-v02
+      subscriber:
+        topic: sdno.test-health-diagnostic-v02
+      username: username
 mariaDB4j:
   dataDir:
   port: 3307
index b998a0a..ab498f8 100644 (file)
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.onap.aai.schema-service</groupId>
-      <artifactId>aai-schema</artifactId>
-      <version>1.6.5</version>
-    </dependency>
     <dependency>
       <groupId>org.modelmapper</groupId>
       <artifactId>modelmapper</artifactId>
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java b/common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java
deleted file mode 100644 (file)
index 135341a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.aai;
-
-import org.onap.so.client.aai.entities.Configuration;
-import org.onap.so.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.client.aai.entities.uri.AAIUriFactory;
-import org.onap.so.serviceinstancebeans.RequestDetails;
-
-public class AAIConfigurationClient {
-
-    private AAIResourcesClient aaiClient;
-
-    private static final String ORCHESTRATION_STATUS = "PreCreated";
-
-    public AAIConfigurationClient() {
-        aaiClient = new AAIResourcesClient();
-    }
-
-    public void createConfiguration(RequestDetails requestDetails, String configurationId, String configurationType,
-            String configurationSubType) {
-
-        AAIResourceUri uri = getConfigurationURI(configurationId);
-        Configuration payload =
-                configurePayload(requestDetails, configurationId, configurationType, configurationSubType);
-
-        aaiClient.create(uri, payload);
-    }
-
-    public Configuration configurePayload(RequestDetails requestDetails, String configurationId,
-            String configurationType, String configurationSubType) {
-
-        Configuration payload = new Configuration();
-        payload.setConfigurationId(configurationId);
-        payload.setConfigurationType(configurationType);
-        payload.setConfigurationSubType(configurationSubType);
-        payload.setModelInvariantId(requestDetails.getModelInfo().getModelInvariantId());
-        payload.setModelVersionId(requestDetails.getModelInfo().getModelVersionId());
-        payload.setOrchestrationStatus(ORCHESTRATION_STATUS);
-        payload.setOperationalStatus("");
-        payload.setConfigurationSelflink(getConfigurationURI(configurationId).build().getPath());
-        payload.setModelCustomizationId(requestDetails.getModelInfo().getModelCustomizationId());
-
-        return payload;
-    }
-
-    public void deleteConfiguration(String uuid) {
-        aaiClient.delete(getConfigurationURI(uuid));
-    }
-
-    public void updateOrchestrationStatus(String uuid, String payload) {
-        aaiClient.update(getConfigurationURI(uuid), payload);
-    }
-
-    public Configuration getConfiguration(String uuid) {
-        return aaiClient.get(Configuration.class, getConfigurationURI(uuid)).orElse(null);
-    }
-
-    public boolean configurationExists(String uuid) {
-        return aaiClient.exists(getConfigurationURI(uuid));
-    }
-
-    public AAIResourceUri getConfigurationURI(String uuid) {
-        return AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, uuid);
-    }
-}
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java
deleted file mode 100644 (file)
index cf87355..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.aai;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import java.util.Optional;
-import java.util.UUID;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.so.client.aai.entities.Configuration;
-import org.onap.so.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.client.aai.entities.uri.AAIUriFactory;
-import org.onap.so.serviceinstancebeans.ModelInfo;
-import org.onap.so.serviceinstancebeans.RequestDetails;
-
-@RunWith(MockitoJUnitRunner.class)
-public class AAIConfigurationClientTest {
-
-    @Mock
-    AAIResourcesClient aaiClient;
-
-    @InjectMocks
-    AAIConfigurationClient aaiConfigurationClient = new AAIConfigurationClient();
-
-    @Test
-    public void verifyCreate() {
-        ModelInfo modelInfo = new ModelInfo();
-        modelInfo.setModelInvariantId("testInvariantID");
-        modelInfo.setModelVersionId("testVersionID");
-        modelInfo.setModelCustomizationId("testCustomizationID");
-
-        RequestDetails requestDetails = new RequestDetails();
-        requestDetails.setModelInfo(modelInfo);
-
-        String configurationId = UUID.randomUUID().toString();
-        String configurationType = "test";
-        String configurationSubType = "test";
-
-        // Test Create Configuration
-        doNothing().when(aaiClient).create(isA(AAIResourceUri.class), isA(Object.class));
-        aaiConfigurationClient.createConfiguration(requestDetails, configurationId, configurationType,
-                configurationSubType);
-        verify(aaiClient, times(1)).create(isA(AAIResourceUri.class), isA(Object.class));
-    }
-
-    @Test
-    public void verifyConfigurePayload() {
-        ModelInfo modelInfo = new ModelInfo();
-        modelInfo.setModelInvariantId("testInvariantID");
-        modelInfo.setModelVersionId("testVersionID");
-        modelInfo.setModelCustomizationId("testCustomizationID");
-
-        RequestDetails requestDetails = new RequestDetails();
-        requestDetails.setModelInfo(modelInfo);
-
-        String configurationId = UUID.randomUUID().toString();
-        String configurationType = "test";
-        String configurationSubType = "test";
-        AAIResourceUri uri = aaiConfigurationClient.getConfigurationURI(configurationId);
-
-        Configuration payload = aaiConfigurationClient.configurePayload(requestDetails, configurationId,
-                configurationType, configurationSubType);
-
-        assertEquals(configurationId, payload.getConfigurationId());
-        assertEquals(configurationType, payload.getConfigurationType());
-        assertEquals(configurationSubType, payload.getConfigurationSubType());
-        assertEquals(uri.build().getPath(), payload.getConfigurationSelflink());
-        assertEquals("PreCreated", payload.getOrchestrationStatus());
-        assertEquals("", payload.getOperationalStatus());
-        assertEquals(modelInfo.getModelVersionId(), payload.getModelVersionId());
-        assertEquals(modelInfo.getModelInvariantId(), payload.getModelInvariantId());
-        assertEquals(modelInfo.getModelCustomizationId(), payload.getModelCustomizationId());
-    }
-
-    @Test
-    public void testDeleteConfiguration() {
-        String uuid = UUID.randomUUID().toString();
-        doNothing().when(aaiClient).delete(isA(AAIResourceUri.class));
-        aaiConfigurationClient.deleteConfiguration(uuid);
-        verify(aaiClient, times(1)).delete(aaiConfigurationClient.getConfigurationURI(uuid));
-    }
-
-    @Test
-    public void testUpdateOrchestrationStatus() {
-        String uuid = UUID.randomUUID().toString();
-        doNothing().when(aaiClient).update(isA(AAIResourceUri.class), isA(Object.class));
-        aaiConfigurationClient.updateOrchestrationStatus(uuid, "testPayload");
-        verify(aaiClient, times(1)).update(aaiConfigurationClient.getConfigurationURI(uuid), "testPayload");
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testGetConfiguration() {
-        String uuid = UUID.randomUUID().toString();
-        Optional<Configuration> expectedConfiguration = Optional.of(new Configuration());
-        expectedConfiguration.get().setConfigurationId(uuid);
-
-        doReturn(expectedConfiguration).when(aaiClient).get(isA(Class.class), isA(AAIResourceUri.class));
-        Configuration actualConfiguration = aaiConfigurationClient.getConfiguration(uuid);
-        verify(aaiClient, times(1)).get(Configuration.class, aaiConfigurationClient.getConfigurationURI(uuid));
-        assertEquals(expectedConfiguration.get(), actualConfiguration);
-    }
-
-    @Test
-    public void testConfigurationExists() {
-        String uuid = UUID.randomUUID().toString();
-        AAIResourceUri uri = aaiConfigurationClient.getConfigurationURI(uuid);
-        boolean expectedResult;
-        boolean actualResult;
-
-        expectedResult = true;
-        doReturn(expectedResult).when(aaiClient).exists(isA(AAIResourceUri.class));
-        actualResult = aaiConfigurationClient.configurationExists(uuid);
-        assertEquals(expectedResult, actualResult);
-
-        expectedResult = false;
-        doReturn(expectedResult).when(aaiClient).exists(isA(AAIResourceUri.class));
-        actualResult = aaiConfigurationClient.configurationExists(uuid);
-        assertEquals(expectedResult, actualResult);
-
-        verify(aaiClient, times(2)).exists(uri);
-    }
-
-    @Test
-    public void testGetConfigurationURI() {
-        String uuid = UUID.randomUUID().toString();
-        AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, uuid);
-        assertEquals(uri, aaiConfigurationClient.getConfigurationURI(uuid));
-    }
-}
diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml
new file mode 100644 (file)
index 0000000..c8b10cc
--- /dev/null
@@ -0,0 +1,207 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so</groupId>
+    <artifactId>graph-inventory</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>aai-client</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-client</artifactId>
+      <version>3.2.5</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.9.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>2.9.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>2.9.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-slf4j</artifactId>
+      <version>1.6.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-filter-base</artifactId>
+      <version>1.6.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-filter-spring</artifactId>
+      <version>1.6.6</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-standalone</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.skyscreamer</groupId>
+          <artifactId>jsonassert</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xmlunit</groupId>
+          <artifactId>xmlunit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.jayway.jsonpath</groupId>
+          <artifactId>json-path</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.jopt-simple</groupId>
+          <artifactId>jopt-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.20.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.shazam</groupId>
+      <artifactId>shazamcrest</artifactId>
+      <version>0.11</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.aai.schema-service</groupId>
+      <artifactId>aai-schema</artifactId>
+      <version>1.6.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.jayway.jsonpath</groupId>
+      <artifactId>json-path</artifactId>
+      <version>2.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>5.0.9.RELEASE</version>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.7</version>
+    </dependency>
+    <dependency>
+      <groupId>net.jodah</groupId>
+      <artifactId>failsafe</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.reflections</groupId>
+      <artifactId>reflections</artifactId>
+      <version>0.9.11</version>
+    </dependency>
+  </dependencies>
+</project>
@@ -24,12 +24,11 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 import javax.ws.rs.core.Response;
+import org.onap.logging.filter.base.ONAPComponentsList;
 import org.onap.so.client.ResponseExceptionMapper;
 import org.onap.so.client.RestClientSSL;
 import org.onap.so.client.RestProperties;
 import org.onap.so.client.policy.CommonObjectMapperProvider;
-import org.onap.logging.filter.base.ONAPComponents;
-import org.onap.logging.filter.base.ONAPComponentsList;
 
 public abstract class GraphInventoryRestClient extends RestClientSSL {
 
diff --git a/graph-inventory/pom.xml b/graph-inventory/pom.xml
new file mode 100644 (file)
index 0000000..d01b0ec
--- /dev/null
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so</groupId>
+    <artifactId>so</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>graph-inventory</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <!--  <module>fluent-builder-maven-plugin</module>-->
+    <module>aai-client</module>
+  </modules>
+</project>
index 5c84ab1..db939a6 100644 (file)
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>aai-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/pom.xml b/pom.xml
index 2e7c7cc..564e01e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
   <modules>
     <module>deployment-configs</module>
     <module>common</module>
+    <module>graph-inventory</module>
     <module>mso-catalog-db</module>
     <module>mso-api-handlers</module>
     <module>adapters</module>
index e264c53..7e99651 100644 (file)
@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>aai-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>