chore: use Spring Boot 4.1.x (#328)

5 files changed, 66 insertions, 32 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 49382a2..49f5652 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,11 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 
 plugins {
     java
-    id("org.springframework.boot") version "4.0.8"
+    id("org.springframework.boot") version "4.1.1"
     id("io.spring.dependency-management") version "1.1.7"
     id("com.diffplug.spotless") version "8.0.0"
-    id("net.ltgt.errorprone") version "5.1.0"
-    id("net.ltgt.nullaway") version "3.0.0"
+    id("net.ltgt.errorprone") version "5.1.1"
+    id("net.ltgt.nullaway") version "3.3.0"
     kotlin("jvm") version "2.4.10"
     kotlin("plugin.spring") version "2.4.10"
     jacoco
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index eddabd2..5097068 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ad7845b..9b7cb4a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/gradlew.bat b/gradlew.bat
index 8508ef6..03754c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,33 @@
 @rem Set local scope for the variables, and ensure extensions are enabled

 setlocal EnableExtensions

 

+@rem Catch executions from older scripts and ensure they exit cleanly.

+@rem This can be removed once we can be reasonably confident that few people

+@rem will be migrating directly to this new wrapper.

+goto afterSafetyNet

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+goto exitWithErrorLevel

+:afterSafetyNet

+

 set DIRNAME=%~dp0

 if "%DIRNAME%"=="" set DIRNAME=.

 @rem This is normally unused

@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1

 if %ERRORLEVEL% equ 0 goto execute

 

-echo. 1>&2

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2

-echo. 1>&2

-echo Please set the JAVA_HOME variable in your environment to match the 1>&2

-echo location of your Java installation. 1>&2

+1>&2 echo.

+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+1>&2 echo.

+1>&2 echo Please set the JAVA_HOME variable in your environment to match the

+1>&2 echo location of your Java installation.

 

 "%COMSPEC%" /c exit 1

+goto exitWithErrorLevel

 

 :findJavaFromJavaHome

 set JAVA_HOME=%JAVA_HOME:"=%

@@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 

 if exist "%JAVA_EXE%" goto execute

 

-echo. 1>&2

-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2

-echo. 1>&2

-echo Please set the JAVA_HOME variable in your environment to match the 1>&2

-echo location of your Java installation. 1>&2

+1>&2 echo.

+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+1>&2 echo.

+1>&2 echo Please set the JAVA_HOME variable in your environment to match the

+1>&2 echo location of your Java installation.

 

 "%COMSPEC%" /c exit 1

+goto exitWithErrorLevel

 

 :execute

 @rem Setup the command line

@@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2
 @rem Execute gradlew

 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded

 @rem which allows us to clear the local environment before executing the java command

-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel

+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel

 

+@rem This label must not be changed. We rely on old scripts being able to jump to this point.

 :exitWithErrorLevel

 @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts

 "%COMSPEC%" /c exit %ERRORLEVEL%

diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt
index b87a1bd..3f51420 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt
@@ -131,24 +131,28 @@ class AppSecurityConfiguration(private val securityConfigProperties: SecurityCon
       appSecurityConfigProperties: SecurityConfigProperties,
   ): GrantedAuthoritiesMapper {
     return GrantedAuthoritiesMapper { grantedAuthority ->
-      grantedAuthority
-          .filterIsInstance<OidcUserAuthority>()
-          .onEach {
-            val userRole = userRoleRepository.findByUsername(it.userInfo.preferredUsername)
-            if (userRole.isEmpty) {
-              userRoleRepository.save(
-                  UserRole(
-                      null,
-                      it.userInfo.preferredUsername,
-                      appSecurityConfigProperties.defaultNewUserRole,
-                  )
-              )
+        grantedAuthority
+            .asSequence()
+            .filterIsInstance<OidcUserAuthority>()
+            .map { it.userInfo?.preferredUsername.orEmpty() }
+            .filter { it.isNotBlank() }
+            .onEach {
+                val userRole = userRoleRepository.findByUsername(it)
+                if (userRole.isEmpty) {
+                    userRoleRepository.save(
+                        UserRole(
+                            null,
+                            it,
+                            appSecurityConfigProperties.defaultNewUserRole,
+                        )
+                    )
+                }
             }
-          }
-          .map {
-            val userRole = userRoleRepository.findByUsername(it.userInfo.preferredUsername)
-            SimpleGrantedAuthority("ROLE_${userRole.get().role.toString().uppercase()}")
-          }
+            .map {
+                val userRole = userRoleRepository.findByUsername(it)
+                SimpleGrantedAuthority("ROLE_${userRole.get().role.toString().uppercase()}")
+            }
+            .toList()
     }
   }