diff --git a/komga-tray/src/main/kotlin/org/gotson/komga/application/gui/TrayIconRunner.kt b/komga-tray/src/main/kotlin/org/gotson/komga/application/gui/TrayIconRunner.kt index c1d06bd1e..7dd9f133c 100644 --- a/komga-tray/src/main/kotlin/org/gotson/komga/application/gui/TrayIconRunner.kt +++ b/komga-tray/src/main/kotlin/org/gotson/komga/application/gui/TrayIconRunner.kt @@ -21,8 +21,8 @@ import java.io.File @Profile("!test") @Component class TrayIconRunner( - @Value("#{komgaProperties.configDir}") komgaConfigDir: String, - @Value("\${logging.file.name}") logFileName: String, + @param:Value("#{komgaProperties.configDir}") komgaConfigDir: String, + @param:Value("\${logging.file.name}") logFileName: String, serverSettings: WebServerEffectiveSettings, env: Environment, ) : ApplicationRunner { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDao.kt index fa46acb2a..9f36e5189 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDao.kt @@ -32,7 +32,7 @@ import java.time.ZoneId @Component class BookDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : BookRepository { private val b = Tables.BOOK private val m = Tables.MEDIA diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDtoDao.kt index dc4163034..b69668c93 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookDtoDao.kt @@ -53,7 +53,7 @@ import java.net.URL class BookDtoDao( private val dsl: DSLContext, private val luceneHelper: LuceneHelper, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, private val transactionTemplate: TransactionTemplate, private val bookCommonDao: BookCommonDao, ) : BookDtoRepository { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataAggregationDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataAggregationDao.kt index 4cf082365..3435d15d2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataAggregationDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataAggregationDao.kt @@ -19,7 +19,7 @@ import java.time.ZoneId @Component class BookMetadataAggregationDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : BookMetadataAggregationRepository { private val d = Tables.BOOK_METADATA_AGGREGATION private val a = Tables.BOOK_METADATA_AGGREGATION_AUTHOR diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataDao.kt index 08f983c36..f2dc0aa55 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/BookMetadataDao.kt @@ -21,7 +21,7 @@ import java.time.ZoneId @Component class BookMetadataDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : BookMetadataRepository { private val d = Tables.BOOK_METADATA private val a = Tables.BOOK_METADATA_AUTHOR diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt index a406503f7..b4d6fe29f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt @@ -31,7 +31,7 @@ private val logger = KotlinLogging.logger {} @Component class MediaDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, private val mapper: ObjectMapper, ) : MediaRepository { private val m = Tables.MEDIA diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadListDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadListDao.kt index 7b02ffb64..00e5dadd6 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadListDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadListDao.kt @@ -34,7 +34,7 @@ import java.util.SortedMap class ReadListDao( private val dsl: DSLContext, private val luceneHelper: LuceneHelper, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : ReadListRepository { private val rl = Tables.READLIST private val rlb = Tables.READLIST_BOOK diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadProgressDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadProgressDao.kt index 6739b5aa5..fb508cc9b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadProgressDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ReadProgressDao.kt @@ -24,7 +24,7 @@ import java.time.ZoneId @Component class ReadProgressDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, private val mapper: ObjectMapper, ) : ReadProgressRepository { private val r = Tables.READ_PROGRESS diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesCollectionDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesCollectionDao.kt index e5e29b6ef..c50c36cbf 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesCollectionDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesCollectionDao.kt @@ -33,7 +33,7 @@ import java.time.ZoneId class SeriesCollectionDao( private val dsl: DSLContext, private val luceneHelper: LuceneHelper, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : SeriesCollectionRepository { private val c = Tables.COLLECTION private val cs = Tables.COLLECTION_SERIES diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDao.kt index 7836385c6..ac2e7192e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDao.kt @@ -30,7 +30,7 @@ import java.time.ZoneId @Component class SeriesDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : SeriesRepository { private val s = Tables.SERIES private val d = Tables.SERIES_METADATA diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt index f8651de05..d5df73001 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt @@ -58,7 +58,7 @@ const val BOOKS_READ_COUNT = "booksReadCount" class SeriesDtoDao( private val dsl: DSLContext, private val luceneHelper: LuceneHelper, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, private val transactionTemplate: TransactionTemplate, ) : SeriesDtoRepository { private val s = Tables.SERIES diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesMetadataDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesMetadataDao.kt index 12ecc8517..b25f3c313 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesMetadataDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesMetadataDao.kt @@ -20,7 +20,7 @@ import java.time.ZoneId @Component class SeriesMetadataDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : SeriesMetadataRepository { private val d = Tables.SERIES_METADATA private val g = Tables.SERIES_METADATA_GENRE diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SidecarDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SidecarDao.kt index 9a6024966..b2f50e47a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SidecarDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SidecarDao.kt @@ -17,7 +17,7 @@ import java.net.URL @Component class SidecarDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : SidecarRepository { private val sc = Tables.SIDECAR private val l = Tables.LIBRARY diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailBookDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailBookDao.kt index 82cc7c23e..024877c2e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailBookDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailBookDao.kt @@ -16,7 +16,7 @@ import java.net.URL @Component class ThumbnailBookDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : ThumbnailBookRepository { private val tb = Tables.THUMBNAIL_BOOK diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailSeriesDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailSeriesDao.kt index 5467dabe8..62092efdf 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailSeriesDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/ThumbnailSeriesDao.kt @@ -16,7 +16,7 @@ import java.net.URL @Component class ThumbnailSeriesDao( private val dsl: DSLContext, - @Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.database.batchChunkSize}") private val batchSize: Int, ) : ThumbnailSeriesRepository { private val ts = Tables.THUMBNAIL_SERIES diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt index ac7e2375d..3740db8fe 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt @@ -24,7 +24,7 @@ private val logger = KotlinLogging.logger {} class TasksDao( @Qualifier("tasksDslContext") private val dsl: DSLContext, - @Value("#{@komgaProperties.tasksDb.batchChunkSize}") private val batchSize: Int, + @param:Value("#{@komgaProperties.tasksDb.batchChunkSize}") private val batchSize: Int, private val objectMapper: ObjectMapper, ) : TasksRepository { private val t = Tables.TASK diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/kobo/KepubConverter.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/kobo/KepubConverter.kt index 4f43f3749..02d4bd93b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/kobo/KepubConverter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/kobo/KepubConverter.kt @@ -23,7 +23,7 @@ private val logger = KotlinLogging.logger {} @Component class KepubConverter( private val settingsProvider: KomgaSettingsProvider, - @Value("\${komga.kobo.kepubify-path:#{null}}") val kepubifyConfigurationPath: String?, + @param:Value("\${komga.kobo.kepubify-path:#{null}}") val kepubifyConfigurationPath: String?, ) { final var kepubifyPath: Path? = null private set diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt index eac44b105..ff1a312ad 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt @@ -33,7 +33,7 @@ class EpubExtractor( private val contentDetector: ContentDetector, private val imageAnalyzer: ImageAnalyzer, private val kepubConverter: KepubConverter, - @Value("#{@komgaProperties.epubDivinaLetterCountThreshold}") private val letterCountThreshold: Int, + @param:Value("#{@komgaProperties.epubDivinaLetterCountThreshold}") private val letterCountThreshold: Int, ) { /** * Retrieves a specific entry by name from the zip archive diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt index b88eb6bf5..1262a1958 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt @@ -29,7 +29,7 @@ private const val COMIC_INFO = "ComicInfo.xml" @Service class ComicInfoProvider( - @Autowired(required = false) private val mapper: XmlMapper = XmlMapper(), + @param:Autowired(required = false) private val mapper: XmlMapper = XmlMapper(), private val bookAnalyzer: BookAnalyzer, private val isbnValidator: ISBNValidator, ) : BookMetadataProvider, diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt index 1d331ed3b..fed9aecc5 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt @@ -13,7 +13,7 @@ private val logger = KotlinLogging.logger {} @Service class ReadListProvider( - @Autowired(required = false) private val mapper: XmlMapper = XmlMapper(), + @param:Autowired(required = false) private val mapper: XmlMapper = XmlMapper(), ) { @Throws(ComicRackListException::class) fun importFromCbl(cbl: ByteArray): ReadListRequest { diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt index 6fdc28ca3..1b33b407a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt @@ -62,7 +62,7 @@ import org.springframework.security.access.prepost.PreAuthorize @Configuration class OpenApiConfiguration( - @Value("\${application.version}") private val appVersion: String, + @param:Value("\${application.version}") private val appVersion: String, env: Environment, ) { private val generateOpenApi = env.activeProfiles.contains("generate-openapi") diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt index 058c7fb23..1e57eb1a4 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt @@ -36,7 +36,7 @@ class LuceneHelper( private val searchAnalyzer: Analyzer, private val taskScheduler: TaskScheduler, private val indexAnalyzer: Analyzer, - @Value("#{@komgaProperties.lucene.commitDelay}") + @param:Value("#{@komgaProperties.lucene.commitDelay}") private val commitDelay: Duration, ) { private val indexWriter: IndexWriter = IndexWriter(directory, IndexWriterConfig(indexAnalyzer)) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SettingsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SettingsController.kt index 878fb5c2b..75ed18bbf 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SettingsController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SettingsController.kt @@ -31,8 +31,8 @@ import kotlin.time.Duration.Companion.days @Tag(name = OpenApiConfiguration.TagNames.SERVER_SETTINGS) class SettingsController( private val komgaSettingsProvider: KomgaSettingsProvider, - @Value("\${server.port:#{null}}") private val configServerPort: Int?, - @Value("\${server.servlet.context-path:#{null}}") private val configServerContextPath: String?, + @param:Value("\${server.port:#{null}}") private val configServerPort: Int?, + @param:Value("\${server.servlet.context-path:#{null}}") private val configServerContextPath: String?, private val serverSettings: WebServerEffectiveSettings, private val kepubConverter: KepubConverter, ) { diff --git a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/kobo/KoboControllerTest.kt b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/kobo/KoboControllerTest.kt index e7b83b85f..00d20b81a 100644 --- a/komga/src/test/kotlin/org/gotson/komga/interfaces/api/kobo/KoboControllerTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/interfaces/api/kobo/KoboControllerTest.kt @@ -140,7 +140,7 @@ class KoboControllerTest( @Nested inner class HostHeader( - @Value("\${server.port:#{null}}") private val configServerPort: Int?, + @param:Value("\${server.port:#{null}}") private val configServerPort: Int?, ) { @ParameterizedTest @MethodSource("headers")