NONRTRIC PMS, Cherry-pick the recent changes into Jakarta Release1.3.3

Sqasch of cherrypicked commits for the maintenance release.

Issue-ID: CCSDK-3742
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS added support for custom A1 adapters

Added support for added external A1-P adapter. This makes it possible to design and include
adapter to APIs for accessing of A1 policies (in a NearRT-RIC) without any changes in this
SW.

Issue-ID: CCSDK-3655
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS added support for custom A1 adapters

Updates of the json schema for configuration. Made it stricter and added the customAdapterClass prpoperty.

Issue-ID: CCSDK-3655
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS removalof usage of immutable

Issue-ID: CCSDK-3629
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS, Sporadic instability

Attempt to stablize the synch.

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS, Sporadic instability

Attempt to stablize the synch.

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS, Sporadic instability

Some further simplifications and added test.

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I1ec98017d63047a0036db5ea12f770db00b1152b

NONRTRIC PMS, updated SDNC rest interface

Update path and output-json for SDNC rest interface - A1 Kohn

Issue-ID: CCSDK-3193
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS, Bugfix

If the auth-token-file parameter in the file application.yaml is missing, it would not default to an empty file name.

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

NONRTRIC PMS, updated certs

Updated certificate (which was expired).

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I34ffc932d855ba3b94cfff23dcb56f30780dbecc

1 files changed, 23 insertions, 20 deletions

diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/WebClientConfig.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/WebClientConfig.java
index 1e5d7ffa..e71f8557 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/WebClientConfig.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/WebClientConfig.java
@@ -20,38 +20,41 @@
 
 package org.onap.ccsdk.oran.a1policymanagementservice.configuration;
 
-import org.immutables.value.Value;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
 import reactor.netty.transport.ProxyProvider;
 
-@Value.Immutable
-@Value.Style(redactedMask = "####")
-public interface WebClientConfig {
-    public String keyStoreType();
+@Builder
+@Getter
+@ToString
+public class WebClientConfig {
+    private String keyStoreType;
 
-    @Value.Redacted
-    public String keyStorePassword();
+    private String keyStorePassword;
 
-    public String keyStore();
+    private String keyStore;
 
-    @Value.Redacted
-    public String keyPassword();
+    @ToString.Exclude
+    private String keyPassword;
 
-    public boolean isTrustStoreUsed();
+    private boolean isTrustStoreUsed;
 
-    @Value.Redacted
-    public String trustStorePassword();
+    private String trustStorePassword;
 
-    public String trustStore();
+    private String trustStore;
 
-    @Value.Immutable
-    public interface HttpProxyConfig {
-        public String httpProxyHost();
+    @Builder
+    @Getter
+    @ToString
+    public static class HttpProxyConfig {
+        private String httpProxyHost;
 
-        public int httpProxyPort();
+        private int httpProxyPort;
 
-        public ProxyProvider.Proxy httpProxyType();
+        private ProxyProvider.Proxy httpProxyType;
     }
 
-    public HttpProxyConfig httpProxyConfig();
+    private HttpProxyConfig httpProxyConfig;
 
 }