Create common/clients pom module

- create clients pom module
- group clients and clients-base modules under this module
- this prepares further splitting up the clients module for instance
  to move the cds client [0] into it's own module which makes it easier
  to exclude

[0] which is pulling in tons of dependencies like various kotlin
    and grpc deps

Issue-ID: SO-4224
Change-Id: Ia83b4ba70ebb16554fdf6217d035400fd5fe5627
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/common/clients-base/pom.xml b/common/clients/clients-base/pom.xml
similarity index 100%
rename from common/clients-base/pom.xml
rename to common/clients/clients-base/pom.xml

diff --git a/common/clients-base/src/main/java/org/onap/so/client/AddCacheHeaders.java b/common/clients/clients-base/src/main/java/org/onap/so/client/AddCacheHeaders.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/AddCacheHeaders.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/AddCacheHeaders.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/BaseClient.java b/common/clients/clients-base/src/main/java/org/onap/so/client/BaseClient.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/BaseClient.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/BaseClient.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/CacheFactory.java b/common/clients/clients-base/src/main/java/org/onap/so/client/CacheFactory.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/CacheFactory.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/CacheFactory.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/CacheProperties.java b/common/clients/clients-base/src/main/java/org/onap/so/client/CacheProperties.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/CacheProperties.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/CacheProperties.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/CommonObjectMapperProvider.java b/common/clients/clients-base/src/main/java/org/onap/so/client/CommonObjectMapperProvider.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/CommonObjectMapperProvider.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/CommonObjectMapperProvider.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/DefaultProperties.java b/common/clients/clients-base/src/main/java/org/onap/so/client/DefaultProperties.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/DefaultProperties.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/DefaultProperties.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/HttpClient.java b/common/clients/clients-base/src/main/java/org/onap/so/client/HttpClient.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/HttpClient.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/HttpClient.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java b/common/clients/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/HttpClientFactory.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/KeyStoreLoader.java b/common/clients/clients-base/src/main/java/org/onap/so/client/KeyStoreLoader.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/KeyStoreLoader.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/KeyStoreLoader.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/PreconditionFailedException.java b/common/clients/clients-base/src/main/java/org/onap/so/client/PreconditionFailedException.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/PreconditionFailedException.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/PreconditionFailedException.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapper.java b/common/clients/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapper.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapper.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapper.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java b/common/clients/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/ResponseExceptionMapperImpl.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestClient.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestClient.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestClient.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestClient.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestClientSSL.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestClientSSL.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestClientSSL.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestClientSSL.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestProperties.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestProperties.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestProperties.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestProperties.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestPropertiesLoader.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestPropertiesLoader.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestPropertiesLoader.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestPropertiesLoader.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestRequest.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestRequest.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestRequest.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestRequest.java

diff --git a/common/clients-base/src/main/java/org/onap/so/client/RestTemplateConfig.java b/common/clients/clients-base/src/main/java/org/onap/so/client/RestTemplateConfig.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/client/RestTemplateConfig.java
rename to common/clients/clients-base/src/main/java/org/onap/so/client/RestTemplateConfig.java

diff --git a/common/clients-base/src/main/java/org/onap/so/configuration/BasicHttpHeadersProvider.java b/common/clients/clients-base/src/main/java/org/onap/so/configuration/BasicHttpHeadersProvider.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/configuration/BasicHttpHeadersProvider.java
rename to common/clients/clients-base/src/main/java/org/onap/so/configuration/BasicHttpHeadersProvider.java

diff --git a/common/clients-base/src/main/java/org/onap/so/configuration/HttpClientConnectionConfiguration.java b/common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpClientConnectionConfiguration.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/configuration/HttpClientConnectionConfiguration.java
rename to common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpClientConnectionConfiguration.java

diff --git a/common/clients-base/src/main/java/org/onap/so/configuration/HttpComponentsClientConfiguration.java b/common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpComponentsClientConfiguration.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/configuration/HttpComponentsClientConfiguration.java
rename to common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpComponentsClientConfiguration.java

diff --git a/common/clients-base/src/main/java/org/onap/so/configuration/HttpHeadersProvider.java b/common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpHeadersProvider.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/configuration/HttpHeadersProvider.java
rename to common/clients/clients-base/src/main/java/org/onap/so/configuration/HttpHeadersProvider.java

diff --git a/common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java b/common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java
rename to common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOAuditLogContainerFilter.java

diff --git a/common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java b/common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java
rename to common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOMetricLogClientFilter.java

diff --git a/common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java b/common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java
rename to common/clients/clients-base/src/main/java/org/onap/so/logging/jaxrs/filter/SOSpringClientFilter.java

