upgraded micronaut to 4

build.gradle

@@ -2,10 +2,10 @@ import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
-    id 'java-library'
+    id 'io.seqera.wave.java-library-conventions'
     id 'io.seqera.wave.groovy-application-conventions'
-    id "com.github.johnrengelman.shadow" version "7.1.1"
-    id "io.micronaut.minimal.application" version "3.7.0"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "io.micronaut.minimal.application" version "4.1.1"
     id "com.google.cloud.tools.jib" version "3.4.2"
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
 }
@@ -28,13 +28,14 @@ repositories {
 }
 
 dependencies {
+    annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
     annotationProcessor("io.micronaut:micronaut-http-validation")
     compileOnly("io.micronaut.data:micronaut-data-processor")
     compileOnly("io.micronaut:micronaut-inject-groovy")
     compileOnly("io.micronaut:micronaut-http-validation")
     implementation("jakarta.persistence:jakarta.persistence-api:3.0.0")
-    api 'io.seqera:lib-mail:1.0.0'
-    api 'io.seqera:wave-api:0.10.0'
+    api 'io.seqera:lib-mail:1.1.0'
+    api 'io.seqera:wave-api:0.11.0'
     api 'io.seqera:wave-utils:0.13.1'
 
     implementation("io.micronaut:micronaut-http-client")
@@ -43,15 +44,16 @@ dependencies {
     implementation("io.micronaut.reactor:micronaut-reactor")
     implementation("io.micronaut.reactor:micronaut-reactor-http-client")
     implementation("jakarta.annotation:jakarta.annotation-api")
-    implementation("io.micronaut:micronaut-validation")
+    implementation("io.micronaut.validation:micronaut-validation")
     implementation 'io.micronaut.security:micronaut-security'
-    implementation "org.codehaus.groovy:groovy-json"
-    implementation "org.codehaus.groovy:groovy-nio"
+    implementation "org.apache.groovy:groovy-json"
+    implementation "org.apache.groovy:groovy-nio"
     implementation 'com.google.guava:guava:32.1.2-jre'
     implementation 'dev.failsafe:failsafe:3.1.0'
-    implementation('io.projectreactor:reactor-core')
+    implementation 'io.micronaut.reactor:micronaut-reactor'
+    implementation 'io.micronaut.reactor:micronaut-reactor-http-client'
     implementation("io.seqera:tower-crypto:22.4.0-watson") { transitive = false }  // to be replaced with 22.4.0 once released
-    implementation 'org.apache.commons:commons-compress:1.24.0'
+    implementation 'org.apache.commons:commons-compress:1.26.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'io.kubernetes:client-java:19.0.0'
     implementation 'io.kubernetes:client-java-api-fluent:18.0.1'
@@ -62,6 +64,7 @@ dependencies {
     implementation 'com.squareup.moshi:moshi-adapters:1.14.0'
     implementation 'redis.clients:jedis:5.0.2'
     implementation "io.github.resilience4j:resilience4j-ratelimiter:0.17.0"
+    implementation("io.micronaut:micronaut-retry")
     // caching deps
     implementation("io.micronaut.cache:micronaut-cache-core")
     implementation("io.micronaut.cache:micronaut-cache-caffeine")
@@ -84,7 +87,7 @@ dependencies {
     testImplementation("org.testcontainers:mysql:1.17.3")
 
     // --
-    implementation("ch.qos.logback:logback-classic:1.4.8")
+    implementation("ch.qos.logback:logback-classic:1.5.3")
 
     // rate limit
     implementation 'com.github.seqeralabs:spillway:7b72700293'

buildSrc/src/main/groovy/io.seqera.wave.groovy-application-conventions.gradle

@@ -12,7 +12,7 @@ plugins {
 
 group = 'io.seqera'
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     // note: "--enable-preview" is required to use virtual thread on Java 19 and 20
-    jvmArgs (["--enable-preview"])
+    jvmArgs(["--enable-preview"])
 }

buildSrc/src/main/groovy/io.seqera.wave.groovy-common-conventions.gradle

@@ -22,9 +22,9 @@ compileJava {
     options.release.set(11)
 }
 
-tasks.withType(GroovyCompile) {
-    sourceCompatibility = '11'
-    targetCompatibility = '11'
+tasks.withType(GroovyCompile).configureEach {
+    sourceCompatibility = '17'
+    targetCompatibility = '17'
 }
 
 group = 'io.seqera'

buildSrc/src/main/groovy/io.seqera.wave.java-library-conventions.gradle

@@ -24,9 +24,9 @@ compileJava {
     options.release.set(11)
 }
 
-tasks.withType(GroovyCompile) {
-    sourceCompatibility = '11'
-    targetCompatibility = '11'
+tasks.withType(GroovyCompile).configureEach {
+    sourceCompatibility = '17'
+    targetCompatibility = '17'
 }
 
 test {
@@ -40,21 +40,21 @@ java {
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'org.slf4j:slf4j-api:2.0.13'
 
-    testImplementation 'ch.qos.logback:logback-core:1.2.11'
-    testImplementation 'ch.qos.logback:logback-classic:1.2.11'
-    testImplementation "org.codehaus.groovy:groovy:3.0.15"
-    testImplementation "org.codehaus.groovy:groovy-nio:3.0.15"
-    testImplementation ("org.codehaus.groovy:groovy-test:3.0.17")
-    testImplementation ("cglib:cglib-nodep:3.3.0")
-    testImplementation ("org.objenesis:objenesis:3.2")
-    testImplementation ("org.spockframework:spock-core:2.3-groovy-3.0") { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
-    testImplementation ('org.spockframework:spock-junit4:2.3-groovy-3.0') { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
+    testImplementation 'ch.qos.logback:logback-core:1.4.11'
+    testImplementation 'ch.qos.logback:logback-classic:1.4.11'
+    testImplementation 'org.apache.groovy:groovy:4.0.15'
+    testImplementation 'org.apache.groovy:groovy-nio:4.0.15'
+    testImplementation 'org.apache.groovy:groovy-test:4.0.15'
+    testImplementation 'org.objenesis:objenesis:3.4'
+    testImplementation 'net.bytebuddy:byte-buddy:1.14.17'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
+    testImplementation 'org.spockframework:spock-junit4:2.3-groovy-4.0'
 }
 
-tasks.withType(Test) {
-    jvmArgs ([
+tasks.withType(Test).configureEach {
+    jvmArgs([
             '--enable-preview',
             '--add-opens=java.base/java.lang=ALL-UNNAMED',
             '--add-opens=java.base/java.io=ALL-UNNAMED',

gradle.properties

@@ -16,5 +16,5 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-micronautVersion=3.10.3
+micronautVersion=4.6.0
 micronautEnvs=dev,h2,mail,aws-ses

src/main/groovy/io/seqera/wave/auth/BasicAuthenticationProvider.groovy

@@ -19,44 +19,39 @@
 package io.seqera.wave.auth
 
 import groovy.util.logging.Slf4j
+import io.micronaut.core.annotation.NonNull
 import io.micronaut.core.annotation.Nullable
 import io.micronaut.http.HttpRequest
-import io.micronaut.security.authentication.AuthenticationProvider
+import io.micronaut.security.authentication.AuthenticationFailureReason
 import io.micronaut.security.authentication.AuthenticationRequest
 import io.micronaut.security.authentication.AuthenticationResponse
+import io.micronaut.security.authentication.provider.HttpRequestAuthenticationProvider
 import io.seqera.wave.service.account.AccountService
 import io.seqera.wave.util.StringUtils
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
-import org.reactivestreams.Publisher
-import reactor.core.publisher.Flux
-import reactor.core.publisher.FluxSink
 /**
  * Basic Authentication provider
  *
  * @author Munish Chouhan <[email protected]>
  */
 @Slf4j
 @Singleton
-class BasicAuthenticationProvider implements AuthenticationProvider {
+class BasicAuthenticationProvider<B> implements HttpRequestAuthenticationProvider<B> {
 
     @Inject
     private AccountService accountService
 
     @Override
-    Publisher<AuthenticationResponse> authenticate(@Nullable HttpRequest<?> httpRequest, AuthenticationRequest<?, ?> authRequest) {
-        Flux.create(emitter -> {
-            final user = authRequest.identity?.toString()
-            final pass = authRequest.secret?.toString()
-            if (accountService.isAuthorised(user, pass)) {
-                log.trace "Auth request OK - user '$user'; password: '${StringUtils.redact(pass)}'"
-                emitter.next(AuthenticationResponse.success((String) authRequest.identity))
-                emitter.complete()
-            }
-            else {
-                log.trace "Auth request FAILED - user '$user'; password: '${StringUtils.redact(pass)}'"
-                emitter.error(AuthenticationResponse.exception())
-            }
-        }, FluxSink.OverflowStrategy.ERROR)
+    AuthenticationResponse authenticate(@Nullable HttpRequest<B> httpRequest, @NonNull AuthenticationRequest<String, String> authRequest) {
+        final user = authRequest.identity?.toString()
+        final pass = authRequest.secret?.toString()
+        if (accountService.isAuthorised(user, pass)) {
+            log.trace "Auth request OK - user '$user'; password: '${StringUtils.redact(pass)}'"
+            return AuthenticationResponse.success(authRequest.identity)
+        } else {
+            log.trace "Auth request FAILED - user '$user'; password: '${StringUtils.redact(pass)}'"
+            return AuthenticationResponse.failure(AuthenticationFailureReason.CREDENTIALS_DO_NOT_MATCH)
+        }
     }
 }

src/main/groovy/io/seqera/wave/auth/RegistryConfig.groovy

@@ -47,7 +47,7 @@ class RegistryConfig {
      *      io: [ ... ]
      *  ]
      */
-    private Map<String,Object> registries
+    Map<String,Object> registries
 
     RegistryKeys getRegistryKeys(String registryName) {
         final String defaultRegistry = registries.get('default')?.toString() ?: 'docker.io'

src/main/groovy/io/seqera/wave/controller/ContainerController.groovy

@@ -28,6 +28,7 @@ import io.micronaut.context.annotation.Value
 import io.micronaut.core.annotation.Nullable
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.Body
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Delete
 import io.micronaut.http.annotation.Error
@@ -160,13 +161,13 @@ class ContainerController {
     @Deprecated
     @Post('/container-token')
     @ExecuteOn(TaskExecutors.IO)
-    CompletableFuture<HttpResponse<SubmitContainerTokenResponse>> getToken(HttpRequest httpRequest, SubmitContainerTokenRequest req) {
+    CompletableFuture<HttpResponse<SubmitContainerTokenResponse>> getToken(HttpRequest httpRequest, @Body SubmitContainerTokenRequest req) {
         return getContainerImpl(httpRequest, req, false)
     }
 
     @Post('/v1alpha2/container')
     @ExecuteOn(TaskExecutors.IO)
-    CompletableFuture<HttpResponse<SubmitContainerTokenResponse>> getTokenV2(HttpRequest httpRequest, SubmitContainerTokenRequest req) {
+    CompletableFuture<HttpResponse<SubmitContainerTokenResponse>> getTokenV2(HttpRequest httpRequest, @Body SubmitContainerTokenRequest req) {
         return getContainerImpl(httpRequest, req, true)
     }
 

src/main/groovy/io/seqera/wave/controller/InspectController.groovy

@@ -24,6 +24,7 @@ import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.context.annotation.Value
 import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.Body
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Post
 import io.micronaut.scheduling.TaskExecutors
@@ -68,7 +69,7 @@ class InspectController {
     private String serverUrl
 
     @Post("/v1alpha1/inspect")
-    CompletableFuture<HttpResponse<ContainerInspectResponse>> inspect(ContainerInspectRequest req) {
+    CompletableFuture<HttpResponse<ContainerInspectResponse>> inspect(@Body ContainerInspectRequest req) {
 
         if( !req.containerImage )
             throw new BadRequestException("Missing 'containerImage' attribute")

src/main/groovy/io/seqera/wave/controller/ValidateController.groovy

@@ -18,14 +18,14 @@
 
 package io.seqera.wave.controller
 
-import javax.validation.Valid
-
+import io.micronaut.http.annotation.Body
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Post
 import io.micronaut.scheduling.TaskExecutors
 import io.micronaut.scheduling.annotation.ExecuteOn
 import io.seqera.wave.auth.RegistryAuthService
 import jakarta.inject.Inject
+import jakarta.validation.Valid
 import reactor.core.publisher.Mono
 
 @ExecuteOn(TaskExecutors.IO)
@@ -35,7 +35,7 @@ class ValidateController {
     @Inject RegistryAuthService loginService
 
     @Post
-    Mono<Boolean> validateCreds(@Valid ValidateRegistryCredsRequest request){
+    Mono<Boolean> validateCreds(@Valid @Body ValidateRegistryCredsRequest request){
         Mono.just(
             loginService.validateUser(request.registry, request.userName, request.password)
         )

src/main/groovy/io/seqera/wave/controller/ValidateRegistryCredsRequest.groovy

@@ -18,10 +18,8 @@
 
 package io.seqera.wave.controller
 
-import io.micronaut.core.annotation.Nullable
-import javax.validation.constraints.NotBlank
-
 import io.micronaut.core.annotation.Introspected
+import jakarta.validation.constraints.NotBlank
 
 @Introspected
 class ValidateRegistryCredsRequest {

src/main/groovy/io/seqera/wave/exchange/PairingRequest.groovy

@@ -18,11 +18,10 @@
 
 package io.seqera.wave.exchange
 
-import javax.validation.constraints.NotBlank
-import javax.validation.constraints.NotNull
-
 import groovy.transform.CompileStatic
 import io.micronaut.core.annotation.Introspected
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
 /**
  * Model the request for a remote service instance to register

src/main/groovy/io/seqera/wave/proxy/ErrResponse.groovy

@@ -90,17 +90,17 @@ class ErrResponse<T> implements HttpResponse<T> {
     }
 
     static ErrResponse<String> forString(String msg, HttpRequest request) {
-        final head = HttpHeaders.of('Content-Type': ['text/plain'], {true})
+        final head = HttpHeaders.of('Content-Type': ['text/plain'], (a, b) -> true)
         new ErrResponse<String>(statusCode: 400, body: msg, request: request, uri: request.uri(), headers: head)
     }
 
     static ErrResponse<InputStream> forStream(String msg, HttpRequest request) {
-        final head = HttpHeaders.of('Content-Type': ['text/plain'], {true})
+        final head = HttpHeaders.of('Content-Type': ['text/plain'], (a, b) -> true)
         new ErrResponse<InputStream>(statusCode: 400, body: new ByteArrayInputStream(msg.bytes), request: request, uri: request.uri(), headers: head)
     }
 
     static ErrResponse<byte[]> forByteArray(String msg, HttpRequest request) {
-        final head = HttpHeaders.of('Content-Type': ['text/plain'], {true})
+        final head = HttpHeaders.of('Content-Type': ['text/plain'], (a, b) -> true)
         new ErrResponse<byte[]>(statusCode: 400, body: msg.bytes, request: request, uri: request.uri(), headers: head)
     }
 }

src/main/groovy/io/seqera/wave/ratelimit/impl/SpillWayStorageFactory.groovy

@@ -18,18 +18,16 @@
 
 package io.seqera.wave.ratelimit.impl
 
-import javax.validation.constraints.NotNull
-
 import com.coveo.spillway.storage.InMemoryStorage
 import com.coveo.spillway.storage.LimitUsageStorage
 import com.coveo.spillway.storage.RedisStorage
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Requires
-import io.seqera.wave.configuration.RateLimiterConfig
 import io.seqera.wave.configuration.RedisConfig
 import jakarta.inject.Singleton
+import jakarta.validation.constraints.NotNull
 import redis.clients.jedis.JedisPool
 
 /**

src/main/groovy/io/seqera/wave/ratelimit/impl/SpillwayRateLimiter.groovy

@@ -18,8 +18,6 @@
 
 package io.seqera.wave.ratelimit.impl
 
-import javax.validation.constraints.NotNull
-
 import com.coveo.spillway.Spillway
 import com.coveo.spillway.SpillwayFactory
 import com.coveo.spillway.limit.Limit
@@ -34,6 +32,7 @@ import io.seqera.wave.exception.SlowDownException
 import io.seqera.wave.ratelimit.AcquireRequest
 import io.seqera.wave.ratelimit.RateLimiterService
 import jakarta.inject.Singleton
+import jakarta.validation.constraints.NotNull
 /**
  * This class manage how many requests can be requested from an user during a configurable period
  *
@@ -60,7 +59,7 @@ class SpillwayRateLimiter implements RateLimiterService {
         init(storage, config)
     }
 
-    protected void init(@NotNull LimitUsageStorage storage, @NotNull RateLimiterConfig config){
+    protected void init(LimitUsageStorage storage, RateLimiterConfig config){
         SpillwayFactory spillwayFactory = new SpillwayFactory(storage)
         initBuilds(spillwayFactory, config)
         initPulls(spillwayFactory, config)

src/main/groovy/io/seqera/wave/service/account/AccountServiceImpl.groovy

@@ -36,7 +36,7 @@ import jakarta.annotation.PostConstruct
 @ConfigurationProperties('wave')
 class AccountServiceImpl implements AccountService {
 
-    private Map<String,String> accounts = Map.of()
+    Map<String,String> accounts = Map.of()
 
     @PostConstruct
     private dumpAccounts() {
@@ -45,6 +45,7 @@ class AccountServiceImpl implements AccountService {
 
     @Override
     boolean isAuthorised(String username, String password) {
+        log.info("accounts: $accounts")
         if( !username || !password )
             return false
         if( !accounts.containsKey(username) )