diff --git a/komga/src/benchmark/kotlin/org/gotson/komga/benchmark/BenchmarkProperties.kt b/komga/src/benchmark/kotlin/org/gotson/komga/benchmark/BenchmarkProperties.kt index 4c79c993..d1d1b24d 100644 --- a/komga/src/benchmark/kotlin/org/gotson/komga/benchmark/BenchmarkProperties.kt +++ b/komga/src/benchmark/kotlin/org/gotson/komga/benchmark/BenchmarkProperties.kt @@ -1,12 +1,12 @@ package org.gotson.komga.benchmark +import jakarta.validation.constraints.Positive +import jakarta.validation.constraints.PositiveOrZero import org.openjdk.jmh.annotations.Mode import org.openjdk.jmh.results.format.ResultFormatType import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component import org.springframework.validation.annotation.Validated -import javax.validation.constraints.Positive -import javax.validation.constraints.PositiveOrZero @Component @ConfigurationProperties(prefix = "benchmark") diff --git a/komga/src/main/kotlin/org/gotson/komga/application/events/EventPublisher.kt b/komga/src/main/kotlin/org/gotson/komga/application/events/EventPublisher.kt index 2b3ae8ca..ee826788 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/events/EventPublisher.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/events/EventPublisher.kt @@ -1,11 +1,11 @@ package org.gotson.komga.application.events +import jakarta.jms.ConnectionFactory import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.infrastructure.jms.JMS_PROPERTY_TYPE import org.gotson.komga.infrastructure.jms.TOPIC_EVENTS import org.springframework.jms.core.JmsTemplate import org.springframework.stereotype.Service -import javax.jms.ConnectionFactory @Service class EventPublisher( diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt index 7dd8d852..94235cac 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt @@ -1,5 +1,6 @@ package org.gotson.komga.application.tasks +import jakarta.jms.ConnectionFactory import mu.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookMetadataPatchCapability @@ -19,7 +20,6 @@ import org.gotson.komga.infrastructure.search.LuceneEntity import org.springframework.data.domain.Sort import org.springframework.jms.core.JmsTemplate import org.springframework.stereotype.Service -import javax.jms.ConnectionFactory private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/model/KomgaUser.kt b/komga/src/main/kotlin/org/gotson/komga/domain/model/KomgaUser.kt index bcf9af03..f0a1ebbc 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/model/KomgaUser.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/model/KomgaUser.kt @@ -1,11 +1,11 @@ package org.gotson.komga.domain.model import com.github.f4b6a3.tsid.TsidCreator +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.NotBlank import org.gotson.komga.language.lowerNotBlank import java.io.Serializable import java.time.LocalDateTime -import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank const val ROLE_USER = "USER" const val ROLE_ADMIN = "ADMIN" diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt index fd06cdfc..f44b736c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt @@ -1,5 +1,7 @@ package org.gotson.komga.infrastructure.configuration +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.Positive import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.convert.DurationUnit import org.springframework.stereotype.Component @@ -7,8 +9,6 @@ import org.springframework.validation.annotation.Validated import org.sqlite.SQLiteConfig.JournalMode import java.time.Duration import java.time.temporal.ChronoUnit -import javax.validation.constraints.NotBlank -import javax.validation.constraints.Positive @Component @ConfigurationProperties(prefix = "komga") diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt index 9f1d0b82..ee67f0df 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt @@ -1,5 +1,6 @@ package org.gotson.komga.infrastructure.jms +import jakarta.jms.ConnectionFactory import mu.KotlinLogging import org.apache.activemq.artemis.api.core.QueueConfiguration import org.apache.activemq.artemis.api.core.RoutingType @@ -9,7 +10,6 @@ import org.springframework.boot.autoconfigure.jms.artemis.ArtemisConfigurationCu import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.jms.config.DefaultJmsListenerContainerFactory -import javax.jms.ConnectionFactory import org.apache.activemq.artemis.core.config.Configuration as ArtemisConfiguration private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/dto/ComicInfo.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/dto/ComicInfo.kt index 1a1daafa..bc962fd1 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/dto/ComicInfo.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/dto/ComicInfo.kt @@ -2,7 +2,7 @@ package org.gotson.komga.infrastructure.metadata.comicrack.dto import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty -import javax.xml.bind.annotation.XmlSchemaType +import jakarta.xml.bind.annotation.XmlSchemaType @JsonIgnoreProperties(ignoreUnknown = true) class ComicInfo { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetails.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetails.kt index ab964ff7..9949a379 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetails.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetails.kt @@ -1,8 +1,8 @@ package org.gotson.komga.infrastructure.security +import jakarta.servlet.http.HttpServletRequest import org.springframework.http.HttpHeaders import org.springframework.security.web.authentication.WebAuthenticationDetails -import javax.servlet.http.HttpServletRequest class UserAgentWebAuthenticationDetails(request: HttpServletRequest) : WebAuthenticationDetails(request) { val userAgent: String = request.getHeader(HttpHeaders.USER_AGENT).orEmpty() diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetailsSource.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetailsSource.kt index a8922952..da7ffeef 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetailsSource.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetailsSource.kt @@ -1,8 +1,8 @@ package org.gotson.komga.infrastructure.security +import jakarta.servlet.http.HttpServletRequest import org.springframework.security.web.authentication.WebAuthenticationDetailsSource import org.springframework.stereotype.Component -import javax.servlet.http.HttpServletRequest @Component class UserAgentWebAuthenticationDetailsSource : WebAuthenticationDetailsSource() { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SmartHttpSessionIdResolver.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SmartHttpSessionIdResolver.kt index 264b67e3..b80ea1b9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SmartHttpSessionIdResolver.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SmartHttpSessionIdResolver.kt @@ -1,11 +1,11 @@ package org.gotson.komga.infrastructure.security.session +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse import org.springframework.session.web.http.CookieHttpSessionIdResolver import org.springframework.session.web.http.CookieSerializer import org.springframework.session.web.http.HeaderHttpSessionIdResolver import org.springframework.session.web.http.HttpSessionIdResolver -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse class SmartHttpSessionIdResolver( private val sessionHeaderName: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/BCP47.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/BCP47.kt index 0cddd4eb..31e2c96a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/BCP47.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/BCP47.kt @@ -1,9 +1,9 @@ package org.gotson.komga.infrastructure.validation import com.ibm.icu.util.ULocale -import javax.validation.Constraint -import javax.validation.ConstraintValidator -import javax.validation.ConstraintValidatorContext +import jakarta.validation.Constraint +import jakarta.validation.ConstraintValidator +import jakarta.validation.ConstraintValidatorContext import kotlin.reflect.KClass @Constraint(validatedBy = [BCP47Validator::class]) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/Blank.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/Blank.kt index a47ec369..305343cd 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/Blank.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/Blank.kt @@ -1,8 +1,8 @@ package org.gotson.komga.infrastructure.validation -import javax.validation.Constraint -import javax.validation.ConstraintValidator -import javax.validation.ConstraintValidatorContext +import jakarta.validation.Constraint +import jakarta.validation.ConstraintValidator +import jakarta.validation.ConstraintValidatorContext import kotlin.reflect.KClass @Constraint(validatedBy = [BlankValidator::class]) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrBCP47.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrBCP47.kt index 6c2112c2..562d2dbe 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrBCP47.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrBCP47.kt @@ -1,9 +1,9 @@ package org.gotson.komga.infrastructure.validation +import jakarta.validation.Constraint +import jakarta.validation.constraints.Null import org.hibernate.validator.constraints.CompositionType import org.hibernate.validator.constraints.ConstraintComposition -import javax.validation.Constraint -import javax.validation.constraints.Null import kotlin.reflect.KClass @ConstraintComposition(CompositionType.OR) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrISBN.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrISBN.kt index 028a1df2..cc1ea86b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrISBN.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrISBN.kt @@ -1,10 +1,10 @@ package org.gotson.komga.infrastructure.validation +import jakarta.validation.Constraint +import jakarta.validation.constraints.Null import org.hibernate.validator.constraints.CompositionType import org.hibernate.validator.constraints.ConstraintComposition import org.hibernate.validator.constraints.ISBN -import javax.validation.Constraint -import javax.validation.constraints.Null import kotlin.reflect.KClass @ConstraintComposition(CompositionType.OR) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotBlank.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotBlank.kt index 7b883e21..ac04bb84 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotBlank.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotBlank.kt @@ -1,10 +1,10 @@ package org.gotson.komga.infrastructure.validation +import jakarta.validation.Constraint +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.Null import org.hibernate.validator.constraints.CompositionType import org.hibernate.validator.constraints.ConstraintComposition -import javax.validation.Constraint -import javax.validation.constraints.NotBlank -import javax.validation.constraints.Null import kotlin.reflect.KClass @ConstraintComposition(CompositionType.OR) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotEmpty.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotEmpty.kt index 1551cc02..2bdb5708 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotEmpty.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotEmpty.kt @@ -1,10 +1,10 @@ package org.gotson.komga.infrastructure.validation +import jakarta.validation.Constraint +import jakarta.validation.constraints.NotEmpty +import jakarta.validation.constraints.Null import org.hibernate.validator.constraints.CompositionType import org.hibernate.validator.constraints.ConstraintComposition -import javax.validation.Constraint -import javax.validation.constraints.NotEmpty -import javax.validation.constraints.Null import kotlin.reflect.KClass @ConstraintComposition(CompositionType.OR) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsFilterConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsFilterConfiguration.kt index 50519462..e009965d 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsFilterConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsFilterConfiguration.kt @@ -1,13 +1,13 @@ package org.gotson.komga.infrastructure.web +import jakarta.servlet.Filter +import jakarta.servlet.FilterChain +import jakarta.servlet.ServletRequest +import jakarta.servlet.ServletResponse +import jakarta.servlet.http.HttpServletRequest import org.springframework.boot.web.servlet.FilterRegistrationBean import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import javax.servlet.Filter -import javax.servlet.FilterChain -import javax.servlet.ServletRequest -import javax.servlet.ServletResponse -import javax.servlet.http.HttpServletRequest @Configuration class BracketParamsFilterConfiguration { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsRequestWrapper.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsRequestWrapper.kt index 540689fd..46890308 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsRequestWrapper.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsRequestWrapper.kt @@ -1,9 +1,9 @@ package org.gotson.komga.infrastructure.web +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletRequestWrapper import org.gotson.komga.language.toEnumeration import java.util.Enumeration -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletRequestWrapper class BracketParamsRequestWrapper(request: HttpServletRequest) : HttpServletRequestWrapper(request) { override fun getParameter(name: String): String? { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/EtagFilterConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/EtagFilterConfiguration.kt index b092d3e2..69db547c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/EtagFilterConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/EtagFilterConfiguration.kt @@ -1,12 +1,12 @@ package org.gotson.komga.infrastructure.web +import jakarta.servlet.http.HttpServletRequest import org.springframework.boot.web.servlet.FilterRegistrationBean import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.http.server.PathContainer import org.springframework.web.filter.ShallowEtagHeaderFilter import org.springframework.web.util.pattern.PathPatternParser -import javax.servlet.http.HttpServletRequest @Configuration class EtagFilterConfiguration { diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt index 45ad72d3..24f3bd52 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt @@ -1,6 +1,7 @@ package org.gotson.komga.interfaces.api.opds import io.swagger.v3.oas.annotations.Parameter +import jakarta.servlet.ServletContext import mu.KotlinLogging import org.apache.commons.io.FilenameUtils import org.gotson.komga.domain.model.BookSearchWithReadProgress @@ -61,7 +62,6 @@ import java.text.DecimalFormat import java.time.ZoneId import java.time.ZonedDateTime import java.util.Optional -import javax.servlet.ServletContext private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt index eb5e2949..4bbb0266 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt @@ -2,7 +2,7 @@ package org.gotson.komga.interfaces.api.opds.dto import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement -import javax.validation.constraints.Size +import jakarta.validation.constraints.Size @JacksonXmlRootElement(localName = "OpenSearchDescription", namespace = OPENSEARCH) class OpenSearchDescription( diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt index bd01b176..adc0ec5b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt @@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse +import jakarta.validation.Valid import mu.KotlinLogging import org.apache.commons.io.IOUtils import org.gotson.komga.application.events.EventPublisher @@ -85,7 +86,6 @@ import java.nio.charset.StandardCharsets.UTF_8 import java.nio.file.NoSuchFileException import java.time.LocalDate import java.time.ZoneOffset -import javax.validation.Valid import kotlin.io.path.name private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt index abf8a40a..27b58372 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt @@ -1,5 +1,7 @@ package org.gotson.komga.interfaces.api.rest +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.NotBlank import org.gotson.komga.domain.model.KomgaUser import org.gotson.komga.domain.service.KomgaUserLifecycle import org.gotson.komga.interfaces.api.rest.dto.UserDtoV2 @@ -13,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestHeader import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ResponseStatusException -import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank @RestController @RequestMapping("api/v1/claim", produces = [MediaType.APPLICATION_JSON_VALUE]) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt index da1f583c..505b2f01 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt @@ -1,12 +1,12 @@ package org.gotson.komga.interfaces.api.rest +import jakarta.validation.ConstraintViolationException import org.springframework.http.HttpStatus import org.springframework.web.bind.MethodArgumentNotValidException import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ResponseBody import org.springframework.web.bind.annotation.ResponseStatus -import javax.validation.ConstraintViolationException @ControllerAdvice class ErrorHandlingControllerAdvice { diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt index 607404e2..679c4f86 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt @@ -1,5 +1,6 @@ package org.gotson.komga.interfaces.api.rest +import jakarta.validation.Valid import org.gotson.komga.application.tasks.HIGHEST_PRIORITY import org.gotson.komga.application.tasks.HIGH_PRIORITY import org.gotson.komga.application.tasks.TaskEmitter @@ -35,7 +36,6 @@ import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ResponseStatusException import java.io.FileNotFoundException -import javax.validation.Valid @RestController @RequestMapping("api/v1/libraries", produces = [MediaType.APPLICATION_JSON_VALUE]) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt index 57e226a9..ddce5d07 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt @@ -1,5 +1,8 @@ package org.gotson.komga.interfaces.api.rest +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpSession import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.session.web.http.CookieSerializer @@ -7,9 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse -import javax.servlet.http.HttpSession @RestController @RequestMapping(produces = [MediaType.APPLICATION_JSON_VALUE]) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt index 47c0717e..87d31bd8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse +import jakarta.validation.Valid import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.BookPageNumbered import org.gotson.komga.domain.model.PageHash @@ -34,7 +35,6 @@ import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ResponseStatusException -import javax.validation.Valid @RestController @RequestMapping("api/v1/page-hashes", produces = [MediaType.APPLICATION_JSON_VALUE]) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt index 9ff241ea..028160d0 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse +import jakarta.validation.Valid import mu.KotlinLogging import org.apache.commons.compress.archivers.zip.Zip64Mode import org.apache.commons.compress.archivers.zip.ZipArchiveEntry @@ -77,7 +78,6 @@ import java.io.OutputStream import java.nio.charset.StandardCharsets.UTF_8 import java.util.concurrent.TimeUnit import java.util.zip.Deflater -import javax.validation.Valid private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt index 11c3af8a..a4efd5ca 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse +import jakarta.validation.Valid import mu.KotlinLogging import org.gotson.komga.application.events.EventPublisher import org.gotson.komga.domain.model.Author @@ -56,7 +57,6 @@ import org.springframework.web.bind.annotation.RestController import org.springframework.web.multipart.MultipartFile import org.springframework.web.server.ResponseStatusException import java.util.concurrent.TimeUnit -import javax.validation.Valid private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt index eeda2bca..08e70d9f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse +import jakarta.validation.Valid import mu.KotlinLogging import org.apache.commons.compress.archivers.zip.Zip64Mode import org.apache.commons.compress.archivers.zip.ZipArchiveEntry @@ -93,7 +94,6 @@ import java.io.OutputStream import java.net.URI import java.nio.charset.StandardCharsets.UTF_8 import java.util.zip.Deflater -import javax.validation.Valid private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV1Controller.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV1Controller.kt index fadb47b0..19772f99 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV1Controller.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV1Controller.kt @@ -3,6 +3,7 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Parameter +import jakarta.validation.Valid import mu.KotlinLogging import org.gotson.komga.domain.model.ROLE_ADMIN import org.gotson.komga.domain.model.ROLE_FILE_DOWNLOAD @@ -44,7 +45,6 @@ import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ResponseStatusException -import javax.validation.Valid private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV2Controller.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV2Controller.kt index 8fb27229..6450cb87 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV2Controller.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV2Controller.kt @@ -1,6 +1,7 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Parameter +import jakarta.validation.Valid import mu.KotlinLogging import org.gotson.komga.domain.model.AgeRestriction import org.gotson.komga.domain.model.ContentRestrictions @@ -42,7 +43,6 @@ import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestController import org.springframework.web.server.ResponseStatusException -import javax.validation.Valid private val logger = KotlinLogging.logger {} diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AlternateTitleUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AlternateTitleUpdateDto.kt index 8665a79c..2f29900a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AlternateTitleUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AlternateTitleUpdateDto.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.api.rest.dto -import javax.validation.constraints.NotBlank +import jakarta.validation.constraints.NotBlank class AlternateTitleUpdateDto { @get:NotBlank diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt index cf60d06a..135bba61 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt @@ -1,5 +1,7 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank import org.gotson.komga.domain.model.Author import org.gotson.komga.domain.model.BookMetadata import org.gotson.komga.domain.model.WebLink @@ -8,8 +10,6 @@ import org.gotson.komga.infrastructure.validation.NullOrNotBlank import org.hibernate.validator.constraints.URL import java.net.URI import java.time.LocalDate -import javax.validation.Valid -import javax.validation.constraints.NotBlank import kotlin.properties.Delegates class BookMetadataUpdateDto { diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt index d66fa20d..fd45748b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt @@ -1,8 +1,8 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.NotEmpty import org.hibernate.validator.constraints.UniqueElements -import javax.validation.constraints.NotBlank -import javax.validation.constraints.NotEmpty data class CollectionCreationDto( @get:NotBlank val name: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt index a4b84223..bd53230c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.api.rest.dto -import javax.validation.constraints.NotBlank +import jakarta.validation.constraints.NotBlank data class LibraryCreationDto( @get:NotBlank val name: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt index 51e1584a..a3e10102 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.api.rest.dto -import javax.validation.constraints.NotBlank +import jakarta.validation.constraints.NotBlank data class LibraryUpdateDto( @get:NotBlank val name: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageHashCreationDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageHashCreationDto.kt index f73ce353..3ac22cc3 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageHashCreationDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageHashCreationDto.kt @@ -1,7 +1,7 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.constraints.NotBlank import org.gotson.komga.domain.model.PageHashKnown -import javax.validation.constraints.NotBlank data class PageHashCreationDto( @get:NotBlank val hash: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt index 27738024..bb3da286 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt @@ -1,8 +1,8 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.NotEmpty import org.hibernate.validator.constraints.UniqueElements -import javax.validation.constraints.NotBlank -import javax.validation.constraints.NotEmpty data class ReadListCreationDto( @get:NotBlank val name: String, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt index 12ca9419..dec92a58 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt @@ -1,9 +1,9 @@ package org.gotson.komga.interfaces.api.rest.dto -import javax.validation.Constraint -import javax.validation.ConstraintValidator -import javax.validation.ConstraintValidatorContext -import javax.validation.constraints.Positive +import jakarta.validation.Constraint +import jakarta.validation.ConstraintValidator +import jakarta.validation.ConstraintValidatorContext +import jakarta.validation.constraints.Positive import kotlin.reflect.KClass @ReadProgressUpdateDtoConstraint diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt index 8c9f3133..cb41019e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt @@ -1,11 +1,11 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.Valid +import jakarta.validation.constraints.Positive +import jakarta.validation.constraints.PositiveOrZero import org.gotson.komga.domain.model.SeriesMetadata import org.gotson.komga.infrastructure.validation.NullOrBlankOrBCP47 import org.gotson.komga.infrastructure.validation.NullOrNotBlank -import javax.validation.Valid -import javax.validation.constraints.Positive -import javax.validation.constraints.PositiveOrZero import kotlin.properties.Delegates class SeriesMetadataUpdateDto { diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt index fec7cba4..f088007d 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.api.rest.dto -import javax.validation.constraints.PositiveOrZero +import jakarta.validation.constraints.PositiveOrZero data class TachiyomiReadProgressUpdateDto( @get:PositiveOrZero val lastBookRead: Int, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt index 318f052d..2b25b8ff 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt @@ -2,6 +2,8 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.NotBlank import org.gotson.komga.domain.model.AgeRestriction import org.gotson.komga.domain.model.AllowExclude import org.gotson.komga.domain.model.KomgaUser @@ -9,8 +11,6 @@ import org.gotson.komga.domain.model.ROLE_ADMIN import org.gotson.komga.domain.model.ROLE_FILE_DOWNLOAD import org.gotson.komga.domain.model.ROLE_PAGE_STREAMING import org.gotson.komga.infrastructure.security.KomgaPrincipal -import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank @Deprecated("Deprecated since 0.153.0. Use UserDtoV2 instead") data class UserDto( diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserUpdateDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserUpdateDto.kt index 8037afdd..e882c90f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserUpdateDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserUpdateDto.kt @@ -1,8 +1,8 @@ package org.gotson.komga.interfaces.api.rest.dto +import jakarta.validation.Valid +import jakarta.validation.constraints.PositiveOrZero import org.gotson.komga.domain.model.AllowExclude -import javax.validation.Valid -import javax.validation.constraints.PositiveOrZero import kotlin.properties.Delegates class UserUpdateDto { diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt index 3d3d1577..5f94bb98 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt @@ -1,9 +1,9 @@ package org.gotson.komga.interfaces.mvc +import jakarta.servlet.ServletContext import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.GetMapping -import javax.servlet.ServletContext @Controller class IndexController( diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt index 4d77b01f..69c01d6e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt @@ -1,5 +1,8 @@ package org.gotson.komga.interfaces.sse +import jakarta.jms.ObjectMessage +import jakarta.jms.QueueBrowser +import jakarta.jms.Session import mu.KotlinLogging import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.KomgaUser @@ -35,9 +38,6 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.servlet.mvc.method.annotation.SseEmitter import java.io.IOException import java.util.Collections -import javax.jms.ObjectMessage -import javax.jms.QueueBrowser -import javax.jms.Session private val logger = KotlinLogging.logger {} diff --git a/komga/src/test/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfigTest.kt b/komga/src/test/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfigTest.kt index 44f33207..769a11eb 100644 --- a/komga/src/test/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfigTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfigTest.kt @@ -1,6 +1,8 @@ package org.gotson.komga.infrastructure.jms import com.ninjasquad.springmockk.MockkBean +import jakarta.jms.QueueBrowser +import jakarta.jms.Session import mu.KotlinLogging import org.assertj.core.api.Assertions.assertThat import org.gotson.komga.application.tasks.TaskHandler @@ -12,8 +14,6 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.jms.core.JmsTemplate import org.springframework.jms.support.destination.JmsDestinationAccessor import org.springframework.test.context.junit.jupiter.SpringExtension -import javax.jms.QueueBrowser -import javax.jms.Session private val logger = KotlinLogging.logger {}