Removed use of immutable and type adapters

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-743
Change-Id: I604ade6bdd80480b4025a53e05dcfc090ba763f5

diff --git a/pom.xml b/pom.xml
index ef3a1f1..d3f0df0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <properties>
         <java.version>11</java.version>
         <springfox.version>3.0.0</springfox.version>
-        <immutable.version>2.9.0</immutable.version>
+        <gson.version>2.9.0</gson.version>
         <swagger.version>2.1.6</swagger.version>
         <json.version>20211205</json.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -93,9 +93,9 @@
             <version>${swagger.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.immutables</groupId>
+            <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${immutable.version}</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -372,4 +372,4 @@
         <system>JIRA</system>
         <url>https://jira.o-ran-sc.org/</url>
     </issueManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/src/main/java/org/oran/dmaapadapter/configuration/ApplicationConfig.java b/src/main/java/org/oran/dmaapadapter/configuration/ApplicationConfig.java
index 1c5b8d0..e84889d 100644 (file)
--- a/src/main/java/org/oran/dmaapadapter/configuration/ApplicationConfig.java
+++ b/src/main/java/org/oran/dmaapadapter/configuration/ApplicationConfig.java
@@ -29,6 +29,7 @@ import java.util.Collections;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import org.oran.dmaapadapter.configuration.WebClientConfig.HttpProxyConfig;
 import org.oran.dmaapadapter.repository.InfoType;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 @EnableConfigurationProperties
+@ToString
 public class ApplicationConfig {
 
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

diff --git a/src/main/java/org/oran/dmaapadapter/configuration/WebClientConfig.java b/src/main/java/org/oran/dmaapadapter/configuration/WebClientConfig.java
index b3407d2..586ef6f 100644 (file)
--- a/src/main/java/org/oran/dmaapadapter/configuration/WebClientConfig.java
+++ b/src/main/java/org/oran/dmaapadapter/configuration/WebClientConfig.java
@@ -22,10 +22,12 @@ package org.oran.dmaapadapter.configuration;
 
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 import reactor.netty.transport.ProxyProvider;
 
 @Builder
 @Getter
+@ToString
 public class WebClientConfig {
     private String keyStoreType;
 
@@ -33,14 +35,17 @@ public class WebClientConfig {
 
     private String keyStore;
 
+    @ToString.Exclude
     private String keyPassword;
 
     private boolean isTrustStoreUsed;
 
+    @ToString.Exclude
     private String trustStorePassword;
 
     private String trustStore;
 
+    @ToString
     @Builder
     @Getter
     public static class HttpProxyConfig {

diff --git a/src/main/java/org/oran/dmaapadapter/repository/InfoType.java b/src/main/java/org/oran/dmaapadapter/repository/InfoType.java
index 7100940..c919931 100644 (file)
--- a/src/main/java/org/oran/dmaapadapter/repository/InfoType.java
+++ b/src/main/java/org/oran/dmaapadapter/repository/InfoType.java
@@ -21,9 +21,11 @@
 package org.oran.dmaapadapter.repository;
 
 import lombok.Getter;
+import lombok.ToString;
 
 import org.springframework.util.StringUtils;
 
+@ToString
 public class InfoType {
 
     @Getter

diff --git a/src/main/java/org/oran/dmaapadapter/repository/Job.java b/src/main/java/org/oran/dmaapadapter/repository/Job.java
index e7c9290..776a7ce 100644 (file)
--- a/src/main/java/org/oran/dmaapadapter/repository/Job.java
+++ b/src/main/java/org/oran/dmaapadapter/repository/Job.java
@@ -27,6 +27,7 @@ import java.time.Duration;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import org.oran.dmaapadapter.clients.AsyncRestClient;
 import org.oran.dmaapadapter.repository.filters.Filter;
@@ -37,6 +38,7 @@ import org.oran.dmaapadapter.repository.filters.RegexpFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@ToString
 public class Job {
 
     private static com.google.gson.Gson gson = new GsonBuilder().create();