From b77f6b5174b0fa91c052f68a99dd72da13a5b62e Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 31 Jul 2025 15:42:38 +0200 Subject: [PATCH] Create common/clients module - move client-related code into a dedicated clients module inside the common pom to allow better exclusion of unwanted dependencies - in the future all clients should have their own module to selectively include them Issue-ID: SO-4215 Change-Id: Iee70dccf5c520d6b09c6de875b1f752e8a256d8f Signed-off-by: Fiete Ostkamp --- common/clients-base/pom.xml | 4 + .../java/org/onap/so/client/HttpClientFactory.java | 2 +- common/clients/pom.xml | 125 +++++++++++++++++++++ .../so/client/adapter/rest/AdapterRestClient.java | 0 .../client/adapter/rest/AdapterRestProperties.java | 0 .../so/client/cds/BasicAuthClientInterceptor.java | 0 .../onap/so/client/cds/CDSProcessingClient.java | 0 .../onap/so/client/cds/CDSProcessingHandler.java | 0 .../onap/so/client/cds/CDSProcessingListener.java | 0 .../java/org/onap/so/client/cds/CDSProperties.java | 0 .../DefaultDmaapPropertiesImpl.java | 0 .../PolicyRestPropertiesImpl.java | 0 .../java/org/onap/so/client/dmaap/Consumer.java | 0 .../java/org/onap/so/client/dmaap/DmaapClient.java | 0 .../org/onap/so/client/dmaap/DmaapConsumer.java | 0 .../org/onap/so/client/dmaap/DmaapProperties.java | 0 .../so/client/dmaap/DmaapPropertiesLoader.java | 0 .../org/onap/so/client/dmaap/DmaapPublisher.java | 0 .../java/org/onap/so/client/dmaap/Publisher.java | 0 .../dmaap/exceptions/DMaaPConsumerFailure.java | 0 .../exceptions/ExceededMaximumPollingTime.java | 0 .../onap/so/client/dmaap/rest/DMaaPRestClient.java | 0 .../onap/so/client/dmaap/rest/PropertiesBean.java | 0 .../onap/so/client/dmaap/rest/RestConsumer.java | 0 .../onap/so/client/dmaap/rest/RestPublisher.java | 0 .../so/client/exception/BadResponseException.java | 0 .../onap/so/client/exception/MapperException.java | 0 .../onap/so/client/exceptions/SDNOException.java | 0 .../java/org/onap/so/client/grm/GRMAction.java | 0 .../java/org/onap/so/client/grm/GRMClient.java | 0 .../java/org/onap/so/client/grm/GRMProperties.java | 0 .../onap/so/client/grm/GRMPropertiesLoader.java | 0 .../java/org/onap/so/client/grm/GRMRestClient.java | 0 .../org/onap/so/client/grm/GRMRestInvoker.java | 0 .../onap/so/client/grm/beans/OperationalInfo.java | 0 .../org/onap/so/client/grm/beans/Property.java | 0 .../onap/so/client/grm/beans/ServiceEndPoint.java | 0 .../so/client/grm/beans/ServiceEndPointList.java | 0 .../so/client/grm/beans/ServiceEndPointLookup.java | 0 .../grm/beans/ServiceEndPointLookupRequest.java | 0 .../client/grm/beans/ServiceEndPointRequest.java | 0 .../java/org/onap/so/client/grm/beans/Status.java | 0 .../java/org/onap/so/client/grm/beans/Version.java | 0 .../onap/so/client/grm/beans/VersionLookup.java | 0 .../client/grm/exceptions/GRMClientCallFailed.java | 0 .../java/org/onap/so/client/kafka/KafkaClient.java | 0 .../onap/so/client/kafka/KafkaConsumerImpl.java | 0 .../onap/so/client/policy/DecisionAttributes.java | 0 .../client/policy/JettisonStyleMapperProvider.java | 0 .../org/onap/so/client/policy/PolicyClient.java | 0 .../onap/so/client/policy/PolicyClientImpl.java | 0 .../onap/so/client/policy/PolicyRestClient.java | 0 .../so/client/policy/PolicyRestProperties.java | 0 .../client/policy/entities/AllowedTreatments.java | 0 .../org/onap/so/client/policy/entities/Bbid.java | 0 .../org/onap/so/client/policy/entities/Config.java | 0 .../policy/entities/ConfigRequestParameters.java | 0 .../onap/so/client/policy/entities/Content.java | 0 .../client/policy/entities/DecisionAttributes.java | 0 .../so/client/policy/entities/DictionaryData.java | 0 .../policy/entities/DictionaryItemsRequest.java | 0 .../so/client/policy/entities/DictionaryJson.java | 0 .../client/policy/entities/FabricConfigModel.java | 0 .../org/onap/so/client/policy/entities/Id.java | 0 .../so/client/policy/entities/PolicyConfig.java | 0 .../so/client/policy/entities/PolicyDecision.java | 0 .../policy/entities/PolicyDecisionRequest.java | 0 .../client/policy/entities/PolicyServiceType.java | 0 .../onap/so/client/policy/entities/Treatments.java | 0 .../onap/so/client/policy/entities/Workstep.java | 0 .../sdno/dmaap/SDNOHealthCheckDmaapConsumer.java | 0 .../sdno/dmaap/SDNOHealthCheckDmaapPublisher.java | 0 .../resources/dmaap/default-consumer.properties | 0 .../resources/dmaap/default-publisher.properties | 0 .../src/main/resources/dmaap/empty.txt | 0 .../resources/kafka/default-consumer.properties | 0 .../java/org/onap/so/client/HttpClientTest.java | 12 +- .../java/org/onap/so/client/RestClientTest.java | 0 .../client/adapter/rest/AdapterRestClientTest.java | 0 .../so/client/cds/CDSProcessingClientTest.java | 0 .../so/client/cds/TestCDSProcessingListener.java | 0 .../onap/so/client/cds/TestCDSPropertiesImpl.java | 0 .../org/onap/so/client/dmaap/DmaapClientTest.java | 0 .../dmaap/exceptions/DMaaPConsumerFailureTest.java | 0 .../so/client/dmaap/rest/DMaaPRestClientTest.java | 0 .../java/org/onap/so/client/grm/GRMBeansTest.java | 0 .../so/client/grm/ServiceEndPointListTest.java | 0 .../so/client/grm/ServiceEndPointRequestTest.java | 0 .../grm/exception/GRMClientCallFailedTest.java | 0 .../so/client/kafka/KafkaConsumerImplTest.java | 0 .../so/client/policy/PolicyClientImplTest.java | 0 .../client/policy/entities/PolicyEntitiesTest.java | 0 .../onap/so/client/sdno/beans/SdnoBeansTest.java | 0 .../services/org.onap.so.client.RestProperties | 0 .../test/resources/__files/Policy/configJson.json | 0 .../__files/Policy/policyAbortResponse.json | 0 .../resources/__files/Policy/policyConfig.json | 0 .../__files/Policy/policySkipResponse.json | 0 .../src/test/resources/__files/grm/endpoints.json | 0 .../src/test/resources/__files/grm/endpoints2.json | 0 .../__files/logging/openstack-payload.json | 0 .../src/test/resources/dmaap.properties | 0 .../src/test/resources/policy.properties | 0 common/common/pom.xml | 102 +++-------------- .../src/test/java/org/onap/so/BeansTest.java | 5 +- .../onap/so/{utils => logging}/TestAppender.java | 6 +- .../src/test/resources/application-test.yaml | 5 +- common/common/src/test/resources/logback-test.xml | 10 +- common/pom.xml | 2 + common/utils/pom.xml | 61 ++++++++++ .../onap/so/exceptions/MarshallerException.java | 0 .../java/org/onap/so/jsonpath/JsonPathUtil.java | 0 .../main/java/org/onap/so/utils/CheckResults.java | 0 .../main/java/org/onap/so/utils/Components.java | 0 .../main/java/org/onap/so/utils/CryptoUtils.java | 0 .../onap/so/utils/ExternalTaskServiceUtils.java | 0 .../java/org/onap/so/utils/ExternalTaskUtils.java | 0 .../java/org/onap/so/utils/RetrySequenceLevel.java | 0 .../main/java/org/onap/so/utils/UUIDChecker.java | 0 .../main/java/org/onap/so/utils/XmlMarshaller.java | 0 .../org/onap/so/jsonpath/JsonPathUtilTest.java | 0 .../java/org/onap/so/utils/CheckResultsTest.java | 0 .../so/utils/ExternalTaskServiceUtilsTest.java | 0 .../org/onap/so/utils/ExternalTaskUtilsTest.java | 0 .../java/org/onap/so/utils/UUIDCheckerTest.java | 0 .../java/org/onap/so/utils/XMLMarshallerTest.java | 0 pom.xml | 8 -- .../java/org/onap/so/client/sdno/BeansTest.java | 69 ++++++++++++ 128 files changed, 296 insertions(+), 115 deletions(-) create mode 100644 common/clients/pom.xml rename common/{common => clients}/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/cds/CDSProperties.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/Consumer.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/DmaapClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/Publisher.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/exception/BadResponseException.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/exception/MapperException.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/exceptions/SDNOException.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMAction.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMProperties.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMRestClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/Property.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/Status.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/Version.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/kafka/KafkaClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/DecisionAttributes.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/PolicyClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/PolicyRestClient.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Bbid.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Config.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Content.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Id.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Treatments.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/policy/entities/Workstep.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java (100%) rename common/{common => clients}/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java (100%) rename common/{common => clients}/src/main/resources/dmaap/default-consumer.properties (100%) rename common/{common => clients}/src/main/resources/dmaap/default-publisher.properties (100%) rename common/{common => clients}/src/main/resources/dmaap/empty.txt (100%) rename common/{common => clients}/src/main/resources/kafka/default-consumer.properties (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/HttpClientTest.java (96%) rename common/{common => clients}/src/test/java/org/onap/so/client/RestClientTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/grm/GRMBeansTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java (100%) rename common/{common => clients}/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java (100%) rename common/{common => clients}/src/test/resources/META-INF/services/org.onap.so.client.RestProperties (100%) rename common/{common => clients}/src/test/resources/__files/Policy/configJson.json (100%) rename common/{common => clients}/src/test/resources/__files/Policy/policyAbortResponse.json (100%) rename common/{common => clients}/src/test/resources/__files/Policy/policyConfig.json (100%) rename common/{common => clients}/src/test/resources/__files/Policy/policySkipResponse.json (100%) rename common/{common => clients}/src/test/resources/__files/grm/endpoints.json (100%) rename common/{common => clients}/src/test/resources/__files/grm/endpoints2.json (100%) rename common/{common => clients}/src/test/resources/__files/logging/openstack-payload.json (100%) rename common/{common => clients}/src/test/resources/dmaap.properties (100%) rename common/{common => clients}/src/test/resources/policy.properties (100%) rename common/common/src/test/java/org/onap/so/{utils => logging}/TestAppender.java (97%) create mode 100644 common/utils/pom.xml rename common/{common => utils}/src/main/java/org/onap/so/exceptions/MarshallerException.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/CheckResults.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/Components.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/CryptoUtils.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/ExternalTaskUtils.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/RetrySequenceLevel.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/UUIDChecker.java (100%) rename common/{common => utils}/src/main/java/org/onap/so/utils/XmlMarshaller.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/utils/CheckResultsTest.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/utils/UUIDCheckerTest.java (100%) rename common/{common => utils}/src/test/java/org/onap/so/utils/XMLMarshallerTest.java (100%) create mode 100644 so-sdn-clients/src/test/java/org/onap/so/client/sdno/BeansTest.java diff --git a/common/clients-base/pom.xml b/common/clients-base/pom.xml index 44be628d69..3b9cf68370 100644 --- a/common/clients-base/pom.xml +++ b/common/clients-base/pom.xml @@ -11,6 +11,10 @@ + + org.springframework.boot + spring-boot + org.onap.so logger diff --git a/common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java b/common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java index 84a8bb9fb1..ba599a355a 100644 --- a/common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java +++ b/common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java @@ -30,7 +30,7 @@ public class HttpClientFactory { } public HttpClient newXmlClient(URL host, ONAPComponentsList targetEntity) { - return new HttpClient(host, MediaType.APPLICATION_XML, targetEntity); + return new HttpClient(host, MediaType.APPLICATION_XML, MediaType.APPLICATION_XML, targetEntity); } public HttpClient newTextXmlClient(URL host, ONAPComponentsList targetEntity) { diff --git a/common/clients/pom.xml b/common/clients/pom.xml new file mode 100644 index 0000000000..955a0491e6 --- /dev/null +++ b/common/clients/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + org.onap.so + common + 1.16.0-SNAPSHOT + + + org.onap.so.common + clients + + + 1.1.5 + 3.22.2 + 4.1.30.Final + + + + + org.onap.so + utils + ${project.version} + + + org.onap.so + clients-base + ${project.version} + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.inject + jersey-hk2 + + + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-proto + ${ccsdk.version} + + + io.springfox + springfox-boot-starter + + + org.apache.kafka + kafka-clients + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + com.google.code.findbugs + jsr305 + + + + + io.grpc + grpc-netty + ${grpc.version} + + + org.apache.kafka + kafka-clients + ${kafka-clients.version} + + + uk.org.webcompere + system-stubs-jupiter + 1.1.0 + test + + + io.grpc + grpc-testing + ${grpc.version} + test + + + org.json + json + test + + + org.mockito + mockito-junit-jupiter + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.projectlombok + lombok + provided + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + + diff --git a/common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java b/common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java rename to common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java diff --git a/common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java b/common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java rename to common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java diff --git a/common/common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java b/common/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java rename to common/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java diff --git a/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java b/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java rename to common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java diff --git a/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java b/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java rename to common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java diff --git a/common/common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java b/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java rename to common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java diff --git a/common/common/src/main/java/org/onap/so/client/cds/CDSProperties.java b/common/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/cds/CDSProperties.java rename to common/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java diff --git a/common/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java b/common/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java rename to common/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java diff --git a/common/common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java b/common/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java rename to common/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/Consumer.java b/common/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/Consumer.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java b/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java b/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java b/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java b/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java b/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/Publisher.java b/common/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/Publisher.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java b/common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java b/common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java b/common/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java b/common/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java b/common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java diff --git a/common/common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java b/common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java rename to common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java diff --git a/common/common/src/main/java/org/onap/so/client/exception/BadResponseException.java b/common/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/exception/BadResponseException.java rename to common/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java diff --git a/common/common/src/main/java/org/onap/so/client/exception/MapperException.java b/common/clients/src/main/java/org/onap/so/client/exception/MapperException.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/exception/MapperException.java rename to common/clients/src/main/java/org/onap/so/client/exception/MapperException.java diff --git a/common/common/src/main/java/org/onap/so/client/exceptions/SDNOException.java b/common/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/exceptions/SDNOException.java rename to common/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMAction.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMAction.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMAction.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMAction.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMClient.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMClient.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMClient.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMProperties.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMProperties.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMRestClient.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java b/common/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java rename to common/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/Property.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/Property.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/Property.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/Property.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/Status.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/Status.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/Status.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/Status.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/Version.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/Version.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/Version.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/Version.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java b/common/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java rename to common/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java diff --git a/common/common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java b/common/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java rename to common/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java diff --git a/common/common/src/main/java/org/onap/so/client/kafka/KafkaClient.java b/common/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/kafka/KafkaClient.java rename to common/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java diff --git a/common/common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java b/common/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java rename to common/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java b/common/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java rename to common/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java b/common/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java rename to common/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/PolicyClient.java b/common/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/PolicyClient.java rename to common/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java b/common/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java rename to common/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java b/common/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java rename to common/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java b/common/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java rename to common/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Config.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Config.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Config.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Config.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Content.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Content.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Content.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Content.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Id.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Id.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Id.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Id.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java diff --git a/common/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java b/common/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java rename to common/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java diff --git a/common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java b/common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java rename to common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java diff --git a/common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java b/common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java similarity index 100% rename from common/common/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java rename to common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java diff --git a/common/common/src/main/resources/dmaap/default-consumer.properties b/common/clients/src/main/resources/dmaap/default-consumer.properties similarity index 100% rename from common/common/src/main/resources/dmaap/default-consumer.properties rename to common/clients/src/main/resources/dmaap/default-consumer.properties diff --git a/common/common/src/main/resources/dmaap/default-publisher.properties b/common/clients/src/main/resources/dmaap/default-publisher.properties similarity index 100% rename from common/common/src/main/resources/dmaap/default-publisher.properties rename to common/clients/src/main/resources/dmaap/default-publisher.properties diff --git a/common/common/src/main/resources/dmaap/empty.txt b/common/clients/src/main/resources/dmaap/empty.txt similarity index 100% rename from common/common/src/main/resources/dmaap/empty.txt rename to common/clients/src/main/resources/dmaap/empty.txt diff --git a/common/common/src/main/resources/kafka/default-consumer.properties b/common/clients/src/main/resources/kafka/default-consumer.properties similarity index 100% rename from common/common/src/main/resources/kafka/default-consumer.properties rename to common/clients/src/main/resources/kafka/default-consumer.properties diff --git a/common/common/src/test/java/org/onap/so/client/HttpClientTest.java b/common/clients/src/test/java/org/onap/so/client/HttpClientTest.java similarity index 96% rename from common/common/src/test/java/org/onap/so/client/HttpClientTest.java rename to common/clients/src/test/java/org/onap/so/client/HttpClientTest.java index 3966d183f7..3108609c88 100644 --- a/common/common/src/test/java/org/onap/so/client/HttpClientTest.java +++ b/common/clients/src/test/java/org/onap/so/client/HttpClientTest.java @@ -7,9 +7,9 @@ * 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. @@ -70,7 +70,7 @@ public class HttpClientTest { URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newJsonClient(url, ONAPComponents.BPMN); - client.addAdditionalHeader("Accept", "application/json"); + // client.addAdditionalHeader("Accept", "application/json"); client.addAdditionalHeader("id", null); client.post("{}"); @@ -89,7 +89,6 @@ public class HttpClientTest { HttpClient client = httpClientFactory.newJsonClient(url, ONAPComponents.BPMN); client.addBasicAuthHeader("", "12345"); - client.addAdditionalHeader("Accept", "application/json"); client.post("{}"); @@ -125,7 +124,6 @@ public class HttpClientTest { URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newXmlClient(url, ONAPComponents.BPMN); - client.accept = "application/xml"; client.addAdditionalHeader("id", null); client.post("{}"); @@ -180,7 +178,7 @@ public class HttpClientTest { URL url = new URL("http://localhost:" + wireMockRule.port() + "/services/sdnc/post"); HttpClient client = httpClientFactory.newTextXmlClient(url, ONAPComponents.BPMN); - client.addAdditionalHeader("Accept", "text/xml"); + // client.addAdditionalHeader("Accept", "text/xml"); client.addAdditionalHeader("id", null); client.post("{}"); @@ -199,7 +197,7 @@ public class HttpClientTest { HttpClient client = httpClientFactory.newTextXmlClient(url, ONAPComponents.BPMN); client.addBasicAuthHeader("", "12345"); - client.addAdditionalHeader("Accept", "text/xml"); + // client.addAdditionalHeader("Accept", "text/xml"); client.post("{}"); diff --git a/common/common/src/test/java/org/onap/so/client/RestClientTest.java b/common/clients/src/test/java/org/onap/so/client/RestClientTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/RestClientTest.java rename to common/clients/src/test/java/org/onap/so/client/RestClientTest.java diff --git a/common/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java b/common/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java rename to common/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java diff --git a/common/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java b/common/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java rename to common/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java diff --git a/common/common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java b/common/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java rename to common/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java diff --git a/common/common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java b/common/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java rename to common/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java diff --git a/common/common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java b/common/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java rename to common/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java diff --git a/common/common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java b/common/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java rename to common/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java diff --git a/common/common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java b/common/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java rename to common/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java diff --git a/common/common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java b/common/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/grm/GRMBeansTest.java rename to common/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java diff --git a/common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java b/common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java rename to common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java diff --git a/common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java b/common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java rename to common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java diff --git a/common/common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java b/common/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java rename to common/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java diff --git a/common/common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java b/common/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java rename to common/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java diff --git a/common/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java b/common/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java rename to common/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java diff --git a/common/common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java b/common/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java rename to common/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java diff --git a/common/common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java b/common/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java rename to common/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java diff --git a/common/common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties b/common/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties similarity index 100% rename from common/common/src/test/resources/META-INF/services/org.onap.so.client.RestProperties rename to common/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties diff --git a/common/common/src/test/resources/__files/Policy/configJson.json b/common/clients/src/test/resources/__files/Policy/configJson.json similarity index 100% rename from common/common/src/test/resources/__files/Policy/configJson.json rename to common/clients/src/test/resources/__files/Policy/configJson.json diff --git a/common/common/src/test/resources/__files/Policy/policyAbortResponse.json b/common/clients/src/test/resources/__files/Policy/policyAbortResponse.json similarity index 100% rename from common/common/src/test/resources/__files/Policy/policyAbortResponse.json rename to common/clients/src/test/resources/__files/Policy/policyAbortResponse.json diff --git a/common/common/src/test/resources/__files/Policy/policyConfig.json b/common/clients/src/test/resources/__files/Policy/policyConfig.json similarity index 100% rename from common/common/src/test/resources/__files/Policy/policyConfig.json rename to common/clients/src/test/resources/__files/Policy/policyConfig.json diff --git a/common/common/src/test/resources/__files/Policy/policySkipResponse.json b/common/clients/src/test/resources/__files/Policy/policySkipResponse.json similarity index 100% rename from common/common/src/test/resources/__files/Policy/policySkipResponse.json rename to common/clients/src/test/resources/__files/Policy/policySkipResponse.json diff --git a/common/common/src/test/resources/__files/grm/endpoints.json b/common/clients/src/test/resources/__files/grm/endpoints.json similarity index 100% rename from common/common/src/test/resources/__files/grm/endpoints.json rename to common/clients/src/test/resources/__files/grm/endpoints.json diff --git a/common/common/src/test/resources/__files/grm/endpoints2.json b/common/clients/src/test/resources/__files/grm/endpoints2.json similarity index 100% rename from common/common/src/test/resources/__files/grm/endpoints2.json rename to common/clients/src/test/resources/__files/grm/endpoints2.json diff --git a/common/common/src/test/resources/__files/logging/openstack-payload.json b/common/clients/src/test/resources/__files/logging/openstack-payload.json similarity index 100% rename from common/common/src/test/resources/__files/logging/openstack-payload.json rename to common/clients/src/test/resources/__files/logging/openstack-payload.json diff --git a/common/common/src/test/resources/dmaap.properties b/common/clients/src/test/resources/dmaap.properties similarity index 100% rename from common/common/src/test/resources/dmaap.properties rename to common/clients/src/test/resources/dmaap.properties diff --git a/common/common/src/test/resources/policy.properties b/common/clients/src/test/resources/policy.properties similarity index 100% rename from common/common/src/test/resources/policy.properties rename to common/clients/src/test/resources/policy.properties diff --git a/common/common/pom.xml b/common/common/pom.xml index 718bfae488..14900745ea 100644 --- a/common/common/pom.xml +++ b/common/common/pom.xml @@ -12,21 +12,23 @@ common MSO Common classes:- Logger - 3.22.2 - 4.1.30.Final - 1.1.5 9.0.105 1.2.13 org.onap.so - logger + utils ${project.version} org.onap.so - clients-base + logger + ${project.version} + + + org.onap.so.common + clients ${project.version} @@ -45,11 +47,6 @@ org.springframework.boot spring-boot-starter-actuator - - com.jayway.jsonpath - json-path - 2.5.0 - org.hibernate hibernate-core @@ -62,6 +59,14 @@ org.springframework spring-webmvc + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + org.modelmapper modelmapper @@ -142,56 +147,6 @@ com.zaxxer HikariCP - - - org.onap.ccsdk.cds.blueprintsprocessor.modules - blueprint-proto - ${ccsdk.version} - - - io.springfox - springfox-boot-starter - - - org.apache.kafka - kafka-clients - - - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - - - io.grpc - grpc-protobuf - ${grpc.version} - - - com.google.code.findbugs - jsr305 - - - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-testing - ${grpc.version} - test - - - org.camunda.bpm - camunda-external-task-client - org.onap.appc.client client-lib @@ -231,32 +186,6 @@ javax.validation validation-api - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} - - - uk.org.webcompere - system-stubs-jupiter - 1.1.0 - test - org.junit.jupiter junit-jupiter-engine @@ -351,7 +280,6 @@ DEBUG - 2 suites false 1 diff --git a/common/common/src/test/java/org/onap/so/BeansTest.java b/common/common/src/test/java/org/onap/so/BeansTest.java index 01bdc4db38..f0fbe7ee2c 100644 --- a/common/common/src/test/java/org/onap/so/BeansTest.java +++ b/common/common/src/test/java/org/onap/so/BeansTest.java @@ -7,9 +7,9 @@ * 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. @@ -63,7 +63,6 @@ public class BeansTest { test("org.onap.so.appc.orchestrator.service.beans"); test("org.onap.so.client.policy.entities"); test("org.onap.so.client.grm.beans"); - test("org.onap.so.client.sdno.beans"); test("org.onap.so.entity"); test("org.onap.so.serviceinstancebeans"); } diff --git a/common/common/src/test/java/org/onap/so/utils/TestAppender.java b/common/common/src/test/java/org/onap/so/logging/TestAppender.java similarity index 97% rename from common/common/src/test/java/org/onap/so/utils/TestAppender.java rename to common/common/src/test/java/org/onap/so/logging/TestAppender.java index a1add63078..e92df52e59 100644 --- a/common/common/src/test/java/org/onap/so/utils/TestAppender.java +++ b/common/common/src/test/java/org/onap/so/logging/TestAppender.java @@ -7,9 +7,9 @@ * 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. @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.so.utils; +package org.onap.so.logging; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/common/common/src/test/resources/application-test.yaml b/common/common/src/test/resources/application-test.yaml index 1a3e97c451..084cb2819e 100644 --- a/common/common/src/test/resources/application-test.yaml +++ b/common/common/src/test/resources/application-test.yaml @@ -1,4 +1,7 @@ org: onap: so: - cloud-owner: my-custom-owner \ No newline at end of file + cloud-owner: my-custom-owner +spring: + sleuth: + enabled: false diff --git a/common/common/src/test/resources/logback-test.xml b/common/common/src/test/resources/logback-test.xml index d0714bbc35..a039f5ec37 100644 --- a/common/common/src/test/resources/logback-test.xml +++ b/common/common/src/test/resources/logback-test.xml @@ -7,9 +7,9 @@ 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. @@ -37,7 +37,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/common/pom.xml b/common/pom.xml index 7ee498cadb..fa036bb0a5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -9,8 +9,10 @@ common pom + utils logger clients-base + clients common diff --git a/common/utils/pom.xml b/common/utils/pom.xml new file mode 100644 index 0000000000..cfa5e5b765 --- /dev/null +++ b/common/utils/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.onap.so + common + 1.16.0-SNAPSHOT + + + utils + + + + org.onap.so + logger + ${project.version} + + + com.jayway.jsonpath + json-path + 2.5.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + org.camunda.bpm + camunda-external-task-client + + + org.mockito + mockito-junit-jupiter + test + + + org.projectlombok + lombok + provided + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + + diff --git a/common/common/src/main/java/org/onap/so/exceptions/MarshallerException.java b/common/utils/src/main/java/org/onap/so/exceptions/MarshallerException.java similarity index 100% rename from common/common/src/main/java/org/onap/so/exceptions/MarshallerException.java rename to common/utils/src/main/java/org/onap/so/exceptions/MarshallerException.java diff --git a/common/common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java b/common/utils/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java similarity index 100% rename from common/common/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java rename to common/utils/src/main/java/org/onap/so/jsonpath/JsonPathUtil.java diff --git a/common/common/src/main/java/org/onap/so/utils/CheckResults.java b/common/utils/src/main/java/org/onap/so/utils/CheckResults.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/CheckResults.java rename to common/utils/src/main/java/org/onap/so/utils/CheckResults.java diff --git a/common/common/src/main/java/org/onap/so/utils/Components.java b/common/utils/src/main/java/org/onap/so/utils/Components.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/Components.java rename to common/utils/src/main/java/org/onap/so/utils/Components.java diff --git a/common/common/src/main/java/org/onap/so/utils/CryptoUtils.java b/common/utils/src/main/java/org/onap/so/utils/CryptoUtils.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/CryptoUtils.java rename to common/utils/src/main/java/org/onap/so/utils/CryptoUtils.java diff --git a/common/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/utils/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java rename to common/utils/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java diff --git a/common/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java b/common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/ExternalTaskUtils.java rename to common/utils/src/main/java/org/onap/so/utils/ExternalTaskUtils.java diff --git a/common/common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java b/common/utils/src/main/java/org/onap/so/utils/RetrySequenceLevel.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/RetrySequenceLevel.java rename to common/utils/src/main/java/org/onap/so/utils/RetrySequenceLevel.java diff --git a/common/common/src/main/java/org/onap/so/utils/UUIDChecker.java b/common/utils/src/main/java/org/onap/so/utils/UUIDChecker.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/UUIDChecker.java rename to common/utils/src/main/java/org/onap/so/utils/UUIDChecker.java diff --git a/common/common/src/main/java/org/onap/so/utils/XmlMarshaller.java b/common/utils/src/main/java/org/onap/so/utils/XmlMarshaller.java similarity index 100% rename from common/common/src/main/java/org/onap/so/utils/XmlMarshaller.java rename to common/utils/src/main/java/org/onap/so/utils/XmlMarshaller.java diff --git a/common/common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java b/common/utils/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java rename to common/utils/src/test/java/org/onap/so/jsonpath/JsonPathUtilTest.java diff --git a/common/common/src/test/java/org/onap/so/utils/CheckResultsTest.java b/common/utils/src/test/java/org/onap/so/utils/CheckResultsTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/utils/CheckResultsTest.java rename to common/utils/src/test/java/org/onap/so/utils/CheckResultsTest.java diff --git a/common/common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java b/common/utils/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java rename to common/utils/src/test/java/org/onap/so/utils/ExternalTaskServiceUtilsTest.java diff --git a/common/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java b/common/utils/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java rename to common/utils/src/test/java/org/onap/so/utils/ExternalTaskUtilsTest.java diff --git a/common/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java b/common/utils/src/test/java/org/onap/so/utils/UUIDCheckerTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java rename to common/utils/src/test/java/org/onap/so/utils/UUIDCheckerTest.java diff --git a/common/common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java b/common/utils/src/test/java/org/onap/so/utils/XMLMarshallerTest.java similarity index 100% rename from common/common/src/test/java/org/onap/so/utils/XMLMarshallerTest.java rename to common/utils/src/test/java/org/onap/so/utils/XMLMarshallerTest.java diff --git a/pom.xml b/pom.xml index 4a003a63b5..ceebfe35e2 100644 --- a/pom.xml +++ b/pom.xml @@ -885,14 +885,6 @@ 2.4 test - - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.cloud - spring-cloud-sleuth-zipkin - org.projectlombok lombok diff --git a/so-sdn-clients/src/test/java/org/onap/so/client/sdno/BeansTest.java b/so-sdn-clients/src/test/java/org/onap/so/client/sdno/BeansTest.java new file mode 100644 index 0000000000..d1d7046c63 --- /dev/null +++ b/so-sdn-clients/src/test/java/org/onap/so/client/sdno/BeansTest.java @@ -0,0 +1,69 @@ +/*- + * ============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.sdno; + +import org.junit.Test; +import com.openpojo.reflection.PojoClass; +import com.openpojo.reflection.PojoClassFilter; +import com.openpojo.reflection.filters.FilterEnum; +import com.openpojo.reflection.filters.FilterNonConcrete; +import com.openpojo.reflection.filters.FilterPackageInfo; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.rule.impl.GetterMustExistRule; +import com.openpojo.validation.rule.impl.NoNestedClassRule; +import com.openpojo.validation.rule.impl.NoPublicFieldsExceptStaticFinalRule; +import com.openpojo.validation.rule.impl.NoStaticExceptFinalRule; +import com.openpojo.validation.rule.impl.SerializableMustHaveSerialVersionUIDRule; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SetterTester; + + +public class BeansTest { + + private PojoClassFilter filterTestClasses = new FilterTestClasses(); + + private PojoClassFilter enumFilter = new FilterEnum(); + + + + @Test + public void pojoStructure() { + test("org.onap.so.client.sdno.beans"); + } + + private void test(String pojoPackage) { + Validator validator = ValidatorBuilder.create().with(new GetterMustExistRule()).with(new NoNestedClassRule()) + .with(new NoStaticExceptFinalRule()).with(new SerializableMustHaveSerialVersionUIDRule()) + .with(new NoPublicFieldsExceptStaticFinalRule()).with(new SetterTester()).with(new GetterTester()) + .build(); + + + validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, enumFilter, + new FilterNonConcrete()); + } + + private static class FilterTestClasses implements PojoClassFilter { + public boolean include(PojoClass pojoClass) { + return !pojoClass.getSourcePath().contains("/test-classes/"); + } + } +} -- 2.16.6