diff options
| -rw-r--r-- | adapters/pom.xml | 5 | ||||
| -rw-r--r-- | asdc-controller/pom.xml | 5 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/InjectionHelper.java | 6 | ||||
| -rw-r--r-- | bpmn/pom.xml | 5 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java | 16 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/orchestration/SDNOHealthCheckResources.java | 4 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java (renamed from common/src/main/java/org/onap/so/client/sdno/SDNOHealthCheckClient.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidator.java (renamed from common/src/main/java/org/onap/so/client/sdno/SDNOValidator.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java (renamed from common/src/main/java/org/onap/so/client/sdno/SDNOValidatorImpl.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/AAIParamList.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Body.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/Body.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/Input.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/Input.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/RequestHdCustom.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/RequestHealthDiagnostic.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/ResultInfo.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdno/beans/SDNO.java (renamed from common/src/main/java/org/onap/so/client/sdno/beans/SDNO.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/SDNOHealthCheckResourcesTest.java | 7 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java (renamed from common/src/test/java/org/onap/so/client/sdno/SDNOHealthCheckClientTest.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorIT.java (renamed from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorTest.java) | 14 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java (renamed from common/src/test/java/org/onap/so/client/sdno/SDNOValidatorImplTest.java) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/application-test.yaml | 10 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json (renamed from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json (renamed from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json (renamed from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json (renamed from common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-failure.json (renamed from common/src/test/resources/org/onap/so/client/sdno/output-failure.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/output-success.json (renamed from common/src/test/resources/org/onap/so/client/sdno/output-success.json) | 0 | ||||
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/test/resources/org/onap/so/client/sdno/response.json (renamed from common/src/test/resources/org/onap/so/client/sdno/response.json) | 0 | ||||
| -rw-r--r-- | common/pom.xml | 5 | ||||
| -rw-r--r-- | common/src/main/java/org/onap/so/client/aai/AAIConfigurationClient.java | 84 | ||||
| -rw-r--r-- | common/src/test/java/org/onap/so/client/aai/AAIConfigurationClientTest.java | 156 | ||||
| -rw-r--r-- | graph-inventory/aai-client/pom.xml | 207 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIClientResponseExceptionMapper.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java (renamed from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperPatchProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java (renamed from common/src/main/java/org/onap/so/client/aai/AAICommonObjectMapperProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIDSLQueryClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIErrorFormatter.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java (renamed from common/src/main/java/org/onap/so/client/aai/AAINamespaceConstants.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectBase.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIObjectBase.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIObjectPlurals.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIObjectType.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIObjectType.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIProperties.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIProperties.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIQueryClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIQueryObjectMapperProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIResourcesObjectMapperProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIRestClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientI.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAISingleTransactionClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java (renamed from common/src/main/java/org/onap/so/client/aai/AAITransactionalClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdator.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIUpdator.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIUpdatorImpl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidator.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIValidator.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/AAIVersion.java (renamed from common/src/main/java/org/onap/so/client/aai/AAIVersion.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/AAIEntity.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/AAIEntityObject.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIError.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/AAIError.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/AAIResultWrapper.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Configuration.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/Configuration.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/CustomQuery.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/QueryStep.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/QueryStep.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Relationships.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/Relationships.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/RequestError.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/RequestError.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/Results.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/Results.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/ServiceException.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/ServiceException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBody.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/OperationBodySerializer.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transaction.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/bulkprocess/Transactions.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyRequestSerializer.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/OperationBodyResponse.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionRequest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/singletransaction/SingleTransactionResponse.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIBaseResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIPluralResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimplePluralUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAISimpleUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AAIUriFactory.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/HttpLookupUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesPluralUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesSingleUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/NodesUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java (renamed from common/src/main/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/EmptyStringToNullSerializer.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/Format.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/Format.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperPatchProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryCommonObjectMapperProvider.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectBase.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectName.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectPlurals.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectType.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriPartial.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryObjectUriTemplate.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverter.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryQueryClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryResourcesClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryRestClient.java) | 3 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventorySubgraphType.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryTransactionClient.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/GraphInventoryVersion.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/TransactionBuilder.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeBase.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLNodeKey.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLOutputNode.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQuery.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLQueryBuilder.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLStartNode.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/DSLTraversal.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryEdgeLabel.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryRelationships.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/GraphInventoryResultWrapper.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Id.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Id.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Node.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Node.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Output.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Output.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Pathed.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Resource.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/ResourceAndUrl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/Start.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/Start.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/TraversalBuilder.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/__.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/__.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/Depth.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryPluralResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventorySingleResourceUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/GraphInventoryUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/HttpAwareUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleBaseUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimplePluralUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/SimpleUri.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParser.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImpl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/BulkProcessFailed.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryMultipleItemsException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPatchDepthExceededException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriComputationException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryUriNotFoundException.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java (renamed from common/src/main/java/org/onap/so/client/graphinventory/exceptions/IncorrectNumberOfUriKeys.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIClientResponseExceptionMapperTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIErrorFormatterTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIObjectTypeTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIPServerTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIPServerTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIQueryClientTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIResourcesClientWithServiceInstanceUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIRestClientTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAISingleTransactionClientTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAITransactionalClientTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIURITest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIURITest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIUpdatorImplTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIUpdatorTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java (renamed from common/src/test/java/org/onap/so/client/aai/AAIValidatorTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java (renamed from common/src/test/java/org/onap/so/client/aai/DSLQueryBuilderTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/AAIResultWrapperTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/RelationshipsTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromParentUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriFromUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/AAISimpleUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/AAIUriFactoryTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/AllottedResourceLookupUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/IncorrectNumberOfUriKeysTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java (renamed from common/src/test/java/org/onap/so/client/aai/entities/uri/ServiceInstanceUriTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java (renamed from common/src/test/java/org/onap/so/client/aai/objects/CustomAAIObjectType.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java (renamed from common/src/test/java/org/onap/so/client/defaultproperties/DefaultAAIPropertiesImpl.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java (renamed from common/src/test/java/org/onap/so/client/graphinventory/GraphInventoryPatchConverterTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java (renamed from common/src/test/java/org/onap/so/client/graphinventory/entities/uri/parsers/UriParserSpringImplTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java (renamed from common/src/test/java/org/onap/so/client/graphinventory/exceptions/GraphInventoryPayloadExceptionTest.java) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-failure.json (renamed from common/src/test/resources/__files/aai/bulkprocess/response-failure.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/response-success.json (renamed from common/src/test/resources/__files/aai/bulkprocess/response-success.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request-small.json (renamed from common/src/test/resources/__files/aai/bulkprocess/test-request-small.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/bulkprocess/test-request.json (renamed from common/src/test/resources/__files/aai/bulkprocess/test-request.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/error-message.json (renamed from common/src/test/resources/__files/aai/error-message.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/pserver.json (renamed from common/src/test/resources/__files/aai/pserver.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/query/pathed-result.json (renamed from common/src/test/resources/__files/aai/query/pathed-result.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/query/single-query-result.json (renamed from common/src/test/resources/__files/aai/query/single-query-result.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/resources/e2e-complex.json (renamed from common/src/test/resources/__files/aai/resources/e2e-complex.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/resources/empty-query-result.json (renamed from common/src/test/resources/__files/aai/resources/empty-query-result.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/resources/mockObject.json (renamed from common/src/test/resources/__files/aai/resources/mockObject.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/resources/service-instance-pathed-query.json (renamed from common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-request.json (renamed from common/src/test/resources/__files/aai/singletransaction/sample-request.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response-failure.json (renamed from common/src/test/resources/__files/aai/singletransaction/sample-response-failure.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/__files/aai/singletransaction/sample-response.json (renamed from common/src/test/resources/__files/aai/singletransaction/sample-response.json) | 0 | ||||
| -rw-r--r-- | graph-inventory/aai-client/src/test/resources/aai.properties (renamed from common/src/test/resources/aai.properties) | 0 | ||||
| -rw-r--r-- | graph-inventory/pom.xml | 15 | ||||
| -rw-r--r-- | mso-api-handlers/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | so-simulator/pom.xml | 2 |
196 files changed, 284 insertions, 266 deletions
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 @@ <artifactId>spring-cloud-contract-wiremock</artifactId> <version>1.2.4.RELEASE</version> </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> 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 @@ <groupId>javax.interceptor</groupId> <artifactId>javax.interceptor-api</artifactId> </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> 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 @@ <artifactId>spring-boot-starter-data-jpa</artifactId> <optional>true</optional> </dependency> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/helper/TasksInjectionHelper.java new file mode 100644 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 index 9b857dc08c..9b857dc08c 100644 --- 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 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 index 83624dec63..83624dec63 100644 --- 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 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 index 8e674fb77b..8e674fb77b 100644 --- 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 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 index 7e98355b4d..7e98355b4d 100644 --- 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 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 index 8c40b749a6..8c40b749a6 100644 --- 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 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 index c8122c06f6..c8122c06f6 100644 --- 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 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 index 485f64673f..485f64673f 100644 --- 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 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 index b1b75ab412..b1b75ab412 100644 --- 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 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 index 8b84cf6659..8b84cf6659 100644 --- 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 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 index 46e2c1d1fc..46e2c1d1fc 100644 --- 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 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 index 750e578558..750e578558 100644 --- 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 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 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 index c2278c26f9..c2278c26f9 100644 --- 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 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 index 2c46b5a8cb..2c46b5a8cb 100644 --- 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 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 index bf168b0028..bf168b0028 100644 --- 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 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 index 89e505e7d0..89e505e7d0 100644 --- 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 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 index 86897c8a1f..86897c8a1f 100644 --- 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 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 index 8cf0a820cd..8cf0a820cd 100644 --- 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 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 index a6794327d8..a6794327d8 100644 --- 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 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 index 2355e86938..2355e86938 100644 --- 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 diff --git a/common/pom.xml b/common/pom.xml index b998a0adfa..ab498f8844 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -56,11 +56,6 @@ <artifactId>spring-webmvc</artifactId> </dependency> <dependency> - <groupId>org.onap.aai.schema-service</groupId> - <artifactId>aai-schema</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> <groupId>org.modelmapper</groupId> <artifactId>modelmapper</artifactId> <version>1.1.0</version> 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<Configuration> expectedConfiguration = Optional.of(new Configuration()); - expectedConfiguration.get().setConfigurationId(uuid); - - doReturn(expectedConfiguration).when(aaiClient).get(isA(Class.class), isA(AAIResourceUri.class)); - Configuration actualConfiguration = aaiConfigurationClient.getConfiguration(uuid); - verify(aaiClient, times(1)).get(Configuration.class, aaiConfigurationClient.getConfigurationURI(uuid)); - assertEquals(expectedConfiguration.get(), actualConfiguration); - } - - @Test - public void testConfigurationExists() { - String uuid = UUID.randomUUID().toString(); - AAIResourceUri uri = aaiConfigurationClient.getConfigurationURI(uuid); - boolean expectedResult; - boolean actualResult; - - expectedResult = true; - doReturn(expectedResult).when(aaiClient).exists(isA(AAIResourceUri.class)); - actualResult = aaiConfigurationClient.configurationExists(uuid); - assertEquals(expectedResult, actualResult); - - expectedResult = false; - doReturn(expectedResult).when(aaiClient).exists(isA(AAIResourceUri.class)); - actualResult = aaiConfigurationClient.configurationExists(uuid); - assertEquals(expectedResult, actualResult); - - verify(aaiClient, times(2)).exists(uri); - } - - @Test - public void testGetConfigurationURI() { - String uuid = UUID.randomUUID().toString(); - AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.CONFIGURATION, uuid); - assertEquals(uri, aaiConfigurationClient.getConfigurationURI(uuid)); - } -} diff --git a/graph-inventory/aai-client/pom.xml b/graph-inventory/aai-client/pom.xml new file mode 100644 index 0000000000..c8b10cce1f --- /dev/null +++ b/graph-inventory/aai-client/pom.xml @@ -0,0 +1,207 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so</groupId> + <artifactId>graph-inventory</artifactId> + <version>1.6.0-SNAPSHOT</version> + </parent> + <artifactId>aai-client</artifactId> + <dependencies> + <dependency> + <groupId>org.onap.so</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>22.0</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>3.2.5</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.9.6</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.9.6</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>2.9.6</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.9.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-slf4j</artifactId> + <version>1.6.6</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <version>1.6.6</version> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-spring</artifactId> + <version>1.6.6</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-standalone</artifactId> + <version>2.13.0</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.skyscreamer</groupId> + <artifactId>jsonassert</artifactId> + </exclusion> + <exclusion> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + </exclusion> + <exclusion> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + </exclusion> + <exclusion> + <groupId>net.sf.jopt-simple</groupId> + <artifactId>jopt-simple</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>2.20.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.shazam</groupId> + <artifactId>shazamcrest</artifactId> + <version>0.11</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.aai.schema-service</groupId> + <artifactId>aai-schema</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>5.0.9.RELEASE</version> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.7</version> + </dependency> + <dependency> + <groupId>net.jodah</groupId> + <artifactId>failsafe</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>0.9.11</version> + </dependency> + </dependencies> +</project> 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 index d376d85a83..d376d85a83 100644 --- 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 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 index 66ea8f950e..66ea8f950e 100644 --- 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 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 index bb2b2eca19..bb2b2eca19 100644 --- 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 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 index b75f40eb39..b75f40eb39 100644 --- 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 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 index 1747d97633..1747d97633 100644 --- 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 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 index e255b297ed..e255b297ed 100644 --- 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 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 index 1225bb3fd5..1225bb3fd5 100644 --- 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 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 index dab3cda32b..dab3cda32b 100644 --- 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 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 index d14a4bedc3..d14a4bedc3 100644 --- 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 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 index c9b69cd9e4..c9b69cd9e4 100644 --- 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 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 index 6505818758..6505818758 100644 --- 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 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 index 634a65831f..634a65831f 100644 --- 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 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 index 8f16d815b6..8f16d815b6 100644 --- 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 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 index 8e334de396..8e334de396 100644 --- 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 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 index 875571d71e..875571d71e 100644 --- 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 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 index 610ff728e9..610ff728e9 100644 --- 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 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 index 2698bc347f..2698bc347f 100644 --- 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 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 index f2f96ca905..f2f96ca905 100644 --- 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 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 index 687ff09c5a..687ff09c5a 100644 --- 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 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 index a8cd8bae39..a8cd8bae39 100644 --- 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 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 index e8a2bc6c9c..e8a2bc6c9c 100644 --- 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 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 index b2223be688..b2223be688 100644 --- 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 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 index f191311b2a..f191311b2a 100644 --- 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 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 index 96844ff1cb..96844ff1cb 100644 --- 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 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 index 42887884db..42887884db 100644 --- 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 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 index 456f14e5ee..456f14e5ee 100644 --- 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 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 index ee3ffd9bbf..ee3ffd9bbf 100644 --- 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 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 index 5989a6579d..5989a6579d 100644 --- 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 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 index 10828acd96..10828acd96 100644 --- 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 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 index ab3284dd8f..ab3284dd8f 100644 --- 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 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 index 81c07b2cf4..81c07b2cf4 100644 --- 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 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 index 3433e36151..3433e36151 100644 --- 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 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 index c662b4e465..c662b4e465 100644 --- 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 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 index 91f2ee121e..91f2ee121e 100644 --- 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 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 index 1a9001df11..1a9001df11 100644 --- 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 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 index a62c6adec1..a62c6adec1 100644 --- 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 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 index de08dd9a81..de08dd9a81 100644 --- 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 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 index 45f2c965f9..45f2c965f9 100644 --- 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 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 index 7181e96aa4..7181e96aa4 100644 --- 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 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 index 3b4351d768..3b4351d768 100644 --- 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 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 index 69e8a18a3e..69e8a18a3e 100644 --- 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 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 index b2d67af156..b2d67af156 100644 --- 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 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 index addc3f1364..addc3f1364 100644 --- 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 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 index c5b11fe1f7..c5b11fe1f7 100644 --- 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 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 index af32ca9498..af32ca9498 100644 --- 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 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 index 525956c5a9..525956c5a9 100644 --- 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 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 index 67f858a2bf..67f858a2bf 100644 --- 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 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 index 2cec021c95..2cec021c95 100644 --- 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 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 index e93d52889a..e93d52889a 100644 --- 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 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 index 9ab45a8aa9..9ab45a8aa9 100644 --- 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 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 index 49dab59fc1..49dab59fc1 100644 --- 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 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 index 8101643b78..8101643b78 100644 --- 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 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 index bdd3921851..bdd3921851 100644 --- 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 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 index 30e60cdff2..30e60cdff2 100644 --- 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 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 index a0f1962706..a0f1962706 100644 --- 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 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 index 8545fc96fb..8545fc96fb 100644 --- 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 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 index 7274b1f3b9..7274b1f3b9 100644 --- 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 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 index 6e5fa77f76..6e5fa77f76 100644 --- 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 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 index 0b62d05c67..0b62d05c67 100644 --- 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 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 index c483bd2caf..c483bd2caf 100644 --- 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 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 index 078b35aaf4..078b35aaf4 100644 --- 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 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 index 09efb5a48d..09efb5a48d 100644 --- 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 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 index 2facdaa64e..2facdaa64e 100644 --- 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 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 index a4f9496d17..a4f9496d17 100644 --- 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 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 index 72de833884..72de833884 100644 --- 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 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 index bb547e30e8..bb547e30e8 100644 --- 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 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 index 84604a76cf..84604a76cf 100644 --- 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 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 index d09a83a644..d09a83a644 100644 --- 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 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 index 0207595f7f..0207595f7f 100644 --- 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 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 index bcc26535ff..bcc26535ff 100644 --- 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 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 index d1bc6bc61e..d1bc6bc61e 100644 --- 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 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 index 3ff564fcb2..3ff564fcb2 100644 --- 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 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 index f446e5ac4c..f446e5ac4c 100644 --- 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 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 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 index d30f481ac8..d30f481ac8 100644 --- 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 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 index 8ee5ca4e80..8ee5ca4e80 100644 --- 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 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 index 3b7dba70f8..3b7dba70f8 100644 --- 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 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 index 3c69f70b11..3c69f70b11 100644 --- 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 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 index 5802e9c4e8..5802e9c4e8 100644 --- 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 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 index e301edb0fd..e301edb0fd 100644 --- 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 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 index d799795650..d799795650 100644 --- 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 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 index 1fa79a714c..1fa79a714c 100644 --- 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 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 index 7ff6e2ed22..7ff6e2ed22 100644 --- 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 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 index fb0772726f..fb0772726f 100644 --- 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 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 index 40f80463b2..40f80463b2 100644 --- 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 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 index e3542e863a..e3542e863a 100644 --- 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 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 index 6e7b9c9f08..6e7b9c9f08 100644 --- 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 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 index 6a571038ee..6a571038ee 100644 --- 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 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 index 2951bc8d45..2951bc8d45 100644 --- 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 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 index cdaae7d91f..cdaae7d91f 100644 --- 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 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 index 06b8b65984..06b8b65984 100644 --- 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 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 index b848f1c597..b848f1c597 100644 --- 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 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 index 1e7169d092..1e7169d092 100644 --- 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 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 index 326bd06dfb..326bd06dfb 100644 --- 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 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 index c649e36eca..c649e36eca 100644 --- 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 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 index 0af29f78e6..0af29f78e6 100644 --- 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 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 index ca0bd9e00d..ca0bd9e00d 100644 --- 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 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 index d91f36c0c7..d91f36c0c7 100644 --- 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 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 index aa09702be8..aa09702be8 100644 --- 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 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 index 64933863d5..64933863d5 100644 --- 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 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 index e45ff14a5e..e45ff14a5e 100644 --- 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 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 index e3fda2fa23..e3fda2fa23 100644 --- 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 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 index 1ee3d57b6c..1ee3d57b6c 100644 --- 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 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 index fc1a008466..fc1a008466 100644 --- 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 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 index c0b6d573c1..c0b6d573c1 100644 --- 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 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 index aff7392efe..aff7392efe 100644 --- 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 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 index 00000268a7..00000268a7 100644 --- 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 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 index 71afdb83d9..71afdb83d9 100644 --- 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 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 index d69e83435b..d69e83435b 100644 --- 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 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 index d3c17ce9e9..d3c17ce9e9 100644 --- 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 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 index fe5f159291..fe5f159291 100644 --- 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 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 index 45ebf9ee46..45ebf9ee46 100644 --- 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 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 index 380bce7165..380bce7165 100644 --- 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 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 index 6637c89402..6637c89402 100644 --- 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 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 index ede8e481b2..ede8e481b2 100644 --- 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 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 index 7af36b0bdd..7af36b0bdd 100644 --- 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 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 index 3587c71de0..3587c71de0 100644 --- 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 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 index 20a6678386..20a6678386 100644 --- 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 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 index 4b3b7e9881..4b3b7e9881 100644 --- 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 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 index c70f16eb83..c70f16eb83 100644 --- 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 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 index a7fd6e904e..a7fd6e904e 100644 --- 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 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 index 55da6e7d52..55da6e7d52 100644 --- 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 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 index 2f551fecc4..2f551fecc4 100644 --- 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 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 index b07d893adb..b07d893adb 100644 --- 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 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 index cbcb60513b..cbcb60513b 100644 --- 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 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 index 8971f91602..8971f91602 100644 --- 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 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 index fdfe41f12a..fdfe41f12a 100644 --- 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 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 index d18dbec944..d18dbec944 100644 --- 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 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 index b91d0e705a..b91d0e705a 100644 --- 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 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 index 1a1a7d124e..1a1a7d124e 100644 --- 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 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 index 157109c119..157109c119 100644 --- 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 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 index 039bbb3614..039bbb3614 100644 --- 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 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 index 0249bea794..0249bea794 100644 --- 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 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 index 6bf67ffce8..6bf67ffce8 100644 --- 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 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 index 6c1b3d69a2..6c1b3d69a2 100644 --- 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 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 index 8a203f6439..8a203f6439 100644 --- 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 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 index a92a7c3c1a..a92a7c3c1a 100644 --- 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 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 index 3fbbc7c110..3fbbc7c110 100644 --- 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 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 index 71d65b6f45..71d65b6f45 100644 --- 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 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 index f437197f71..f437197f71 100644 --- 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 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 index 7789386667..7789386667 100644 --- 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 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 index 1f047b3b36..1f047b3b36 100644 --- 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 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 index fb26e1870e..fb26e1870e 100644 --- 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 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 index 6b23cbbe86..6b23cbbe86 100644 --- 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 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 index bbc2c38b76..bbc2c38b76 100644 --- 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 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 index 7dae38335a..7dae38335a 100644 --- 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 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 index 973928108f..973928108f 100644 --- 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 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 index 5a2953c632..5a2953c632 100644 --- 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 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 index 155232294a..155232294a 100644 --- a/common/src/test/resources/__files/aai/error-message.json +++ b/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 index 1a3f40aac3..1a3f40aac3 100644 --- a/common/src/test/resources/__files/aai/pserver.json +++ b/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 index e9a3e65c73..e9a3e65c73 100644 --- 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 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 index eb12deae80..eb12deae80 100644 --- 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 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 index e3d830e978..e3d830e978 100644 --- 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 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 index 914332edba..914332edba 100644 --- 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 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 index 2f97b47dd3..2f97b47dd3 100644 --- a/common/src/test/resources/__files/aai/resources/mockObject.json +++ b/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 index 0fa9515820..0fa9515820 100644 --- 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 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 index 69024dca83..69024dca83 100644 --- 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 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 index d0b0e39924..d0b0e39924 100644 --- 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 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 index a5b322ee2e..a5b322ee2e 100644 --- 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 diff --git a/common/src/test/resources/aai.properties b/graph-inventory/aai-client/src/test/resources/aai.properties index 2936e841bb..2936e841bb 100644 --- a/common/src/test/resources/aai.properties +++ b/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 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.so</groupId> + <artifactId>so</artifactId> + <version>1.6.0-SNAPSHOT</version> + </parent> + <artifactId>graph-inventory</artifactId> + <packaging>pom</packaging> + <modules> + <!-- <module>fluent-builder-maven-plugin</module>--> + <module>aai-client</module> + </modules> +</project> 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 @@ -30,6 +30,11 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> + <groupId>org.onap.so</groupId> + <artifactId>aai-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -24,6 +24,7 @@ <modules> <module>deployment-configs</module> <module>common</module> + <module>graph-inventory</module> <module>mso-catalog-db</module> <module>mso-api-handlers</module> <module>adapters</module> 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 @@ </dependency> <dependency> <groupId>org.onap.so</groupId> - <artifactId>common</artifactId> + <artifactId>aai-client</artifactId> <version>${project.version}</version> </dependency> <dependency> |