Transition to spring boot 4

some deprecations here and there

Author: PrinsINT

server/Dockerfile

@@ -1,10 +1,9 @@
-FROM gradle:9.0.0-jdk21-alpine AS build
+FROM gradle:9.2.1-jdk25-alpine AS build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle build -x test
-RUN ls -la /home/gradle/src/build/libs
+RUN gradle build
 
-FROM eclipse-temurin:21.0.7_6-jre-alpine-3.21
+FROM eclipse-temurin:25.0.1_8-jre-alpine-3.23
 EXPOSE 8010:8080
 COPY --link --from=build /home/gradle/src/build/libs/galahad.jar /home/gradle/src/application.properties ./
 ENTRYPOINT ["java", "-Xms4g", "-Xmx8g", "-Dspring.profiles.active=prod", "-jar","galahad.jar"]

server/build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
-    kotlin("jvm") version "2.2.10"
-    kotlin("plugin.spring") version "2.2.10"
-    id("org.springframework.boot") version "3.5.5"
+    kotlin("jvm") version "2.3.0"
+    kotlin("plugin.spring") version "2.3.0"
+    id("org.springframework.boot") version "4.0.1"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
 group = "org.ivdnt"
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(25)
 }
 
 repositories {
@@ -20,31 +20,32 @@ dependencies {
     // Spring
     // Versions controlled by Spring Boot plugin
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-devtools")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+//    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
 
     // kotlin
     // Versions controlled by Kotlin jvm plugin
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 
     // swagger
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1")
 
     // logging
     implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
 
     // yaml
-    implementation("org.yaml:snakeyaml:2.4")
+    implementation("org.yaml:snakeyaml:2.5")
 
     // json
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 
     // xml
-    implementation("com.fasterxml:aalto-xml:1.3.3")
+    implementation("com.fasterxml:aalto-xml:1.3.4")
 
     // cache
-    implementation("com.github.ben-manes.caffeine:caffeine:3.2.2")
+    implementation("com.github.ben-manes.caffeine:caffeine:3.2.3")
 
     // reading microsoft word docx
     implementation("org.apache.poi:poi-ooxml:5.4.1")

server/gradlew

@@ -12,12 +12,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.core.convert.converter.Converter
 import org.springframework.scheduling.annotation.EnableScheduling
 import java.io.File
 import java.util.*
+import java.util.logging.Logger
 
 var application_profile: String = System.getenv("spring.profiles.active") ?: "prod"
 
@@ -28,7 +28,6 @@ fun main(args: Array<String>) {
 
 @Configuration
 @ConfigurationProperties(prefix = "")
-@EnableScheduling
 class Config {
     lateinit var workDir: String
 
@@ -41,8 +40,8 @@ class Config {
     }
 }
 
-@ComponentScan("org.ivdnt.galahad")
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = ["org.ivdnt.galahad"])
+@EnableScheduling
 class Galahad {
     /** Customize OpenAPI documentation header. */
     @Bean

server/gradlew.bat

@@ -6,9 +6,10 @@ import jakarta.servlet.http.HttpServletResponse
 import org.apache.logging.log4j.kotlin.Logging
 import org.ivdnt.galahad.exceptions.ErrorResponse
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.web.servlet.error.ErrorController
+import org.springframework.boot.webmvc.error.ErrorController
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.CrossOrigin
+import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -17,10 +18,13 @@ class ErrorController : ErrorController, Logging {
     @Autowired
     private val response: HttpServletResponse? = null
 
+
     @RequestMapping("/error")
     @Hidden
     @CrossOrigin
+    @ExceptionHandler
     fun handleError(request: HttpServletRequest): ErrorResponse {
+
         // Get the default status code (probably 500), or override it with the actual status code if it is a RESTException.
         var statusCode = HttpStatus.valueOf(request.getAttribute("jakarta.servlet.error.status_code") as Int? ?: 500)
         val jakartaException = request.getAttribute("jakarta.servlet.error.exception") as Exception?

server/src/main/kotlin/org/ivdnt/galahad/app/Galahad.kt

@@ -58,7 +58,7 @@ class DocumentsService(val corpora: CorporaService) : Logging {
             uploadZipFile(file, corpus)
         } else {
             createDocumentWithSourceLayer(
-                corpus, file.originalFilename, file.inputStream
+                corpus, file.originalFilename!!, file.inputStream
             )
         }
     }

server/src/main/kotlin/org/ivdnt/galahad/web/controller/ErrorController.kt

@@ -11,7 +11,7 @@ import org.ivdnt.galahad.util.TestUtil
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.MvcResult

server/src/main/kotlin/org/ivdnt/galahad/web/service/DocumentsService.kt

@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
 import org.springframework.test.context.ContextConfiguration
 
 @WebMvcTest(properties = ["spring.main.allow-bean-definition-overriding=true"])

server/src/test/kotlin/org/ivdnt/galahad/evaluation/assays/BenchmarksControllerTest.kt

@@ -1,34 +1,32 @@
-package com.myproject.config
-
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.PropertyNamingStrategy
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.http.converter.HttpMessageConverter
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
-import org.springframework.web.servlet.config.annotation.EnableWebMvc
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
-
-@Configuration
-@EnableWebMvc
-class WebConfig : WebMvcConfigurationSupport() {
-    public override fun configureMessageConverters(converters: MutableList<HttpMessageConverter<*>?>) {
-        converters.add(jackson2HttpMessageConverter())
-    }
-
-    @Bean
-    fun jackson2HttpMessageConverter(): MappingJackson2HttpMessageConverter {
-        val converter = MappingJackson2HttpMessageConverter()
-        val builder = this.jacksonBuilder()
-        converter.setObjectMapper(builder.build())
-        return converter
-    }
-
-    fun jacksonBuilder(): Jackson2ObjectMapperBuilder {
-        val builder = Jackson2ObjectMapperBuilder()
-        builder.serializationInclusion(JsonInclude.Include.NON_NULL)
-        return builder
-    }
-}
+//package org.ivdnt.galahad.util
+//
+//import com.fasterxml.jackson.annotation.JsonInclude
+//import org.springframework.context.annotation.Bean
+//import org.springframework.context.annotation.Configuration
+//import org.springframework.http.converter.HttpMessageConverter
+//import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
+//import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
+//import org.springframework.web.servlet.config.annotation.EnableWebMvc
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport
+//
+//@Configuration
+//@EnableWebMvc
+//class WebConfig : WebMvcConfigurationSupport() {
+//    public override fun configureMessageConverters(converters: MutableList<HttpMessageConverter<*>?>) {
+//        converters.add(jackson2HttpMessageConverter())
+//    }
+//
+//    @Bean
+//    fun jackson2HttpMessageConverter(): MappingJackson2HttpMessageConverter {
+//        val converter = MappingJackson2HttpMessageConverter()
+//        val builder = this.jacksonBuilder()
+//        converter.setObjectMapper(builder.build())
+//        return converter
+//    }
+//
+//    fun jacksonBuilder(): Jackson2ObjectMapperBuilder {
+//        val builder = Jackson2ObjectMapperBuilder()
+//        builder.serializationInclusion(JsonInclude.Include.NON_NULL)
+//        return builder
+//    }
+//}