From 7a454fbde6d27a29ec8beb4af879961c0c9acf4b Mon Sep 17 00:00:00 2001
From: benzelleroehr <ben.zelleroehr@telekom.de>
Date: Wed, 9 Apr 2025 11:53:41 +0200
Subject: [PATCH] chore: update spring boot to v3.3.10

Issue-ID: PORTALNG-140
Change-Id: Iaebc95a4df816623449d0f864e83cf98e058b39c
Signed-off-by: benzelleroehr <ben.zelleroehr@telekom.de>
---
 app/build.gradle                                                 | 5 +++--
 app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java | 3 +--
 .../onap/portalng/bff/rbac/RoleBaseAccessIntegrationTest.java    | 9 +++------
 build.gradle                                                     | 1 +
 lib/build.gradle                                                 | 5 ++++-
 .../main/java/org/onap/portalng/bff/config/SecurityConfig.java   | 3 ++-
 .../org/onap/portalng/bff/config/clients/KeycloakConfig.java     | 2 +-
 openapi/build.gradle                                             | 3 +++
 openapi/client-history/build.gradle                              | 3 +++
 openapi/client-keycloak/build.gradle                             | 3 +++
 openapi/client-preferences/build.gradle                          | 3 +++
 openapi/server/build.gradle                                      | 3 +++
 settings.gradle                                                  | 2 +-
 13 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4305de0..8dbc112 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation project(':openapi:client-preferences')
     implementation project(':openapi:client-keycloak')
 	implementation project(':lib')