diff --git a/common/clients-base/src/main/java/org/onap/so/utils/CryptoUtils.java b/common/clients/clients-base/src/main/java/org/onap/so/utils/CryptoUtils.java
similarity index 100%
rename from common/clients-base/src/main/java/org/onap/so/utils/CryptoUtils.java
rename to common/clients/clients-base/src/main/java/org/onap/so/utils/CryptoUtils.java

diff --git a/common/clients-base/src/test/java/org/onap/so/client/AddCacheHeadersTest.java b/common/clients/clients-base/src/test/java/org/onap/so/client/AddCacheHeadersTest.java
similarity index 100%
rename from common/clients-base/src/test/java/org/onap/so/client/AddCacheHeadersTest.java
rename to common/clients/clients-base/src/test/java/org/onap/so/client/AddCacheHeadersTest.java

diff --git a/common/clients-base/src/test/java/org/onap/so/configuration/BasicHttpHeadersProviderTest.java b/common/clients/clients-base/src/test/java/org/onap/so/configuration/BasicHttpHeadersProviderTest.java
similarity index 100%
rename from common/clients-base/src/test/java/org/onap/so/configuration/BasicHttpHeadersProviderTest.java
rename to common/clients/clients-base/src/test/java/org/onap/so/configuration/BasicHttpHeadersProviderTest.java

diff --git a/common/clients-base/src/test/java/org/onap/so/configuration/HttpComponentsClientConfigurationTest.java b/common/clients/clients-base/src/test/java/org/onap/so/configuration/HttpComponentsClientConfigurationTest.java
similarity index 100%
rename from common/clients-base/src/test/java/org/onap/so/configuration/HttpComponentsClientConfigurationTest.java
rename to common/clients/clients-base/src/test/java/org/onap/so/configuration/HttpComponentsClientConfigurationTest.java

diff --git a/common/clients-base/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java b/common/clients/clients-base/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java
similarity index 100%
rename from common/clients-base/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java
rename to common/clients/clients-base/src/test/java/org/onap/so/logging/MaskLogStatementsTest.java

