From 6b27836437b9e4abc78a8d880d130677b6f04465 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Thu, 20 Feb 2025 10:44:23 +0800 Subject: [PATCH] refactor: rename swagger package to openapi --- .../AuthorsAsQueryParam.kt | 2 +- .../OpenApiConfiguration.kt | 70 +++++++++---------- .../PageableAnnotations.kt | 2 +- .../interfaces/api/CommonBookController.kt | 2 +- .../api/rest/AnnouncementController.kt | 2 +- .../interfaces/api/rest/BookController.kt | 6 +- .../interfaces/api/rest/ClaimController.kt | 2 +- .../api/rest/ClientSettingsController.kt | 2 +- .../api/rest/FileSystemController.kt | 2 +- .../interfaces/api/rest/FontsController.kt | 2 +- .../api/rest/HistoricalEventController.kt | 4 +- .../interfaces/api/rest/LibraryController.kt | 2 +- .../interfaces/api/rest/LoginController.kt | 2 +- .../interfaces/api/rest/OAuth2Controller.kt | 2 +- .../interfaces/api/rest/PageHashController.kt | 4 +- .../interfaces/api/rest/ReadListController.kt | 6 +- .../api/rest/ReferentialController.kt | 4 +- .../interfaces/api/rest/ReleaseController.kt | 2 +- .../api/rest/SeriesCollectionController.kt | 6 +- .../interfaces/api/rest/SeriesController.kt | 8 +-- .../interfaces/api/rest/SettingsController.kt | 2 +- .../api/rest/SyncPointController.kt | 2 +- .../interfaces/api/rest/TaskController.kt | 2 +- .../api/rest/TransientBooksController.kt | 2 +- .../interfaces/api/rest/UserController.kt | 2 +- 25 files changed, 71 insertions(+), 71 deletions(-) rename komga/src/main/kotlin/org/gotson/komga/infrastructure/{swagger => openapi}/AuthorsAsQueryParam.kt (92%) rename komga/src/main/kotlin/org/gotson/komga/infrastructure/{swagger => openapi}/OpenApiConfiguration.kt (83%) rename komga/src/main/kotlin/org/gotson/komga/infrastructure/{swagger => openapi}/PageableAnnotations.kt (97%) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/AuthorsAsQueryParam.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/AuthorsAsQueryParam.kt similarity index 92% rename from komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/AuthorsAsQueryParam.kt rename to komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/AuthorsAsQueryParam.kt index 85f40e673..dc9b964f8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/AuthorsAsQueryParam.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/AuthorsAsQueryParam.kt @@ -1,4 +1,4 @@ -package org.gotson.komga.infrastructure.swagger +package org.gotson.komga.infrastructure.openapi import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.Parameters diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/OpenApiConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt similarity index 83% rename from komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/OpenApiConfiguration.kt rename to komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt index 871abfd80..0555a3c15 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/OpenApiConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/OpenApiConfiguration.kt @@ -1,4 +1,4 @@ -package org.gotson.komga.infrastructure.swagger +package org.gotson.komga.infrastructure.openapi import io.swagger.v3.oas.models.Components import io.swagger.v3.oas.models.ExternalDocumentation @@ -15,40 +15,40 @@ import io.swagger.v3.oas.models.servers.Server import io.swagger.v3.oas.models.servers.ServerVariable import io.swagger.v3.oas.models.servers.ServerVariables import io.swagger.v3.oas.models.tags.Tag -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.ANNOUNCEMENTS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.API_KEYS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOKS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOK_FONTS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOK_IMPORT -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOK_PAGES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOK_POSTER -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.BOOK_WEBPUB -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.CLAIM -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.CLIENT_SETTINGS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.COLLECTIONS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.COLLECTION_POSTER -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.COLLECTION_SERIES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.COMICRACK -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.CURRENT_USER -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.DEPRECATED -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.DUPLICATE_PAGES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.FILE_SYSTEM -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.HISTORY -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.LIBRARIES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.MIHON -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.OAUTH2 -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.READLISTS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.READLIST_BOOKS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.READLIST_POSTER -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.REFERENTIAL -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.RELEASES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.SERIES -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.SERIES_POSTER -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.SERVER_SETTINGS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.SYNCPOINTS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.TASKS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.USERS -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames.USER_SESSION +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.ANNOUNCEMENTS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.API_KEYS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOKS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOK_FONTS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOK_IMPORT +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOK_PAGES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOK_POSTER +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.BOOK_WEBPUB +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.CLAIM +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.CLIENT_SETTINGS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.COLLECTIONS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.COLLECTION_POSTER +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.COLLECTION_SERIES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.COMICRACK +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.CURRENT_USER +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.DEPRECATED +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.DUPLICATE_PAGES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.FILE_SYSTEM +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.HISTORY +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.LIBRARIES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.MIHON +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.OAUTH2 +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.READLISTS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.READLIST_BOOKS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.READLIST_POSTER +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.REFERENTIAL +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.RELEASES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.SERIES +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.SERIES_POSTER +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.SERVER_SETTINGS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.SYNCPOINTS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.TASKS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.USERS +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames.USER_SESSION import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/PageableAnnotations.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/PageableAnnotations.kt similarity index 97% rename from komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/PageableAnnotations.kt rename to komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/PageableAnnotations.kt index 65f993b71..0a6bb0679 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/swagger/PageableAnnotations.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/openapi/PageableAnnotations.kt @@ -1,4 +1,4 @@ -package org.gotson.komga.infrastructure.swagger +package org.gotson.komga.infrastructure.openapi import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.Parameters diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/CommonBookController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/CommonBookController.kt index eb47efe1f..86b108938 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/CommonBookController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/CommonBookController.kt @@ -24,8 +24,8 @@ import org.gotson.komga.domain.service.BookAnalyzer import org.gotson.komga.domain.service.BookLifecycle import org.gotson.komga.infrastructure.image.ImageType import org.gotson.komga.infrastructure.mediacontainer.ContentDetector +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault import org.gotson.komga.interfaces.api.dto.MEDIATYPE_PROGRESSION_JSON_VALUE import org.gotson.komga.interfaces.api.persistence.BookDtoRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt index 630063aae..16f6970bd 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/AnnouncementController.kt @@ -4,8 +4,8 @@ import com.github.benmanes.caffeine.cache.Caffeine import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.gotson.komga.domain.persistence.KomgaUserRepository +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.gotson.komga.interfaces.api.rest.dto.JsonFeedDto import org.springframework.http.HttpStatus import org.springframework.http.MediaType 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 5ce85f7cc..6160d00e6 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 @@ -36,10 +36,10 @@ import org.gotson.komga.domain.service.BookLifecycle import org.gotson.komga.infrastructure.image.ImageAnalyzer import org.gotson.komga.infrastructure.jooq.UnpagedSorted import org.gotson.komga.infrastructure.mediacontainer.ContentDetector +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableAsQueryParam +import org.gotson.komga.infrastructure.openapi.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam -import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault import org.gotson.komga.interfaces.api.CommonBookController import org.gotson.komga.interfaces.api.ContentRestrictionChecker 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 83ed85f6b..0b41e988f 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 @@ -8,7 +8,7 @@ import jakarta.validation.constraints.NotBlank import org.gotson.komga.domain.model.KomgaUser import org.gotson.komga.domain.model.UserRoles import org.gotson.komga.domain.service.KomgaUserLifecycle -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.interfaces.api.rest.dto.UserDto import org.gotson.komga.interfaces.api.rest.dto.toDto import org.springframework.http.HttpStatus diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClientSettingsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClientSettingsController.kt index 616e8fd82..5bf09b855 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClientSettingsController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ClientSettingsController.kt @@ -9,8 +9,8 @@ import jakarta.validation.Valid import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import org.gotson.komga.infrastructure.jooq.main.ClientSettingsDtoDao +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.gotson.komga.interfaces.api.rest.dto.ClientSettingDto import org.gotson.komga.interfaces.api.rest.dto.ClientSettingGlobalUpdateDto import org.gotson.komga.interfaces.api.rest.dto.ClientSettingUserUpdateDto diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemController.kt index e2cc75737..da545feb3 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FileSystemController.kt @@ -3,7 +3,7 @@ package org.gotson.komga.interfaces.api.rest import com.fasterxml.jackson.annotation.JsonInclude import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.security.access.prepost.PreAuthorize diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FontsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FontsController.kt index 0f320e379..00e704897 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FontsController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/FontsController.kt @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirements import io.swagger.v3.oas.annotations.tags.Tag import org.apache.commons.io.FilenameUtils import org.gotson.komga.infrastructure.configuration.KomgaProperties -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.language.contains import org.springframework.core.io.ByteArrayResource import org.springframework.core.io.FileSystemResource diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/HistoricalEventController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/HistoricalEventController.kt index 1df7cccee..b348bffb7 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/HistoricalEventController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/HistoricalEventController.kt @@ -3,8 +3,8 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.tags.Tag -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableAsQueryParam import org.gotson.komga.interfaces.api.persistence.HistoricalEventDtoRepository import org.gotson.komga.interfaces.api.rest.dto.HistoricalEventDto import org.springframework.data.domain.Page 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 3d7aeafd6..d5978b41f 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 @@ -18,8 +18,8 @@ import org.gotson.komga.domain.persistence.BookRepository import org.gotson.komga.domain.persistence.LibraryRepository import org.gotson.komga.domain.persistence.SeriesRepository import org.gotson.komga.domain.service.LibraryLifecycle +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.gotson.komga.infrastructure.web.filePathToUrl import org.gotson.komga.interfaces.api.rest.dto.LibraryCreationDto import org.gotson.komga.interfaces.api.rest.dto.LibraryDto 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 28b84e15f..59274dbc2 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 @@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.tags.Tag import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse import jakarta.servlet.http.HttpSession -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.session.web.http.CookieSerializer diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/OAuth2Controller.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/OAuth2Controller.kt index a8f236755..72b60290c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/OAuth2Controller.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/OAuth2Controller.kt @@ -3,7 +3,7 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.security.SecurityRequirements import io.swagger.v3.oas.annotations.tags.Tag -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.springframework.http.MediaType import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository import org.springframework.web.bind.annotation.GetMapping 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 f5395c6ba..684896a18 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 @@ -12,8 +12,8 @@ import org.gotson.komga.domain.model.BookPageNumbered import org.gotson.komga.domain.model.PageHashKnown import org.gotson.komga.domain.persistence.PageHashRepository import org.gotson.komga.domain.service.PageHashLifecycle -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableAsQueryParam import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault import org.gotson.komga.interfaces.api.rest.dto.PageHashCreationDto import org.gotson.komga.interfaces.api.rest.dto.PageHashKnownDto 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 9a870fd32..ea1e4a1ad 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 @@ -33,10 +33,10 @@ import org.gotson.komga.domain.service.ReadListLifecycle import org.gotson.komga.infrastructure.image.ImageAnalyzer import org.gotson.komga.infrastructure.jooq.UnpagedSorted import org.gotson.komga.infrastructure.mediacontainer.ContentDetector +import org.gotson.komga.infrastructure.openapi.AuthorsAsQueryParam +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.AuthorsAsQueryParam -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.web.Authors import org.gotson.komga.interfaces.api.persistence.BookDtoRepository import org.gotson.komga.interfaces.api.persistence.ReadProgressDtoRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReferentialController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReferentialController.kt index 104ec6816..27547a35e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReferentialController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReferentialController.kt @@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.tags.Tag import org.gotson.komga.domain.persistence.ReferentialRepository +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam import org.gotson.komga.interfaces.api.rest.dto.AuthorDto import org.gotson.komga.interfaces.api.rest.dto.toDto import org.springframework.data.domain.Page diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt index 141fdf228..8d3d1bd26 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReleaseController.kt @@ -3,8 +3,8 @@ package org.gotson.komga.interfaces.api.rest import com.github.benmanes.caffeine.cache.Caffeine import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.gotson.komga.interfaces.api.rest.dto.GithubReleaseDto import org.gotson.komga.interfaces.api.rest.dto.ReleaseDto import org.springframework.core.ParameterizedTypeReference 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 2dd4def4b..080b6eb6b 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 @@ -25,10 +25,10 @@ import org.gotson.komga.domain.service.SeriesCollectionLifecycle import org.gotson.komga.infrastructure.image.ImageAnalyzer import org.gotson.komga.infrastructure.jooq.UnpagedSorted import org.gotson.komga.infrastructure.mediacontainer.ContentDetector +import org.gotson.komga.infrastructure.openapi.AuthorsAsQueryParam +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.AuthorsAsQueryParam -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.web.Authors import org.gotson.komga.interfaces.api.persistence.SeriesDtoRepository import org.gotson.komga.interfaces.api.rest.dto.CollectionCreationDto 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 f5200ad54..918b356c9 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 @@ -44,11 +44,11 @@ import org.gotson.komga.domain.service.SeriesLifecycle import org.gotson.komga.infrastructure.image.ImageAnalyzer import org.gotson.komga.infrastructure.jooq.UnpagedSorted import org.gotson.komga.infrastructure.mediacontainer.ContentDetector +import org.gotson.komga.infrastructure.openapi.AuthorsAsQueryParam +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.PageableAsQueryParam +import org.gotson.komga.infrastructure.openapi.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.AuthorsAsQueryParam -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration -import org.gotson.komga.infrastructure.swagger.PageableAsQueryParam -import org.gotson.komga.infrastructure.swagger.PageableWithoutSortAsQueryParam import org.gotson.komga.infrastructure.web.Authors import org.gotson.komga.infrastructure.web.DelimitedPair import org.gotson.komga.interfaces.api.ContentRestrictionChecker 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 3ce967de2..063d4dc41 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 @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag import jakarta.validation.Valid import org.gotson.komga.infrastructure.configuration.KomgaSettingsProvider import org.gotson.komga.infrastructure.kobo.KepubConverter -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.web.WebServerEffectiveSettings import org.gotson.komga.interfaces.api.rest.dto.SettingMultiSource import org.gotson.komga.interfaces.api.rest.dto.SettingsDto diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SyncPointController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SyncPointController.kt index a46665d46..a7d1e24b8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SyncPointController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SyncPointController.kt @@ -3,8 +3,8 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.gotson.komga.domain.persistence.SyncPointRepository +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.security.core.annotation.AuthenticationPrincipal diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TaskController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TaskController.kt index f46ed6653..e790c5b5a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TaskController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TaskController.kt @@ -3,7 +3,7 @@ package org.gotson.komga.interfaces.api.rest import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.tags.Tag import org.gotson.komga.application.tasks.TasksRepository -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.springframework.http.HttpStatus import org.springframework.http.MediaType import org.springframework.security.access.prepost.PreAuthorize diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt index b71db82b8..fe7f1cb87 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt @@ -11,7 +11,7 @@ import org.gotson.komga.domain.model.TransientBook import org.gotson.komga.domain.persistence.TransientBookRepository import org.gotson.komga.domain.service.BookAnalyzer import org.gotson.komga.domain.service.TransientBookLifecycle -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration import org.gotson.komga.infrastructure.web.getMediaTypeOrDefault import org.gotson.komga.infrastructure.web.toFilePath import org.gotson.komga.interfaces.api.rest.dto.PageDto diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt index 43781bbb6..adb666f0f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt @@ -14,8 +14,8 @@ import org.gotson.komga.domain.persistence.KomgaUserRepository import org.gotson.komga.domain.persistence.LibraryRepository import org.gotson.komga.domain.service.KomgaUserLifecycle import org.gotson.komga.infrastructure.jooq.UnpagedSorted +import org.gotson.komga.infrastructure.openapi.OpenApiConfiguration.TagNames import org.gotson.komga.infrastructure.security.KomgaPrincipal -import org.gotson.komga.infrastructure.swagger.OpenApiConfiguration.TagNames import org.gotson.komga.interfaces.api.rest.dto.ApiKeyDto import org.gotson.komga.interfaces.api.rest.dto.ApiKeyRequestDto import org.gotson.komga.interfaces.api.rest.dto.AuthenticationActivityDto