-	
+
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -51,6 +51,7 @@ dependencies {
     implementation "net.logstash.logback:logstash-logback-encoder:$logbackVersion"
     compileOnly             "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor     "org.projectlombok:lombok:$lombokVersion"
+    annotationProcessor "org.projectlombok:lombok-mapstruct-binding:$lombokMapStructBindingVersion"
     testCompileOnly         "org.projectlombok:lombok:$lombokVersion"
     testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
 
@@ -80,4 +81,4 @@ spotless {
 }
 tasks.withType(JavaCompile) {
     dependsOn 'spotlessApply'
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
index 63d702c..1617f12 100644
--- a/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
@@ -121,8 +121,7 @@ public abstract class BaseIntegrationTest {
      */
     WireMock.stubFor(
         WireMock.post(
-                WireMock.urlMatching(
-                    String.format("/realms/%s/protocol/openid-connect/token", realm)))
+                WireMock.urlMatching("/realms/%s/protocol/openid-connect/token".formatted(realm)))
             .withRequestBody(
                 WireMock.containing("grant_type=urn:ietf:params:oauth:grant-type:uma-ticket"))
             .willReturn(
diff --git a/app/src/test/java/org/onap/portalng/bff/rbac/RoleBaseAccessIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/rbac/RoleBaseAccessIntegrationTest.java
index 2c89547..b894973 100644
--- a/app/src/test/java/org/onap/portalng/bff/rbac/RoleBaseAccessIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/rbac/RoleBaseAccessIntegrationTest.java
@@ -35,8 +35,7 @@ public class RoleBaseAccessIntegrationTest extends BaseIntegrationTest {
 
     WireMock.stubFor(
         WireMock.post(
-                WireMock.urlMatching(
-                    String.format("/realms/%s/protocol/openid-connect/token", realm)))
+                WireMock.urlMatching("/realms/%s/protocol/openid-connect/token".formatted(realm)))
             .withRequestBody(
                 WireMock.containing("grant_type=urn:ietf:params:oauth:grant-type:uma-ticket"))
             .willReturn(
@@ -59,8 +58,7 @@ public class RoleBaseAccessIntegrationTest extends BaseIntegrationTest {
 
     WireMock.stubFor(
         WireMock.post(
-                WireMock.urlMatching(
-                    String.format("/realms/%s/protocol/openid-connect/token", realm)))
+                WireMock.urlMatching("/realms/%s/protocol/openid-connect/token".formatted(realm)))
             .withRequestBody(
                 WireMock.containing("grant_type=urn:ietf:params:oauth:grant-type:uma-ticket"))
             .willReturn(
@@ -83,8 +81,7 @@ public class RoleBaseAccessIntegrationTest extends BaseIntegrationTest {
 
     WireMock.stubFor(
         WireMock.post(
-                WireMock.urlMatching(
-                    String.format("/realms/%s/protocol/openid-connect/token", realm)))
+                WireMock.urlMatching("/realms/%s/protocol/openid-connect/token".formatted(realm)))
             .withRequestBody(
                 WireMock.containing("grant_type=urn:ietf:params:oauth:grant-type:uma-ticket"))
             .willReturn(
diff --git a/build.gradle b/build.gradle
index 0149e03..b5f8aed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ ext {
     logbackVersion = '7.4'
     lombokVersion = '1.18.36'
     swaggerV3Version = '2.2.21'
+    lombokMapStructBindingVersion = '0.2.0'
 
     // app
     wiremockVersion = '4.0.4'
diff --git a/lib/build.gradle b/lib/build.gradle
index 1e8d11c..1323cb4 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -29,7 +29,6 @@ dependencies {
     implementation "org.mapstruct:mapstruct:$mapStructVersion"
     implementation "org.mapstruct.extensions.spring:mapstruct-spring-annotations:$mapStructExtensionsVersion"
     implementation "org.mapstruct.extensions.spring:mapstruct-spring-extensions:$mapStructExtensionsVersion"
-    implementation "io.swagger.core.v3:swagger-annotations:$swaggerV3Version"
 
     implementation 'io.micrometer:micrometer-tracing'
     implementation 'io.micrometer:micrometer-tracing-bridge-otel'
@@ -41,6 +40,7 @@ dependencies {
 
     compileOnly             "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor     "org.projectlombok:lombok:$lombokVersion"
+    annotationProcessor "org.projectlombok:lombok-mapstruct-binding:$lombokMapStructBindingVersion"
     testCompileOnly         "org.projectlombok:lombok:$lombokVersion"
     testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
 }
@@ -98,3 +98,6 @@ def Properties getVersionProperties() {
 	}
 	return versionProperties
 }
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java
index 6c5e8ea..f7cc93b 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java
@@ -54,7 +54,8 @@ public class SecurityConfig {
             basic ->
                 basic
                     .disable()
-                    .formLogin(login -> login.disable().csrf(csrf -> csrf.disable().cors())))
+                    .formLogin(
+                        login -> login.disable().csrf(csrf -> csrf.disable().cors(withDefaults()))))
         .authorizeExchange(
             exchange ->
                 exchange
diff --git a/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
index cca9c06..921debb 100644
--- a/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
@@ -71,7 +71,7 @@ public class KeycloakConfig extends AbstractClientConfig<ErrorResponseKeycloakDt
 
     // Extract service name and version from BasePath
     String urlBasePathPrefix =
-        String.format("%s/admin/realms/%s", bffConfig.getKeycloakUrl(), bffConfig.getRealm());
+        "%s/admin/realms/%s".formatted(bffConfig.getKeycloakUrl(), bffConfig.getRealm());
 
     return apiConstructor.apply(apiClient.setBasePath(urlBasePathPrefix));
   }
diff --git a/openapi/build.gradle b/openapi/build.gradle
index 75e66b2..3ded36a 100644
--- a/openapi/build.gradle
+++ b/openapi/build.gradle
@@ -5,4 +5,7 @@ plugins {
 ext {
   openapiVersion = '7.4.0'
   springBootVersion = '3.2.3'
+}
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
 }
\ No newline at end of file
diff --git a/openapi/client-history/build.gradle b/openapi/client-history/build.gradle
index ef47381..3e81a51 100644
--- a/openapi/client-history/build.gradle
+++ b/openapi/client-history/build.gradle
@@ -50,3 +50,6 @@ idea {
     generatedSourceDirs += file("$buildDir/openapi/src/main/java")
   }
 }
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/openapi/client-keycloak/build.gradle b/openapi/client-keycloak/build.gradle
index 21229bc..303abf8 100644
--- a/openapi/client-keycloak/build.gradle
+++ b/openapi/client-keycloak/build.gradle
@@ -49,4 +49,7 @@ idea {
   module {
     generatedSourceDirs += file("$buildDir/openapi/src/main/java")
   }
+}
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
 }
\ No newline at end of file
diff --git a/openapi/client-preferences/build.gradle b/openapi/client-preferences/build.gradle
index 8342ee3..3d34da1 100644
--- a/openapi/client-preferences/build.gradle
+++ b/openapi/client-preferences/build.gradle
@@ -54,3 +54,6 @@ idea {
     generatedSourceDirs += file("$buildDir/openapi/src/main/java")
   }
 }
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/openapi/server/build.gradle b/openapi/server/build.gradle
index 9307fcc..153d333 100644
--- a/openapi/server/build.gradle
+++ b/openapi/server/build.gradle
@@ -55,4 +55,7 @@ idea {
   module {
     generatedSourceDirs += file("$buildDir/openapi/src/main/java")
   }
+}
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 9083a3d..612d3cc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,7 +3,7 @@ pluginManagement {
     // https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_version_management
     plugins {
         id 'io.spring.dependency-management' version '1.1.7'
-        id 'org.springframework.boot' version '3.3.3'
+        id 'org.springframework.boot' version '3.3.10'
         id 'org.openapi.generator' version '7.4.0'
         id 'com.github.johnrengelman.shadow' version '7.1.2'
         id 'com.gorylenko.gradle-git-properties' version '2.4.1'
-- 
2.16.6