diff --git a/common/clients/clients/pom.xml b/common/clients/clients/pom.xml
new file mode 100644 (file)
index 0000000..321da1a
--- /dev/null
+++ b/common/clients/clients/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>common</artifactId>
+    <version>1.16.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.onap.so.common.clients</groupId>
+  <artifactId>clients</artifactId>
+
+  <properties>
+    <ccsdk.version>1.1.5</ccsdk.version>
+    <protobuf.version>3.22.2</protobuf.version>
+    <grpc.netty.version>4.1.30.Final</grpc.netty.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>clients-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
+      <artifactId>blueprint-proto</artifactId>
+      <version>${ccsdk.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.springfox</groupId>
+          <artifactId>springfox-boot-starter</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.kafka</groupId>
+          <artifactId>kafka-clients</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-protobuf</artifactId>
+      <version>${grpc.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-netty</artifactId>
+      <version>${grpc.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>${kafka-clients.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>uk.org.webcompere</groupId>
+      <artifactId>system-stubs-jupiter</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-testing</artifactId>
+      <version>${grpc.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

diff --git a/common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java b/common/clients/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java b/common/clients/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java
rename to common/clients/clients/src/main/java/org/onap/so/client/adapter/rest/AdapterRestProperties.java

diff --git a/common/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java b/common/clients/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java
rename to common/clients/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java

diff --git a/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java b/common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java b/common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java
rename to common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingHandler.java

diff --git a/common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java b/common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java
rename to common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProcessingListener.java

diff --git a/common/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java b/common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java
rename to common/clients/clients/src/main/java/org/onap/so/client/cds/CDSProperties.java

diff --git a/common/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java b/common/clients/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java
rename to common/clients/clients/src/main/java/org/onap/so/client/defaultproperties/DefaultDmaapPropertiesImpl.java

diff --git a/common/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java b/common/clients/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java
rename to common/clients/clients/src/main/java/org/onap/so/client/defaultproperties/PolicyRestPropertiesImpl.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/Consumer.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapConsumer.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapProperties.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapPropertiesLoader.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/DmaapPublisher.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/Publisher.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailure.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/exceptions/ExceededMaximumPollingTime.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/DMaaPRestClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/PropertiesBean.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/RestConsumer.java

diff --git a/common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java b/common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java
rename to common/clients/clients/src/main/java/org/onap/so/client/dmaap/rest/RestPublisher.java

diff --git a/common/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java b/common/clients/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java
rename to common/clients/clients/src/main/java/org/onap/so/client/exception/BadResponseException.java

diff --git a/common/clients/src/main/java/org/onap/so/client/exception/MapperException.java b/common/clients/clients/src/main/java/org/onap/so/client/exception/MapperException.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/exception/MapperException.java
rename to common/clients/clients/src/main/java/org/onap/so/client/exception/MapperException.java

diff --git a/common/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java b/common/clients/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java
rename to common/clients/clients/src/main/java/org/onap/so/client/exceptions/SDNOException.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMAction.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMAction.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMAction.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMAction.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMClient.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMProperties.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMPropertiesLoader.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMRestClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/GRMRestInvoker.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/OperationalInfo.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/Property.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Property.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/Property.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Property.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPoint.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointList.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookup.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointLookupRequest.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/ServiceEndPointRequest.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/Status.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Status.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/Status.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Status.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/Version.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Version.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/Version.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/Version.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/beans/VersionLookup.java

diff --git a/common/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java b/common/clients/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java
rename to common/clients/clients/src/main/java/org/onap/so/client/grm/exceptions/GRMClientCallFailed.java

diff --git a/common/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java b/common/clients/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/kafka/KafkaClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java b/common/clients/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java
rename to common/clients/clients/src/main/java/org/onap/so/client/kafka/KafkaConsumerImpl.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/DecisionAttributes.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyRestClient.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Bbid.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Config.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Config.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Config.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Config.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Content.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Content.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Content.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Content.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Id.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Id.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Id.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Id.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Treatments.java

diff --git a/common/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java b/common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java
rename to common/clients/clients/src/main/java/org/onap/so/client/policy/entities/Workstep.java

diff --git a/common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java b/common/clients/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java
rename to common/clients/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapConsumer.java

diff --git a/common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java b/common/clients/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java
similarity index 100%
rename from common/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java
rename to common/clients/clients/src/main/java/org/onap/so/client/sdno/dmaap/SDNOHealthCheckDmaapPublisher.java

diff --git a/common/clients/src/main/resources/dmaap/default-consumer.properties b/common/clients/clients/src/main/resources/dmaap/default-consumer.properties
similarity index 100%
rename from common/clients/src/main/resources/dmaap/default-consumer.properties
rename to common/clients/clients/src/main/resources/dmaap/default-consumer.properties

diff --git a/common/clients/src/main/resources/dmaap/default-publisher.properties b/common/clients/clients/src/main/resources/dmaap/default-publisher.properties
similarity index 100%
rename from common/clients/src/main/resources/dmaap/default-publisher.properties
rename to common/clients/clients/src/main/resources/dmaap/default-publisher.properties

diff --git a/common/clients/src/main/resources/dmaap/empty.txt b/common/clients/clients/src/main/resources/dmaap/empty.txt
similarity index 100%
rename from common/clients/src/main/resources/dmaap/empty.txt
rename to common/clients/clients/src/main/resources/dmaap/empty.txt

diff --git a/common/clients/src/main/resources/kafka/default-consumer.properties b/common/clients/clients/src/main/resources/kafka/default-consumer.properties
similarity index 100%
rename from common/clients/src/main/resources/kafka/default-consumer.properties
rename to common/clients/clients/src/main/resources/kafka/default-consumer.properties

diff --git a/common/clients/src/test/java/org/onap/so/client/HttpClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/HttpClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/HttpClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/HttpClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/RestClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/RestClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/RestClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/RestClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/adapter/rest/AdapterRestClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/cds/CDSProcessingClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java b/common/clients/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java
rename to common/clients/clients/src/test/java/org/onap/so/client/cds/TestCDSProcessingListener.java

diff --git a/common/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java b/common/clients/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java
rename to common/clients/clients/src/test/java/org/onap/so/client/cds/TestCDSPropertiesImpl.java

diff --git a/common/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/dmaap/DmaapClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java b/common/clients/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/dmaap/exceptions/DMaaPConsumerFailureTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java b/common/clients/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/dmaap/rest/DMaaPRestClientTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java b/common/clients/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/grm/GRMBeansTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java b/common/clients/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointListTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java b/common/clients/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/grm/ServiceEndPointRequestTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java b/common/clients/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/grm/exception/GRMClientCallFailedTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java b/common/clients/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/kafka/KafkaConsumerImplTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java b/common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/policy/PolicyClientImplTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java b/common/clients/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/policy/entities/PolicyEntitiesTest.java

diff --git a/common/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java b/common/clients/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java
similarity index 100%
rename from common/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java
rename to common/clients/clients/src/test/java/org/onap/so/client/sdno/beans/SdnoBeansTest.java

diff --git a/common/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties b/common/clients/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties
similarity index 100%
rename from common/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties
rename to common/clients/clients/src/test/resources/META-INF/services/org.onap.so.client.RestProperties

diff --git a/common/clients/src/test/resources/__files/Policy/configJson.json b/common/clients/clients/src/test/resources/__files/Policy/configJson.json
similarity index 100%
rename from common/clients/src/test/resources/__files/Policy/configJson.json
rename to common/clients/clients/src/test/resources/__files/Policy/configJson.json

diff --git a/common/clients/src/test/resources/__files/Policy/policyAbortResponse.json b/common/clients/clients/src/test/resources/__files/Policy/policyAbortResponse.json
similarity index 100%
rename from common/clients/src/test/resources/__files/Policy/policyAbortResponse.json
rename to common/clients/clients/src/test/resources/__files/Policy/policyAbortResponse.json

diff --git a/common/clients/src/test/resources/__files/Policy/policyConfig.json b/common/clients/clients/src/test/resources/__files/Policy/policyConfig.json
similarity index 100%
rename from common/clients/src/test/resources/__files/Policy/policyConfig.json
rename to common/clients/clients/src/test/resources/__files/Policy/policyConfig.json

diff --git a/common/clients/src/test/resources/__files/Policy/policySkipResponse.json b/common/clients/clients/src/test/resources/__files/Policy/policySkipResponse.json
similarity index 100%
rename from common/clients/src/test/resources/__files/Policy/policySkipResponse.json
rename to common/clients/clients/src/test/resources/__files/Policy/policySkipResponse.json

diff --git a/common/clients/src/test/resources/__files/grm/endpoints.json b/common/clients/clients/src/test/resources/__files/grm/endpoints.json
similarity index 100%
rename from common/clients/src/test/resources/__files/grm/endpoints.json
rename to common/clients/clients/src/test/resources/__files/grm/endpoints.json

diff --git a/common/clients/src/test/resources/__files/grm/endpoints2.json b/common/clients/clients/src/test/resources/__files/grm/endpoints2.json
similarity index 100%
rename from common/clients/src/test/resources/__files/grm/endpoints2.json
rename to common/clients/clients/src/test/resources/__files/grm/endpoints2.json

diff --git a/common/clients/src/test/resources/__files/logging/openstack-payload.json b/common/clients/clients/src/test/resources/__files/logging/openstack-payload.json
similarity index 100%
rename from common/clients/src/test/resources/__files/logging/openstack-payload.json
rename to common/clients/clients/src/test/resources/__files/logging/openstack-payload.json

diff --git a/common/clients/src/test/resources/dmaap.properties b/common/clients/clients/src/test/resources/dmaap.properties
similarity index 100%
rename from common/clients/src/test/resources/dmaap.properties
rename to common/clients/clients/src/test/resources/dmaap.properties

diff --git a/common/clients/src/test/resources/policy.properties b/common/clients/clients/src/test/resources/policy.properties
similarity index 100%
rename from common/clients/src/test/resources/policy.properties
rename to common/clients/clients/src/test/resources/policy.properties

diff --git a/common/clients/pom.xml b/common/clients/pom.xml
index fa7bbf9..38774db 100644 (file)
--- a/common/clients/pom.xml
+++ b/common/clients/pom.xml
@@ -1,124 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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>common</artifactId>
+    <artifactId>so</artifactId>
     <version>1.16.0-SNAPSHOT</version>
   </parent>
-
-  <groupId>org.onap.so.common</groupId>
   <artifactId>clients</artifactId>
-
-  <properties>
-    <ccsdk.version>1.1.5</ccsdk.version>
-    <protobuf.version>3.22.2</protobuf.version>
-    <grpc.netty.version>4.1.30.Final</grpc.netty.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>clients-base</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.inject</groupId>
-      <artifactId>jersey-hk2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
-      <artifactId>blueprint-proto</artifactId>
-      <version>${ccsdk.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>io.springfox</groupId>
-          <artifactId>springfox-boot-starter</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.kafka</groupId>
-          <artifactId>kafka-clients</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-      <version>${grpc.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
-      <version>${grpc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka-clients</artifactId>
-      <version>${kafka-clients.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>uk.org.webcompere</groupId>
-      <artifactId>system-stubs-jupiter</artifactId>
-      <version>1.1.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-testing</artifactId>
-      <version>${grpc.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
+  <packaging>pom</packaging>
+  <modules>
+    <module>clients-base</module>
+    <module>clients</module>
+  </modules>
 </project>

diff --git a/common/common/pom.xml b/common/common/pom.xml
index 856c793..4580a3d 100644 (file)
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -27,7 +27,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.onap.so.common</groupId>
+      <groupId>org.onap.so.common.clients</groupId>
       <artifactId>clients</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/common/pom.xml b/common/pom.xml
index fa036bb..ec19095 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,7 +11,6 @@
   <modules>
     <module>utils</module>
     <module>logger</module>
-    <module>clients-base</module>
     <module>clients</module>
     <module>common</module>
   </modules>