From 03f18c07bd6aacdbc9db0d43bcf750f1e55bccd1 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Mon, 14 Apr 2025 16:41:14 +0100
Subject: [PATCH] Security uplift

- fix error messages from new version of gson

Issue-ID: POLICY-5302
Change-Id: Ie278b10465f703e6245db120b4106b9a5987fd2e
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 testsuites/integration/integration-uservice-test/pom.xml          | 4 ++--
 .../eventgenerator/EventGeneratorParametersHandlerTest.java       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 86b0e3446..49dc0ff24 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020,2022-2025 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020,2022-2025 OpenInfra Foundation Europe. All rights reserved.
    Modifications Copyright (C) 2020 Bell Canada.
    Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.13</artifactId>
-            <version>${version.kafka}</version>
+            <version>3.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java
index 1714f43b4..7f357910a 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java
+++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/eventgenerator/EventGeneratorParametersHandlerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020, 2024 Nordix Foundation
+ *  Modifications Copyright (C) 2020, 20242025 OpenInfra Foundation Europe. All rights reserved.
  *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -111,7 +111,7 @@ class EventGeneratorParametersHandlerTest {
         assertThatThrownBy(() -> {
             String[] arguments = new String[] {"-c", "src/test/resources/parameters/unit/BadHost.json"};
             handler.parse(arguments);
-        }).hasMessage("Error parsing JSON parameters from configuration file "
+        }).hasMessageContaining("Error parsing JSON parameters from configuration file "
             + "\"src/test/resources/parameters/unit/BadHost.json\": "
             + "com.google.gson.stream.MalformedJsonException: "
             + "Unexpected value at line 3 column 14 path $.host");
@@ -119,7 +119,7 @@ class EventGeneratorParametersHandlerTest {
         assertThatThrownBy(() -> {
             String[] arguments = new String[] {"-c", "src/test/resources/parameters/unit/BadPort.json"};
             handler.parse(arguments);
-        }).hasMessage("Error parsing JSON parameters from configuration file "
+        }).hasMessageContaining("Error parsing JSON parameters from configuration file "
             + "\"src/test/resources/parameters/unit/BadPort.json\": "
             + "java.lang.IllegalStateException: Expected an int "
             + "but was BOOLEAN at line 4 column 18 path $.port");
@@ -127,7 +127,7 @@ class EventGeneratorParametersHandlerTest {
         assertThatThrownBy(() -> {
             String[] arguments = new String[] {"-c", "src/test/resources/parameters/unit/Empty.json"};
             handler.parse(arguments);
-        }).hasMessage("No parameters found in configuration file "
+        }).hasMessageContaining("No parameters found in configuration file "
             + "\"src/test/resources/parameters/unit/Empty.json\"");
 
         assertThatThrownBy(() -> {
-- 
2.16.6