Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-08 12:35:30 +02:00
Code Issues Projects Releases Wiki Activity

refactor: replace javax imports by jakarta

Browse source
This commit is contained in:
Gauthier Roebroeck 2022-11-10 17:06:30 +08:00
parent 7828edc7cf
commit b88b4c452f
47 changed files with 82 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
komga/src/benchmark/kotlin/org/gotson/komga/benchmark/BenchmarkProperties.kt
View file

@ -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")

2
komga/src/main/kotlin/org/gotson/komga/application/events/EventPublisher.kt
View file

@ -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(

2
komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt
View file

@ -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 {}

4
komga/src/main/kotlin/org/gotson/komga/domain/model/KomgaUser.kt
View file

@ -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"

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/configuration/KomgaProperties.kt
View file

@ -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")

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/dto/ComicInfo.kt
View file

@ -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 {

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetails.kt
View file

@ -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()

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/security/UserAgentWebAuthenticationDetailsSource.kt
View file

@ -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() {

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SmartHttpSessionIdResolver.kt
View file

@ -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,

6
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/BCP47.kt
View file

@ -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])

6
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/Blank.kt
View file

@ -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])

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrBCP47.kt
View file

@ -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)

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrBlankOrISBN.kt
View file

@ -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)

6
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotBlank.kt
View file

@ -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)

6
komga/src/main/kotlin/org/gotson/komga/infrastructure/validation/NullOrNotEmpty.kt
View file

@ -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)

10
komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsFilterConfiguration.kt
View file

@ -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 {

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/web/BracketParamsRequestWrapper.kt
View file

@ -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? {

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/web/EtagFilterConfiguration.kt
View file

@ -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 {

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/OpdsController.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/dto/OpenSearchDescription.kt
View file

@ -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(

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt
View file

@ -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 {}

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClaimController.kt
View file

@ -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])

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ErrorHandlingControllerAdvice.kt
View file

@ -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 {

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LibraryController.kt
View file

@ -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])

6
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/LoginController.kt
View file

@ -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])

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/PageHashController.kt
View file

@ -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])

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV1Controller.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserV2Controller.kt
View file

@ -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 {}

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AlternateTitleUpdateDto.kt
View file

@ -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

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookMetadataUpdateDto.kt
View file

@ -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 {

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionCreationDto.kt
View file

@ -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,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryCreationDto.kt
View file

@ -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,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/LibraryUpdateDto.kt
View file

@ -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,

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/PageHashCreationDto.kt
View file

@ -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,

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListCreationDto.kt
View file

@ -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,

8
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadProgressUpdateDto.kt
View file

@ -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

6
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesMetadataUpdateDto.kt
View file

@ -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 {

2
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/TachiyomiReadProgressUpdateDto.kt
View file

@ -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,

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserDto.kt
View file

@ -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(

4
komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/UserUpdateDto.kt
View file

@ -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 {

2
komga/src/main/kotlin/org/gotson/komga/interfaces/mvc/IndexController.kt
View file

@ -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(

6
komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt
View file

@ -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 {}

4
komga/src/test/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfigTest.kt
View file

@ -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 {}