Create client-cds module

- move cds client related files from the common module to a dedicated client-cds module
- this allows only pulling it in, when it is really used

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

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 71cf13c..b81b830 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -188,6 +188,11 @@
       <artifactId>groovy-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.onap.so</groupId>
+      <artifactId>client-cds</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
       <artifactId>MSOCoreBPMN</artifactId>

diff --git a/common/clients/client-cds/pom.xml b/common/clients/client-cds/pom.xml
new file mode 100644 (file)
index 0000000..63c968c
--- /dev/null
+++ b/common/clients/client-cds/pom.xml
@@ -0,0 +1,100 @@
+<?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</groupId>
+  <artifactId>client-cds</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.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>io.grpc</groupId>
+      <artifactId>grpc-testing</artifactId>
+      <version>${grpc.version}</version>
+      <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/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java b/common/clients/client-cds/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java
similarity index 100%
rename from common/clients/clients/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java
rename to common/clients/client-cds/src/main/java/org/onap/so/client/cds/BasicAuthClientInterceptor.java

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

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

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

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

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

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

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

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

diff --git a/common/clients/clients/pom.xml b/common/clients/clients/pom.xml
index 321da1a..4f0eb21 100644 (file)
--- a/common/clients/clients/pom.xml
+++ b/common/clients/clients/pom.xml
@@ -11,12 +11,6 @@
   <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>
@@ -28,6 +22,11 @@
       <artifactId>clients-base</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.4.8-jre</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
@@ -36,57 +35,21 @@
       <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>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.18.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-testing</artifactId>
-      <version>${grpc.version}</version>
+      <groupId>uk.org.webcompere</groupId>
+      <artifactId>system-stubs-jupiter</artifactId>
+      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/common/clients/pom.xml b/common/clients/pom.xml
index 38774db..7ecb768 100644 (file)
--- a/common/clients/pom.xml
+++ b/common/clients/pom.xml
@@ -11,5 +11,6 @@
   <modules>
     <module>clients-base</module>
     <module>clients</module>
+    <module>client-cds</module>
   </modules>
 </project>

diff --git a/common/common/pom.xml b/common/common/pom.xml
index 4580a3d..60d20dc 100644 (file)
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -110,6 +110,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.9</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>

diff --git a/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java
index 690a296..1e5b169 100644 (file)
--- a/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java
+++ b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java
@@ -96,6 +96,8 @@ public class SliceTaskParams implements Serializable {
 
     private String anStatusDescription;
 
+    // TODO: Get rid of gson here
+    // This is the only class in the common module that uses gson
     public String convertToJson() {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("ServiceId", serviceId);

diff --git a/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java
index 15dd2f7..9693e0e 100644 (file)
--- a/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java
+++ b/common/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParamsAdapter.java
@@ -21,7 +21,6 @@ package org.onap.so.beans.nsmf;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.JsonObject;
 import lombok.*;
 import org.onap.so.beans.nsmf.oof.TemplateInfo;
 import java.io.IOException;
@@ -123,4 +122,3 @@ public class SliceTaskParamsAdapter implements Serializable {
         return sliceProfileMap;
     }
 }
-