diff --git a/src/main/groovy/io/seqera/wave/configuration/ScanConfig.groovy b/src/main/groovy/io/seqera/wave/configuration/ScanConfig.groovy index e77bb6937..51501adb3 100644 --- a/src/main/groovy/io/seqera/wave/configuration/ScanConfig.groovy +++ b/src/main/groovy/io/seqera/wave/configuration/ScanConfig.groovy @@ -21,7 +21,7 @@ package io.seqera.wave.configuration import java.nio.file.Files import java.nio.file.Path import java.time.Duration -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import javax.annotation.PostConstruct import groovy.transform.CompileStatic diff --git a/src/main/groovy/io/seqera/wave/configuration/TokenConfig.groovy b/src/main/groovy/io/seqera/wave/configuration/TokenConfig.groovy index a3d911126..ca11e590f 100644 --- a/src/main/groovy/io/seqera/wave/configuration/TokenConfig.groovy +++ b/src/main/groovy/io/seqera/wave/configuration/TokenConfig.groovy @@ -19,7 +19,7 @@ package io.seqera.wave.configuration import java.time.Duration -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.core.bind.annotation.Bindable diff --git a/src/main/groovy/io/seqera/wave/controller/ContainerBuildController.groovy b/src/main/groovy/io/seqera/wave/controller/ContainerBuildController.groovy index 94abc9346..a5d6b212f 100644 --- a/src/main/groovy/io/seqera/wave/controller/ContainerBuildController.groovy +++ b/src/main/groovy/io/seqera/wave/controller/ContainerBuildController.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.controller -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.util.logging.Slf4j diff --git a/src/main/groovy/io/seqera/wave/controller/RegistryProxyController.groovy b/src/main/groovy/io/seqera/wave/controller/RegistryProxyController.groovy index b2177e565..02ded12f7 100644 --- a/src/main/groovy/io/seqera/wave/controller/RegistryProxyController.groovy +++ b/src/main/groovy/io/seqera/wave/controller/RegistryProxyController.groovy @@ -21,7 +21,7 @@ package io.seqera.wave.controller import java.time.Instant import java.util.concurrent.CompletableFuture import java.util.function.Consumer -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import com.google.common.cache.CacheBuilder import com.google.common.cache.CacheLoader diff --git a/src/main/groovy/io/seqera/wave/controller/ServiceInfoController.groovy b/src/main/groovy/io/seqera/wave/controller/ServiceInfoController.groovy index 367120a7b..a918b647a 100644 --- a/src/main/groovy/io/seqera/wave/controller/ServiceInfoController.groovy +++ b/src/main/groovy/io/seqera/wave/controller/ServiceInfoController.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.controller -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.util.logging.Slf4j import io.micronaut.context.annotation.Value diff --git a/src/main/groovy/io/seqera/wave/controller/ValidateRegistryCredsRequest.groovy b/src/main/groovy/io/seqera/wave/controller/ValidateRegistryCredsRequest.groovy index 72658a0b8..dce588f4c 100644 --- a/src/main/groovy/io/seqera/wave/controller/ValidateRegistryCredsRequest.groovy +++ b/src/main/groovy/io/seqera/wave/controller/ValidateRegistryCredsRequest.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.controller -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import javax.validation.constraints.NotBlank import io.micronaut.core.annotation.Introspected diff --git a/src/main/groovy/io/seqera/wave/controller/ViewController.groovy b/src/main/groovy/io/seqera/wave/controller/ViewController.groovy index 6c4d48432..abc61dddc 100644 --- a/src/main/groovy/io/seqera/wave/controller/ViewController.groovy +++ b/src/main/groovy/io/seqera/wave/controller/ViewController.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.controller -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import io.micronaut.context.annotation.Value diff --git a/src/main/groovy/io/seqera/wave/core/RoutePath.groovy b/src/main/groovy/io/seqera/wave/core/RoutePath.groovy index 58e9cd315..5672e36d9 100644 --- a/src/main/groovy/io/seqera/wave/core/RoutePath.groovy +++ b/src/main/groovy/io/seqera/wave/core/RoutePath.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.core -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.Canonical import groovy.transform.CompileStatic diff --git a/src/main/groovy/io/seqera/wave/service/UserServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/UserServiceImpl.groovy index af1c78e31..c4e220944 100644 --- a/src/main/groovy/io/seqera/wave/service/UserServiceImpl.groovy +++ b/src/main/groovy/io/seqera/wave/service/UserServiceImpl.groovy @@ -20,7 +20,7 @@ package io.seqera.wave.service import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutionException -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.util.logging.Slf4j diff --git a/src/main/groovy/io/seqera/wave/service/builder/BuildRequest.groovy b/src/main/groovy/io/seqera/wave/service/builder/BuildRequest.groovy index 5b7f13e00..25bdb936d 100644 --- a/src/main/groovy/io/seqera/wave/service/builder/BuildRequest.groovy +++ b/src/main/groovy/io/seqera/wave/service/builder/BuildRequest.groovy @@ -21,7 +21,7 @@ package io.seqera.wave.service.builder import java.nio.file.Path import java.time.Instant import java.time.OffsetDateTime -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/src/main/groovy/io/seqera/wave/service/builder/ContainerBuildServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/builder/ContainerBuildServiceImpl.groovy index f50555467..e1b7aeb78 100644 --- a/src/main/groovy/io/seqera/wave/service/builder/ContainerBuildServiceImpl.groovy +++ b/src/main/groovy/io/seqera/wave/service/builder/ContainerBuildServiceImpl.groovy @@ -25,7 +25,7 @@ import java.nio.file.StandardCopyOption import java.time.Duration import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutorService -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import javax.annotation.PostConstruct import groovy.transform.CompileStatic diff --git a/src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy b/src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy index 1b4ebf06d..a7eb59db9 100644 --- a/src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy +++ b/src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy @@ -21,7 +21,7 @@ package io.seqera.wave.service.builder import java.nio.file.Files import java.nio.file.Path import java.time.Duration -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.json.JsonOutput import groovy.transform.CompileStatic diff --git a/src/main/groovy/io/seqera/wave/service/cleanup/CleanupStrategy.groovy b/src/main/groovy/io/seqera/wave/service/cleanup/CleanupStrategy.groovy index 54d83a84b..87aa10099 100644 --- a/src/main/groovy/io/seqera/wave/service/cleanup/CleanupStrategy.groovy +++ b/src/main/groovy/io/seqera/wave/service/cleanup/CleanupStrategy.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.service.cleanup -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.util.logging.Slf4j diff --git a/src/main/groovy/io/seqera/wave/service/k8s/K8sConfigClient.groovy b/src/main/groovy/io/seqera/wave/service/k8s/K8sConfigClient.groovy index 222bf8d29..d8f9edc08 100644 --- a/src/main/groovy/io/seqera/wave/service/k8s/K8sConfigClient.groovy +++ b/src/main/groovy/io/seqera/wave/service/k8s/K8sConfigClient.groovy @@ -18,7 +18,7 @@ package io.seqera.wave.service.k8s -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.transform.Memoized diff --git a/src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy index 35a7c5d37..8f6e026c4 100644 --- a/src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy +++ b/src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy @@ -20,7 +20,7 @@ package io.seqera.wave.service.k8s import java.nio.file.Path import java.time.Duration -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import javax.annotation.PostConstruct import groovy.transform.CompileDynamic diff --git a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy index b2763f0ce..f00f4e0f9 100644 --- a/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy +++ b/src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy @@ -19,7 +19,7 @@ package io.seqera.wave.service.logs import java.util.concurrent.CompletableFuture -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.transform.CompileStatic import groovy.util.logging.Slf4j diff --git a/src/main/groovy/io/seqera/wave/service/scan/KubeScanStrategy.groovy b/src/main/groovy/io/seqera/wave/service/scan/KubeScanStrategy.groovy index c2866c0aa..69f335523 100644 --- a/src/main/groovy/io/seqera/wave/service/scan/KubeScanStrategy.groovy +++ b/src/main/groovy/io/seqera/wave/service/scan/KubeScanStrategy.groovy @@ -22,7 +22,7 @@ import java.nio.file.FileAlreadyExistsException import java.nio.file.Files import java.nio.file.Path import java.time.Instant -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import groovy.json.JsonOutput import groovy.transform.CompileStatic diff --git a/src/main/groovy/io/seqera/wave/tower/client/TowerClient.groovy b/src/main/groovy/io/seqera/wave/tower/client/TowerClient.groovy index cec0b0cb2..10dce490d 100644 --- a/src/main/groovy/io/seqera/wave/tower/client/TowerClient.groovy +++ b/src/main/groovy/io/seqera/wave/tower/client/TowerClient.groovy @@ -24,7 +24,7 @@ import groovy.transform.CompileStatic import io.micronaut.cache.annotation.Cacheable import io.seqera.wave.tower.client.connector.HttpTowerConnector import io.seqera.wave.tower.client.connector.WebSocketTowerConnector -import jakarta.annotation.Nullable +import io.micronaut.core.annotation.Nullable import jakarta.inject.Inject import jakarta.inject.Singleton import org.apache.commons.lang3.StringUtils diff --git a/src/test/groovy/io/seqera/wave/tower/client/TowerClientHttpTest.groovy b/src/test/groovy/io/seqera/wave/tower/client/TowerClientHttpTest.groovy index 6f641ab68..faa7e1c91 100644 --- a/src/test/groovy/io/seqera/wave/tower/client/TowerClientHttpTest.groovy +++ b/src/test/groovy/io/seqera/wave/tower/client/TowerClientHttpTest.groovy @@ -21,7 +21,7 @@ package io.seqera.wave.tower.client import spock.lang.Specification import java.util.concurrent.ExecutionException -import javax.annotation.Nullable +import io.micronaut.core.annotation.Nullable import io.micronaut.cache.CacheManager import io.micronaut.context.annotation.Property