From 1058cf6bcc525dbf35c3d839fb5a796fe0461be3 Mon Sep 17 00:00:00 2001
From: PatrikBuhr <patrik.buhr@est.tech>
Date: Tue, 1 Feb 2022 11:16:10 +0100
Subject: NONRTRIC - 3PP dependency version update

Updated json version

+Also fixed a trace message

Issue-ID: CCSDK-3581
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I68cfebdd1fdfbc72683d85e9e9bcd201eb7d1e85
---
 a1-policy-management/pom.xml                                 |  4 ++--
 .../a1policymanagementservice/clients/AsyncRestClient.java   | 12 ++++++------
 .../tasks/RefreshConfigTaskTest.java                         |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index dc1d7f23..c2d2804d 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -37,7 +37,7 @@
         <springfox.version>3.0.0</springfox.version>
         <!-- Do not change to version 3.0.0! Will break the generated json. -->
         <immutable.version>2.8.8</immutable.version>
-        <json.version>20200518</json.version>
+        <json.version>20211205</json.version>
         <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>2.5.0</spotless-maven-plugin.version>
         <commons-io.version>2.11.0</commons-io.version>
@@ -431,4 +431,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClient.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClient.java
index 4f2770bf..3461876d 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClient.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/AsyncRestClient.java
@@ -63,7 +63,7 @@ public class AsyncRestClient {
 
     public Mono<ResponseEntity<String>> postForEntity(String uri, @Nullable String body) {
         Object traceTag = createTraceTag();
-        logger.debug("{} POST uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} POST uri = '{}{}'", traceTag, baseUrl, uri);
         logger.trace("{} POST body: {}", traceTag, body);
         Mono<String> bodyProducer = body != null ? Mono.just(body) : Mono.empty();
 
@@ -82,7 +82,7 @@ public class AsyncRestClient {
 
     public Mono<String> postWithAuthHeader(String uri, String body, String username, String password) {
         Object traceTag = createTraceTag();
-        logger.debug("{} POST (auth) uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} POST (auth) uri = '{}{}'", traceTag, baseUrl, uri);
         logger.trace("{} POST body: {}", traceTag, body);
 
         RequestHeadersSpec<?> request = getWebClient() //
@@ -97,7 +97,7 @@ public class AsyncRestClient {
 
     public Mono<ResponseEntity<String>> putForEntity(String uri, String body) {
         Object traceTag = createTraceTag();
-        logger.debug("{} PUT uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} PUT uri = '{}{}'", traceTag, baseUrl, uri);
         logger.trace("{} PUT body: {}", traceTag, body);
 
         RequestHeadersSpec<?> request = getWebClient() //
@@ -110,7 +110,7 @@ public class AsyncRestClient {
 
     public Mono<ResponseEntity<String>> putForEntity(String uri) {
         Object traceTag = createTraceTag();
-        logger.debug("{} PUT uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} PUT uri = '{}{}'", traceTag, baseUrl, uri);
         logger.trace("{} PUT body: <empty>", traceTag);
         RequestHeadersSpec<?> request = getWebClient() //
                 .put() //
@@ -125,7 +125,7 @@ public class AsyncRestClient {
 
     public Mono<ResponseEntity<String>> getForEntity(String uri) {
         Object traceTag = createTraceTag();
-        logger.debug("{} GET uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} GET uri = '{}{}'", traceTag, baseUrl, uri);
         RequestHeadersSpec<?> request = getWebClient() //
                 .get() //
                 .uri(uri);
@@ -139,7 +139,7 @@ public class AsyncRestClient {
 
     public Mono<ResponseEntity<String>> deleteForEntity(String uri) {
         Object traceTag = createTraceTag();
-        logger.debug("{} DELETE uri = '{}{}''", traceTag, baseUrl, uri);
+        logger.debug("{} DELETE uri = '{}{}'", traceTag, baseUrl, uri);
         RequestHeadersSpec<?> request = getWebClient() //
                 .delete() //
                 .uri(uri);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTaskTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTaskTest.java
index 874929a5..1b1dad5c 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTaskTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTaskTest.java
@@ -154,8 +154,7 @@ class RefreshConfigTaskTest {
     }
 
     private static Optional<JsonObject> getCorrectJson() throws IOException {
-        URL url = ApplicationConfigParser.class.getClassLoader()
-                .getResource("test_application_configuration.json");
+        URL url = ApplicationConfigParser.class.getClassLoader().getResource("test_application_configuration.json");
         String string = Resources.toString(url, Charsets.UTF_8);
         return Optional.of(JsonParser.parseString(string).getAsJsonObject());
     }
-- 
cgit 1.2.3-korg