From 4f774eeef8c1797c7073754412535be47ea1a8d7 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max" Date: Tue, 28 Apr 2020 15:13:12 -0400 Subject: [PATCH] move aai-client into its own project move aai-client into its own project Issue-ID: SO-2837 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I20b700d160efbdf81ff22c9ca0fab73b28d3649b --- adapters/pom.xml | 5 + asdc-controller/pom.xml | 5 + .../org/onap/so/bpmn/common/InjectionHelper.java | 6 - bpmn/pom.xml | 5 + .../so/client/helper/TasksInjectionHelper.java | 16 ++ .../orchestration/SDNOHealthCheckResources.java | 4 +- .../onap/so/client/sdno/SDNOHealthCheckClient.java | 0 .../org/onap/so/client/sdno/SDNOValidator.java | 0 .../org/onap/so/client/sdno/SDNOValidatorImpl.java | 0 .../onap/so/client/sdno/beans/AAIParamList.java | 0 .../java/org/onap/so/client/sdno/beans/Body.java | 0 .../java/org/onap/so/client/sdno/beans/Input.java | 0 .../onap/so/client/sdno/beans/RequestHdCustom.java | 0 .../client/sdno/beans/RequestHealthDiagnostic.java | 0 .../org/onap/so/client/sdno/beans/ResultInfo.java | 0 .../java/org/onap/so/client/sdno/beans/SDNO.java | 0 .../SDNOHealthCheckResourcesTest.java | 7 +- .../so/client/sdno/SDNOHealthCheckClientTest.java | 0 .../org/onap/so/client/sdno/SDNOValidatorIT.java | 14 +- .../onap/so/client/sdno/SDNOValidatorImplTest.java | 0 .../src/test/resources/application-test.yaml | 10 +- .../custom-lport-mirror-post-check-request.json | 0 .../custom-lport-mirror-pre-check-request.json | 0 .../custom-port-mirror-post-check-request.json | 0 .../custom-port-mirror-pre-check-request.json | 0 .../org/onap/so/client/sdno/output-failure.json | 0 .../org/onap/so/client/sdno/output-success.json | 0 .../org/onap/so/client/sdno/response.json | 0 common/pom.xml | 5 - .../onap/so/client/aai/AAIConfigurationClient.java | 84 --------- .../so/client/aai/AAIConfigurationClientTest.java | 156 ---------------- graph-inventory/aai-client/pom.xml | 207 +++++++++++++++++++++ .../java/org/onap/so/client/aai/AAIClient.java | 0 .../aai/AAIClientResponseExceptionMapper.java | 0 .../aai/AAICommonObjectMapperPatchProvider.java | 0 .../client/aai/AAICommonObjectMapperProvider.java | 0 .../org/onap/so/client/aai/AAIDSLQueryClient.java | 0 .../org/onap/so/client/aai/AAIErrorFormatter.java | 0 .../onap/so/client/aai/AAINamespaceConstants.java | 0 .../java/org/onap/so/client/aai/AAIObjectBase.java | 0 .../org/onap/so/client/aai/AAIObjectPlurals.java | 0 .../java/org/onap/so/client/aai/AAIObjectType.java | 0 .../java/org/onap/so/client/aai/AAIProperties.java | 0 .../org/onap/so/client/aai/AAIQueryClient.java | 0 .../client/aai/AAIQueryObjectMapperProvider.java | 0 .../org/onap/so/client/aai/AAIResourcesClient.java | 0 .../aai/AAIResourcesObjectMapperProvider.java | 0 .../java/org/onap/so/client/aai/AAIRestClient.java | 0 .../org/onap/so/client/aai/AAIRestClientI.java | 0 .../org/onap/so/client/aai/AAIRestClientImpl.java | 0 .../so/client/aai/AAISingleTransactionClient.java | 0 .../onap/so/client/aai/AAITransactionalClient.java | 0 .../java/org/onap/so/client/aai/AAIUpdator.java | 0 .../org/onap/so/client/aai/AAIUpdatorImpl.java | 0 .../java/org/onap/so/client/aai/AAIValidator.java | 0 .../org/onap/so/client/aai/AAIValidatorImpl.java | 0 .../java/org/onap/so/client/aai/AAIVersion.java | 0 .../onap/so/client/aai/entities/AAIEdgeLabel.java | 0 .../org/onap/so/client/aai/entities/AAIEntity.java | 0 .../so/client/aai/entities/AAIEntityObject.java | 0 .../org/onap/so/client/aai/entities/AAIError.java | 0 .../so/client/aai/entities/AAIResultWrapper.java | 0 .../onap/so/client/aai/entities/Configuration.java | 0 .../onap/so/client/aai/entities/CustomQuery.java | 0 .../org/onap/so/client/aai/entities/QueryStep.java | 0 .../onap/so/client/aai/entities/Relationships.java | 0 .../onap/so/client/aai/entities/RequestError.java | 0 .../org/onap/so/client/aai/entities/Results.java | 0 .../so/client/aai/entities/ServiceException.java | 0 .../aai/entities/bulkprocess/OperationBody.java | 0 .../bulkprocess/OperationBodySerializer.java | 0 .../aai/entities/bulkprocess/Transaction.java | 0 .../aai/entities/bulkprocess/Transactions.java | 0 .../singletransaction/OperationBodyRequest.java | 0 .../OperationBodyRequestSerializer.java | 0 .../singletransaction/OperationBodyResponse.java | 0 .../SingleTransactionRequest.java | 0 .../SingleTransactionResponse.java | 0 .../aai/entities/uri/AAIBaseResourceUri.java | 0 .../aai/entities/uri/AAIPluralResourceUri.java | 0 .../so/client/aai/entities/uri/AAIResourceUri.java | 0 .../aai/entities/uri/AAISimplePluralUri.java | 0 .../so/client/aai/entities/uri/AAISimpleUri.java | 0 .../onap/so/client/aai/entities/uri/AAIUri.java | 0 .../so/client/aai/entities/uri/AAIUriFactory.java | 0 .../entities/uri/AllottedResourceLookupUri.java | 0 .../so/client/aai/entities/uri/HttpLookupUri.java | 0 .../so/client/aai/entities/uri/NodesPluralUri.java | 0 .../so/client/aai/entities/uri/NodesSingleUri.java | 0 .../onap/so/client/aai/entities/uri/NodesUri.java | 0 .../aai/entities/uri/ServiceInstanceUri.java | 0 .../EmptyStringToNullSerializer.java | 0 .../org/onap/so/client/graphinventory/Format.java | 0 .../graphinventory/GraphInventoryClient.java | 0 ...phInventoryCommonObjectMapperPatchProvider.java | 0 .../GraphInventoryCommonObjectMapperProvider.java | 0 .../graphinventory/GraphInventoryObjectBase.java | 0 .../graphinventory/GraphInventoryObjectName.java | 0 .../GraphInventoryObjectPlurals.java | 0 .../graphinventory/GraphInventoryObjectType.java | 0 .../GraphInventoryObjectUriPartial.java | 0 .../GraphInventoryObjectUriTemplate.java | 0 .../GraphInventoryPatchConverter.java | 0 .../graphinventory/GraphInventoryQueryClient.java | 0 .../GraphInventoryResourcesClient.java | 0 .../graphinventory/GraphInventoryRestClient.java | 3 +- .../graphinventory/GraphInventorySubgraphType.java | 0 .../GraphInventoryTransactionClient.java | 0 .../graphinventory/GraphInventoryVersion.java | 0 .../client/graphinventory/TransactionBuilder.java | 0 .../graphinventory/entities/DSLNodeBase.java | 0 .../client/graphinventory/entities/DSLNodeKey.java | 0 .../graphinventory/entities/DSLOutputNode.java | 0 .../client/graphinventory/entities/DSLQuery.java | 0 .../graphinventory/entities/DSLQueryBuilder.java | 0 .../graphinventory/entities/DSLStartNode.java | 0 .../graphinventory/entities/DSLTraversal.java | 0 .../entities/GraphInventoryEdgeLabel.java | 0 .../entities/GraphInventoryRelationships.java | 0 .../entities/GraphInventoryResultWrapper.java | 0 .../onap/so/client/graphinventory/entities/Id.java | 0 .../so/client/graphinventory/entities/Node.java | 0 .../so/client/graphinventory/entities/Output.java | 0 .../so/client/graphinventory/entities/Pathed.java | 0 .../client/graphinventory/entities/Resource.java | 0 .../graphinventory/entities/ResourceAndUrl.java | 0 .../so/client/graphinventory/entities/Start.java | 0 .../graphinventory/entities/TraversalBuilder.java | 0 .../onap/so/client/graphinventory/entities/__.java | 0 .../client/graphinventory/entities/uri/Depth.java | 0 .../uri/GraphInventoryPluralResourceUri.java | 0 .../entities/uri/GraphInventoryResourceUri.java | 0 .../uri/GraphInventorySingleResourceUri.java | 0 .../entities/uri/GraphInventoryUri.java | 0 .../graphinventory/entities/uri/HttpAwareUri.java | 0 .../graphinventory/entities/uri/SimpleBaseUri.java | 0 .../entities/uri/SimplePluralUri.java | 0 .../graphinventory/entities/uri/SimpleUri.java | 0 .../entities/uri/parsers/UriParser.java | 0 .../entities/uri/parsers/UriParserSpringImpl.java | 0 .../exceptions/BulkProcessFailed.java | 0 .../GraphInventoryMultipleItemsException.java | 0 .../GraphInventoryPatchDepthExceededException.java | 0 .../exceptions/GraphInventoryPayloadException.java | 0 .../GraphInventoryUriComputationException.java | 0 .../GraphInventoryUriNotFoundException.java | 0 .../exceptions/IncorrectNumberOfUriKeys.java | 0 .../aai/AAIClientResponseExceptionMapperTest.java | 0 .../onap/so/client/aai/AAIErrorFormatterTest.java | 0 .../org/onap/so/client/aai/AAIObjectTypeTest.java | 0 .../org/onap/so/client/aai/AAIPServerTest.java | 0 .../org/onap/so/client/aai/AAIQueryClientTest.java | 0 .../onap/so/client/aai/AAIResourcesClientTest.java | 0 ...IResourcesClientWithServiceInstanceUriTest.java | 0 .../org/onap/so/client/aai/AAIRestClientTest.java | 0 .../client/aai/AAISingleTransactionClientTest.java | 0 .../so/client/aai/AAITransactionalClientTest.java | 0 .../java/org/onap/so/client/aai/AAIURITest.java | 0 .../org/onap/so/client/aai/AAIUpdatorImplTest.java | 0 .../org/onap/so/client/aai/AAIUpdatorTest.java | 0 .../org/onap/so/client/aai/AAIValidatorTest.java | 0 .../onap/so/client/aai/DSLQueryBuilderTest.java | 0 .../client/aai/entities/AAIResultWrapperTest.java | 0 .../so/client/aai/entities/RelationshipsTest.java | 0 .../uri/AAISimpleUriFromParentUriTest.java | 0 .../aai/entities/uri/AAISimpleUriFromUriTest.java | 0 .../client/aai/entities/uri/AAISimpleUriTest.java | 0 .../client/aai/entities/uri/AAIUriFactoryTest.java | 0 .../uri/AllottedResourceLookupUriTest.java | 0 .../entities/uri/IncorrectNumberOfUriKeysTest.java | 0 .../aai/entities/uri/ServiceInstanceUriTest.java | 0 .../so/client/aai/objects/CustomAAIObjectType.java | 0 .../DefaultAAIPropertiesImpl.java | 0 .../GraphInventoryPatchConverterTest.java | 0 .../uri/parsers/UriParserSpringImplTest.java | 0 .../GraphInventoryPayloadExceptionTest.java | 0 .../__files/aai/bulkprocess/response-failure.json | 0 .../__files/aai/bulkprocess/response-success.json | 0 .../aai/bulkprocess/test-request-small.json | 0 .../__files/aai/bulkprocess/test-request.json | 0 .../test/resources/__files/aai/error-message.json | 0 .../src/test/resources/__files/aai/pserver.json | 0 .../resources/__files/aai/query/pathed-result.json | 0 .../__files/aai/query/single-query-result.json | 0 .../__files/aai/resources/e2e-complex.json | 0 .../__files/aai/resources/empty-query-result.json | 0 .../__files/aai/resources/mockObject.json | 0 .../resources/service-instance-pathed-query.json | 0 .../aai/singletransaction/sample-request.json | 0 .../singletransaction/sample-response-failure.json | 0 .../aai/singletransaction/sample-response.json | 0 .../aai-client}/src/test/resources/aai.properties | 0 graph-inventory/pom.xml | 15 ++ mso-api-handlers/pom.xml | 5 + pom.xml | 1 + so-simulator/pom.xml | 2 +- 196 files changed, 284 insertions(+), 266 deletions(-) create mode 100644 bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/SDNOValidator.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/Body.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/Input.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/main/java/org/onap/so/client/sdno/beans/SDNO.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java (100%) rename common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java => bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java (92%) rename {common => bpmn/so-bpmn-tasks}/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/output-failure.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/output-success.json (100%) rename {common => bpmn/so-bpmn-tasks}/src/test/resources/org/onap/so/client/sdno/response.json (100%) delete mode 100644 common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java delete mode 100644 common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java create mode 100644 graph-inventory/aai-client/pom.xml rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIObjectBase.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIObjectType.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIProperties.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIQueryClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIRestClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIRestClientI.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIUpdator.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIValidator.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/AAIVersion.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/AAIError.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/Configuration.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/QueryStep.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/Relationships.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/RequestError.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/Results.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/ServiceException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/Format.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java (98%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Id.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Node.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Output.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/Start.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/__.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java (100%) rename {common => graph-inventory/aai-client}/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIPServerTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIURITest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/bulkprocess/response-failure.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/bulkprocess/response-success.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/bulkprocess/test-request-small.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/bulkprocess/test-request.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/error-message.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/pserver.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/query/pathed-result.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/query/single-query-result.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/resources/e2e-complex.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/resources/empty-query-result.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/resources/mockObject.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/resources/service-instance-pathed-query.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/singletransaction/sample-request.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/singletransaction/sample-response-failure.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/__files/aai/singletransaction/sample-response.json (100%) rename {common => graph-inventory/aai-client}/src/test/resources/aai.properties (100%) create mode 100644 graph-inventory/pom.xml diff --git a/adapters/pom.xml b/adapters/pom.xml index 7d2ad74c61..1355b65b9a 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -41,5 +41,10 @@ spring-cloud-contract-wiremock 1.2.4.RELEASE + + org.onap.so + aai-client + ${project.version} + diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 1059e89da9..60a3b5a07b 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -285,5 +285,10 @@ javax.interceptor javax.interceptor-api + + org.onap.so + aai-client + ${project.version} + diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java index 3791c5d461..5a9ef25c03 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java @@ -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(); } diff --git a/bpmn/pom.xml b/bpmn/pom.xml index 4ef4eb74dd..36fb17c9b4 100644 --- a/bpmn/pom.xml +++ b/bpmn/pom.xml @@ -91,6 +91,11 @@ spring-boot-starter-data-jpa true + + org.onap.so + aai-client + ${project.version} + 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 index 0000000000..411bc73057 --- /dev/null +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java @@ -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(); + } + +} diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java index e93b80c562..59f75b1d2f 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java @@ -21,16 +21,16 @@ 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 diff --git a/common/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java diff --git a/common/src/main/java/org/onap/so/client/sdno/SDNOValidator.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/SDNOValidator.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java diff --git a/common/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/Body.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/Body.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/Input.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/Input.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java diff --git a/common/src/main/java/org/onap/so/client/sdno/beans/SDNO.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java similarity index 100% rename from common/src/main/java/org/onap/so/client/sdno/beans/SDNO.java rename to bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java index 265bb5d3b5..a2a1c8a949 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java @@ -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() { diff --git a/common/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java rename to bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java diff --git a/common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java similarity index 92% rename from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java rename to bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java index 18b9be0983..b91f83c1b7 100644 --- a/common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java @@ -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"); } diff --git a/common/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java rename to bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java diff --git a/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml b/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml index 199274e94c..b64fc3318b 100644 --- a/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml +++ b/bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml @@ -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 diff --git a/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/output-failure.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/output-failure.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/output-success.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/output-success.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json diff --git a/common/src/test/resources/org/onap/so/client/sdno/response.json b/bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json similarity index 100% rename from common/src/test/resources/org/onap/so/client/sdno/response.json rename to bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json diff --git a/common/pom.xml b/common/pom.xml index b998a0adfa..ab498f8844 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -55,11 +55,6 @@ org.springframework spring-webmvc - - org.onap.aai.schema-service - aai-schema - 1.6.5 - org.modelmapper modelmapper 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 index 135341a2f4..0000000000 --- a/common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java +++ /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 index cf87355ec7..0000000000 --- a/common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java +++ /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 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 index 0000000000..c8b10cce1f --- /dev/null +++ b/graph-inventory/aai-client/pom.xml @@ -0,0 +1,207 @@ + + 4.0.0 + + org.onap.so + graph-inventory + 1.6.0-SNAPSHOT + + aai-client + + + org.onap.so + common + ${project.version} + + + com.google.guava + guava + 22.0 + + + org.apache.httpcomponents + httpclient + 4.5 + compile + true + + + org.apache.cxf + cxf-rt-rs-client + 3.2.5 + true + + + com.fasterxml.jackson.core + jackson-databind + 2.9.6 + + + com.fasterxml.jackson.core + jackson-annotations + 2.9.6 + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.9.6 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.9.0 + + + commons-io + commons-io + 2.5 + + + ch.qos.logback + logback-classic + 1.2.3 + + + org.onap.logging-analytics + logging-slf4j + 1.6.6 + + + org.onap.logging-analytics + logging-filter-base + 1.6.6 + + + org.onap.logging-analytics + logging-filter-spring + 1.6.6 + + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + javax.ws.rs + javax.ws.rs-api + 2.1 + + + com.github.tomakehurst + wiremock-standalone + 2.13.0 + test + + + org.mortbay.jetty + jetty + + + com.google.guava + guava + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.httpcomponents + httpclient + + + org.skyscreamer + jsonassert + + + xmlunit + xmlunit + + + com.jayway.jsonpath + json-path + + + net.sf.jopt-simple + jopt-simple + + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + org.mockito + mockito-core + 2.20.0 + test + + + com.shazam + shazamcrest + 0.11 + test + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + + + org.onap.aai.schema-service + aai-schema + 1.6.5 + + + com.jayway.jsonpath + json-path + 2.2.0 + + + org.apache.commons + commons-lang3 + 3.6 + + + org.springframework + spring-web + 5.0.9.RELEASE + + + org.antlr + antlr4-runtime + 4.7 + + + net.jodah + failsafe + 2.0.1 + + + org.reflections + reflections + 0.9.11 + + + diff --git a/common/src/main/java/org/onap/so/client/aai/AAIClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectBase.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectBase.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIObjectBase.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectBase.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectType.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIObjectType.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectType.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIProperties.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIProperties.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIProperties.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIProperties.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIRestClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientI.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientI.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIUpdator.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdator.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIUpdator.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdator.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidator.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidator.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIValidator.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidator.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java diff --git a/common/src/main/java/org/onap/so/client/aai/AAIVersion.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIVersion.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/AAIVersion.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIVersion.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIError.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIError.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/AAIError.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIError.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/Configuration.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Configuration.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/Configuration.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Configuration.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/QueryStep.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/QueryStep.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/QueryStep.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/QueryStep.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/Relationships.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Relationships.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/Relationships.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Relationships.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/RequestError.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/RequestError.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/RequestError.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/RequestError.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/Results.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Results.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/Results.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Results.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/ServiceException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/ServiceException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/ServiceException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/ServiceException.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java diff --git a/common/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/Format.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/Format.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/Format.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/Format.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java similarity index 98% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java index babfa14d71..ea30deb791 100644 --- a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java @@ -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/common/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Id.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Id.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Id.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Id.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Node.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Node.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Node.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Node.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Output.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Output.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Output.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Output.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/Start.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Start.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/Start.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Start.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/__.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/__.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/__.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/__.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java diff --git a/common/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java b/graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java similarity index 100% rename from common/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java rename to graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIPServerTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIPServerTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIURITest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIURITest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIURITest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIURITest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java diff --git a/common/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java similarity index 100% rename from common/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java diff --git a/common/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java similarity index 100% rename from common/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java diff --git a/common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java diff --git a/common/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java diff --git a/common/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java b/graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java similarity index 100% rename from common/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java rename to graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java diff --git a/common/src/test/resources/__files/aai/bulkprocess/response-failure.json b/graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-failure.json similarity index 100% rename from common/src/test/resources/__files/aai/bulkprocess/response-failure.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-failure.json diff --git a/common/src/test/resources/__files/aai/bulkprocess/response-success.json b/graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-success.json similarity index 100% rename from common/src/test/resources/__files/aai/bulkprocess/response-success.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-success.json diff --git a/common/src/test/resources/__files/aai/bulkprocess/test-request-small.json b/graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request-small.json similarity index 100% rename from common/src/test/resources/__files/aai/bulkprocess/test-request-small.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request-small.json diff --git a/common/src/test/resources/__files/aai/bulkprocess/test-request.json b/graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request.json similarity index 100% rename from common/src/test/resources/__files/aai/bulkprocess/test-request.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request.json diff --git a/common/src/test/resources/__files/aai/error-message.json b/graph-inventory/aai-client/src/test/resources/__files/aai/error-message.json similarity index 100% rename from common/src/test/resources/__files/aai/error-message.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/error-message.json diff --git a/common/src/test/resources/__files/aai/pserver.json b/graph-inventory/aai-client/src/test/resources/__files/aai/pserver.json similarity index 100% rename from common/src/test/resources/__files/aai/pserver.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/pserver.json diff --git a/common/src/test/resources/__files/aai/query/pathed-result.json b/graph-inventory/aai-client/src/test/resources/__files/aai/query/pathed-result.json similarity index 100% rename from common/src/test/resources/__files/aai/query/pathed-result.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/query/pathed-result.json diff --git a/common/src/test/resources/__files/aai/query/single-query-result.json b/graph-inventory/aai-client/src/test/resources/__files/aai/query/single-query-result.json similarity index 100% rename from common/src/test/resources/__files/aai/query/single-query-result.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/query/single-query-result.json diff --git a/common/src/test/resources/__files/aai/resources/e2e-complex.json b/graph-inventory/aai-client/src/test/resources/__files/aai/resources/e2e-complex.json similarity index 100% rename from common/src/test/resources/__files/aai/resources/e2e-complex.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/resources/e2e-complex.json diff --git a/common/src/test/resources/__files/aai/resources/empty-query-result.json b/graph-inventory/aai-client/src/test/resources/__files/aai/resources/empty-query-result.json similarity index 100% rename from common/src/test/resources/__files/aai/resources/empty-query-result.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/resources/empty-query-result.json diff --git a/common/src/test/resources/__files/aai/resources/mockObject.json b/graph-inventory/aai-client/src/test/resources/__files/aai/resources/mockObject.json similarity index 100% rename from common/src/test/resources/__files/aai/resources/mockObject.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/resources/mockObject.json diff --git a/common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json b/graph-inventory/aai-client/src/test/resources/__files/aai/resources/service-instance-pathed-query.json similarity index 100% rename from common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/resources/service-instance-pathed-query.json diff --git a/common/src/test/resources/__files/aai/singletransaction/sample-request.json b/graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-request.json similarity index 100% rename from common/src/test/resources/__files/aai/singletransaction/sample-request.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-request.json diff --git a/common/src/test/resources/__files/aai/singletransaction/sample-response-failure.json b/graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response-failure.json similarity index 100% rename from common/src/test/resources/__files/aai/singletransaction/sample-response-failure.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response-failure.json diff --git a/common/src/test/resources/__files/aai/singletransaction/sample-response.json b/graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response.json similarity index 100% rename from common/src/test/resources/__files/aai/singletransaction/sample-response.json rename to graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response.json diff --git a/common/src/test/resources/aai.properties b/graph-inventory/aai-client/src/test/resources/aai.properties similarity index 100% rename from common/src/test/resources/aai.properties rename to graph-inventory/aai-client/src/test/resources/aai.properties diff --git a/graph-inventory/pom.xml b/graph-inventory/pom.xml new file mode 100644 index 0000000000..d01b0ec682 --- /dev/null +++ b/graph-inventory/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + org.onap.so + so + 1.6.0-SNAPSHOT + + graph-inventory + pom + + + aai-client + + diff --git a/mso-api-handlers/pom.xml b/mso-api-handlers/pom.xml index 5c84ab1d77..db939a6868 100644 --- a/mso-api-handlers/pom.xml +++ b/mso-api-handlers/pom.xml @@ -29,6 +29,11 @@ org.apache.httpcomponents httpclient + + org.onap.so + aai-client + ${project.version} + junit junit diff --git a/pom.xml b/pom.xml index 2e7c7cc65a..564e01e086 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ deployment-configs common + graph-inventory mso-catalog-db mso-api-handlers adapters diff --git a/so-simulator/pom.xml b/so-simulator/pom.xml index e264c534d2..7e996510ef 100644 --- a/so-simulator/pom.xml +++ b/so-simulator/pom.xml @@ -52,7 +52,7 @@ org.onap.so - common + aai-client ${project.version} -- 2.16.6