Merge pull request #443 from espoon-voltti/dependabot/gradle/service/…

…plugin.spring-2.1.0 Bump plugin.spring from 2.0.0 to 2.1.0 in /service
espoon-voltti · Dec 3, 2024 · 37a0a0b · 37a0a0b
2 parents 7c608d7 + dab0da3
commit 37a0a0b
Show file tree

Hide file tree

Showing 24 changed files with 363 additions and 253 deletions.
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -9,10 +9,10 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 plugins {
     id("org.springframework.boot") version "3.4.0"
     id("io.spring.dependency-management") version "1.1.5"
-    kotlin("jvm") version "2.0.0"
-    kotlin("plugin.spring") version "2.0.0"
+    kotlin("jvm") version "2.1.0"
+    kotlin("plugin.spring") version "2.1.0"
     id("org.flywaydb.flyway") version "11.0.0"
-    id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
     id("org.owasp.dependencycheck") version "11.1.0"
 
     idea
@@ -45,6 +45,10 @@ idea {
     }
 }
 
+ktlint {
+    version.set("1.4.1")
+}
+
 dependencies {
     api(kotlin("stdlib"))
     implementation("org.jetbrains.kotlin:kotlin-reflect")
@@ -116,12 +120,10 @@ tasks.register("resolveDependencies") {
                 it.isCanBeResolved &&
                     // ignore configurations that fetch sources (e.g. Java source code)
                     !it.name.endsWith("dependencySources", ignoreCase = true)
-            }
-            .map {
+            }.map {
                 val files = it.resolve()
                 it.name to files.size
-            }
-            .groupBy({ (_, count) -> count }) { (name, _) -> name }
+            }.groupBy({ (_, count) -> count }) { (name, _) -> name }
             .forEach { (count, names) ->
                 println(
                     "Resolved $count dependency files for configurations: ${names.joinToString(", ")}"

diff --git a/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/PlaywrightTest.kt b/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/PlaywrightTest.kt
@@ -55,7 +55,8 @@ abstract class PlaywrightTest {
         playwright = Playwright.create()
         browser =
             playwright.chromium().launch(
-                BrowserType.LaunchOptions()
+                BrowserType
+                    .LaunchOptions()
                     .setHeadless(runningInDocker)
                     .setTimeout(10_000.0)
             )

diff --git a/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/CreateStudentPage.kt b/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/CreateStudentPage.kt
@@ -9,7 +9,9 @@ import com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat
 import fi.espoo.oppivelvollisuus.baseUrl
 import fi.espoo.oppivelvollisuus.dataQa
 
-class CreateStudentPage(private val page: Page) {
+class CreateStudentPage(
+    private val page: Page
+) {
     val saveButton = page.locator(dataQa("save-button"))
     val dateOfBirthInput = page.locator(dataQa("date-of-birth-input"))
     val lastNameInput = page.locator(dataQa("last-name-input"))

diff --git a/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/LoginPage.kt b/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/LoginPage.kt
@@ -9,7 +9,9 @@ import com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat
 import fi.espoo.oppivelvollisuus.baseUrl
 import fi.espoo.oppivelvollisuus.dataQa
 
-class LoginPage(private val page: Page) {
+class LoginPage(
+    private val page: Page
+) {
     val startLoginButton = page.locator(dataQa("start-login"))
     val loggedInUser = page.locator(dataQa("logged-in-user"))
 

diff --git a/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/StudentPage.kt b/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/StudentPage.kt
@@ -10,7 +10,9 @@ import fi.espoo.oppivelvollisuus.baseUrl
 import fi.espoo.oppivelvollisuus.dataQa
 import java.util.regex.Pattern
 
-class StudentPage(private val page: Page) {
+class StudentPage(
+    private val page: Page
+) {
     val studentName = page.locator(dataQa("student-name"))
 
     fun assertUrl() {

diff --git a/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/StudentsSearchPage.kt b/service/src/e2eTest/kotlin/fi/espoo/oppivelvollisuus/pages/StudentsSearchPage.kt
@@ -9,7 +9,9 @@ import com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat
 import fi.espoo.oppivelvollisuus.baseUrl
 import fi.espoo.oppivelvollisuus.dataQa
 
-class StudentsSearchPage(private val page: Page) {
+class StudentsSearchPage(
+    private val page: Page
+) {
     val createStudentButton = page.locator(dataQa("create-student-button"))
 
     fun assertUrl() {

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/SystemController.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/SystemController.kt
@@ -37,16 +37,13 @@ class SystemController {
     @PostMapping("/user-login")
     fun userLogin(
         @RequestBody adUser: AdUser
-    ): AppUser {
-        return jdbi.inTransactionUnchecked { it.upsertAppUserFromAd(adUser) }.also {
+    ): AppUser =
+        jdbi.inTransactionUnchecked { it.upsertAppUserFromAd(adUser) }.also {
             logger.audit(AuthenticatedUser(it.id), "USER_LOGIN")
         }
-    }
 
     @GetMapping("/users/{id}")
     fun getUser(
         @PathVariable id: UUID
-    ): AppUser? {
-        return jdbi.inTransactionUnchecked { it.getAppUser(id) }
-    }
+    ): AppUser? = jdbi.inTransactionUnchecked { it.getAppUser(id) }
 }
diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/common/AppUser.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/common/AppUser.kt
@@ -40,10 +40,8 @@ VALUES (:externalId, :firstName, :lastName, :email)
 ON CONFLICT (external_id) DO UPDATE
 SET updated = now(), first_names = :firstName, last_name = :lastName, email = :email
 RETURNING id, external_id, first_name, last_name, email
-    """
-            .trimIndent()
-    )
-        .bindKotlin(adUser)
+        """.trimIndent()
+    ).bindKotlin(adUser)
         .mapTo<AppUser>()
         .one()
 
@@ -63,10 +61,8 @@ fun Handle.getAppUser(id: UUID) =
 SELECT id, external_id, first_name, last_name, email
 FROM users 
 WHERE id = :id AND NOT system_user
-    """
-            .trimIndent()
-    )
-        .bind("id", id)
+        """.trimIndent()
+    ).bind("id", id)
         .mapTo<AppUser>()
         .findOne()
         .getOrNull()
diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/Auth.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/Auth.kt
@@ -69,7 +69,9 @@ class HttpAccessControl : HttpFilter() {
         }
 }
 
-class JwtTokenDecoder(private val jwtVerifier: JWTVerifier) : HttpFilter() {
+class JwtTokenDecoder(
+    private val jwtVerifier: JWTVerifier
+) : HttpFilter() {
     private val logger = KotlinLogging.logger {}
 
     override fun doFilter(
@@ -78,7 +80,8 @@ class JwtTokenDecoder(private val jwtVerifier: JWTVerifier) : HttpFilter() {
         chain: FilterChain
     ) {
         try {
-            request.getBearerToken()
+            request
+                .getBearerToken()
                 ?.takeIf { it.isNotEmpty() }
                 ?.let { request.setDecodedJwt(jwtVerifier.verify(it)) }
         } catch (e: JWTVerificationException) {

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/ExceptionHandler.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/ExceptionHandler.kt
@@ -35,7 +35,8 @@ class ExceptionHandler : ResponseEntityExceptionHandler() {
         ex: BadRequest
     ): ResponseEntity<ErrorResponse> {
         logger.warn("Bad request (${ex.message})", ex)
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+        return ResponseEntity
+            .status(HttpStatus.BAD_REQUEST)
             .body(ErrorResponse(errorCode = ex.errorCode))
     }
 
@@ -45,7 +46,8 @@ class ExceptionHandler : ResponseEntityExceptionHandler() {
         ex: NotFound
     ): ResponseEntity<ErrorResponse> {
         logger.warn("Not found (${ex.message})", ex)
-        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+        return ResponseEntity
+            .status(HttpStatus.NOT_FOUND)
             .body(ErrorResponse(errorCode = ex.errorCode))
     }
 
@@ -55,7 +57,8 @@ class ExceptionHandler : ResponseEntityExceptionHandler() {
         ex: Conflict
     ): ResponseEntity<ErrorResponse> {
         logger.warn("fi.espoo.oppivelvollisuus.common.Conflict (${ex.message})", ex)
-        return ResponseEntity.status(HttpStatus.CONFLICT)
+        return ResponseEntity
+            .status(HttpStatus.CONFLICT)
             .body(ErrorResponse(errorCode = ex.errorCode))
     }
 
@@ -65,7 +68,8 @@ class ExceptionHandler : ResponseEntityExceptionHandler() {
         ex: Unauthorized
     ): ResponseEntity<ErrorResponse> {
         logger.warn("fi.espoo.oppivelvollisuus.common.Unauthorized (${ex.message})", ex)
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+        return ResponseEntity
+            .status(HttpStatus.UNAUTHORIZED)
             .body(ErrorResponse(errorCode = ex.errorCode))
     }
 
@@ -75,7 +79,8 @@ class ExceptionHandler : ResponseEntityExceptionHandler() {
         ex: Forbidden
     ): ResponseEntity<ErrorResponse> {
         logger.warn("fi.espoo.oppivelvollisuus.common.Forbidden (${ex.message})", ex)
-        return ResponseEntity.status(HttpStatus.FORBIDDEN)
+        return ResponseEntity
+            .status(HttpStatus.FORBIDDEN)
             .body(ErrorResponse(errorCode = ex.errorCode))
     }
 

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/JacksonConfig.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/JacksonConfig.kt
@@ -17,16 +17,17 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
 fun defaultJsonMapperBuilder(): JsonMapper.Builder =
-    JsonMapper.builder()
+    JsonMapper
+        .builder()
         .addModules(
-            KotlinModule.Builder()
+            KotlinModule
+                .Builder()
                 .enable(KotlinFeature.SingletonSupport)
                 .build(),
             JavaTimeModule(),
             Jdk8Module(),
             ParameterNamesModule()
-        )
-        .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+        ).disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
 
 @Configuration
 class JacksonConfig {

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/JwtConfig.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/JwtConfig.kt
@@ -26,15 +26,21 @@ import java.security.spec.RSAPublicKeySpec
 class JwtConfig {
     @Bean
     fun rsaJwtAlgorithm(env: AppEnv): Algorithm {
-        val publicKeys = env.jwt.publicKeysUrl.toURL().openStream().use { loadPublicKeys(it) }
+        val publicKeys =
+            env.jwt.publicKeysUrl
+                .toURL()
+                .openStream()
+                .use { loadPublicKeys(it) }
         return Algorithm.RSA256(JwtKeys(publicKeys))
     }
 
     @Bean
     fun jwtVerifier(algorithm: Algorithm): JWTVerifier = JWT.require(algorithm).acceptLeeway(1).build()
 }
 
-class JwtKeys(private val publicKeys: Map<String, RSAPublicKey>) : RSAKeyProvider {
+class JwtKeys(
+    private val publicKeys: Map<String, RSAPublicKey>
+) : RSAKeyProvider {
     override fun getPrivateKeyId(): String? = null
 
     override fun getPrivateKey(): RSAPrivateKey? = null
@@ -44,15 +50,23 @@ class JwtKeys(private val publicKeys: Map<String, RSAPublicKey>) : RSAKeyProvide
 
 fun loadPublicKeys(inputStream: InputStream): Map<String, RSAPublicKey> {
     @JsonIgnoreProperties(ignoreUnknown = true)
-    class Jwk(val kid: String, val n: ByteArray, val e: ByteArray)
+    class Jwk(
+        val kid: String,
+        val n: ByteArray,
+        val e: ByteArray
+    )
 
-    class JwkSet(val keys: List<Jwk>)
+    class JwkSet(
+        val keys: List<Jwk>
+    )
 
     val kf = KeyFactory.getInstance("RSA")
     return jacksonMapperBuilder()
         .defaultBase64Variant(Base64Variants.MODIFIED_FOR_URL)
         .build()
-        .readValue<JwkSet>(inputStream).keys.associate {
+        .readValue<JwkSet>(inputStream)
+        .keys
+        .associate {
             it.kid to
                 kf.generatePublic(
                     RSAPublicKeySpec(

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/SpringMvcConfig.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/SpringMvcConfig.kt
@@ -25,9 +25,8 @@ class SpringMvcConfig : WebMvcConfigurer {
 }
 
 object AuthenticatedUserResolver : HandlerMethodArgumentResolver {
-    override fun supportsParameter(parameter: MethodParameter): Boolean {
-        return AuthenticatedUser::class.java.isAssignableFrom(parameter.parameterType)
-    }
+    override fun supportsParameter(parameter: MethodParameter): Boolean =
+        AuthenticatedUser::class.java.isAssignableFrom(parameter.parameterType)
 
     override fun resolveArgument(
         parameter: MethodParameter,

diff --git a/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/SsnMasker.kt b/service/src/main/kotlin/fi/espoo/oppivelvollisuus/config/SsnMasker.kt
@@ -11,8 +11,8 @@ class SsnMasker : ValueMasker {
     override fun mask(
         context: JsonStreamContext?,
         value: Any?
-    ): Any {
-        return if (value is String) {
+    ): Any =
+        if (value is String) {
             value.replace(
                 Regex(
                     "(?<!-|[\\dA-z])(\\d{2})(\\d{2})(\\d{2})[-+ABCDEFUVWXY](\\d{3})[\\dA-Z](?!-)",
@@ -23,5 +23,4 @@ class SsnMasker : ValueMasker {
         } else {
             value ?: "null"
         }
-    }
 }