From 659cce3e0300586f31522d663bf2db35bc1c4a6e Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 5 Jun 2024 17:27:25 +0200 Subject: [PATCH] chore: Move files to correct folders --- .../api/configuration/Dependencies.kt | 18 ++++++------ .../revanced/api/configuration/Security.kt | 2 +- .../repository/AnnouncementRepository.kt | 10 +++---- .../repository/ConfigurationRepository.kt | 2 +- .../repository/backend/BackendRepository.kt | 2 +- .../backend/github/GitHubBackendRepository.kt | 28 +++++++++---------- .../repository/backend/github/api/Request.kt | 2 +- .../repository/backend/github/api/Response.kt | 2 +- .../api/configuration/routing/Routing.kt | 2 +- .../routing/routes/Announcements.kt | 6 ++-- .../configuration/routing/routes/ApiRoute.kt | 4 +-- .../configuration/routing/routes/OldApi.kt | 2 +- .../routing/routes/PatchesRoute.kt | 2 +- .../{ => configuration}/schema/APISchema.kt | 2 +- .../services/AnnouncementService.kt | 8 +++--- .../services/ApiService.kt | 12 ++++---- .../services/AuthService.kt | 2 +- .../services}/OldApiService.kt | 2 +- .../services/PatchesService.kt | 12 ++++---- 19 files changed, 60 insertions(+), 60 deletions(-) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/AnnouncementRepository.kt (93%) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/ConfigurationRepository.kt (90%) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/backend/BackendRepository.kt (98%) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/backend/github/GitHubBackendRepository.kt (60%) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/backend/github/api/Request.kt (92%) rename src/main/kotlin/app/revanced/api/{ => configuration}/repository/backend/github/api/Response.kt (95%) rename src/main/kotlin/app/revanced/api/{ => configuration}/schema/APISchema.kt (97%) rename src/main/kotlin/app/revanced/api/{ => configuration}/services/AnnouncementService.kt (80%) rename src/main/kotlin/app/revanced/api/{ => configuration}/services/ApiService.kt (71%) rename src/main/kotlin/app/revanced/api/{ => configuration}/services/AuthService.kt (96%) rename src/main/kotlin/app/revanced/api/{repository => configuration/services}/OldApiService.kt (98%) rename src/main/kotlin/app/revanced/api/{ => configuration}/services/PatchesService.kt (88%) diff --git a/src/main/kotlin/app/revanced/api/configuration/Dependencies.kt b/src/main/kotlin/app/revanced/api/configuration/Dependencies.kt index b4f6542..7cc14f4 100644 --- a/src/main/kotlin/app/revanced/api/configuration/Dependencies.kt +++ b/src/main/kotlin/app/revanced/api/configuration/Dependencies.kt @@ -1,14 +1,14 @@ package app.revanced.api.configuration -import app.revanced.api.repository.AnnouncementRepository -import app.revanced.api.repository.ConfigurationRepository -import app.revanced.api.repository.OldApiService -import app.revanced.api.repository.backend.BackendRepository -import app.revanced.api.repository.backend.github.GitHubBackendRepository -import app.revanced.api.services.AnnouncementService -import app.revanced.api.services.ApiService -import app.revanced.api.services.AuthService -import app.revanced.api.services.PatchesService +import app.revanced.api.configuration.repository.AnnouncementRepository +import app.revanced.api.configuration.repository.ConfigurationRepository +import app.revanced.api.configuration.repository.backend.BackendRepository +import app.revanced.api.configuration.repository.backend.github.GitHubBackendRepository +import app.revanced.api.configuration.services.AnnouncementService +import app.revanced.api.configuration.services.ApiService +import app.revanced.api.configuration.services.AuthService +import app.revanced.api.configuration.services.OldApiService +import app.revanced.api.configuration.services.PatchesService import com.akuleshov7.ktoml.Toml import com.akuleshov7.ktoml.source.decodeFromStream import io.github.cdimascio.dotenv.Dotenv diff --git a/src/main/kotlin/app/revanced/api/configuration/Security.kt b/src/main/kotlin/app/revanced/api/configuration/Security.kt index 2543fb1..1d6d386 100644 --- a/src/main/kotlin/app/revanced/api/configuration/Security.kt +++ b/src/main/kotlin/app/revanced/api/configuration/Security.kt @@ -1,6 +1,6 @@ package app.revanced.api.configuration -import app.revanced.api.services.AuthService +import app.revanced.api.configuration.services.AuthService import io.ktor.server.application.* import org.koin.ktor.ext.get diff --git a/src/main/kotlin/app/revanced/api/repository/AnnouncementRepository.kt b/src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt similarity index 93% rename from src/main/kotlin/app/revanced/api/repository/AnnouncementRepository.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt index a6c4b63..7da8300 100644 --- a/src/main/kotlin/app/revanced/api/repository/AnnouncementRepository.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/AnnouncementRepository.kt @@ -1,9 +1,9 @@ -package app.revanced.api.repository +package app.revanced.api.configuration.repository -import app.revanced.api.repository.AnnouncementRepository.AttachmentTable.announcement -import app.revanced.api.schema.APIAnnouncement -import app.revanced.api.schema.APILatestAnnouncement -import app.revanced.api.schema.APIResponseAnnouncement +import app.revanced.api.configuration.repository.AnnouncementRepository.AttachmentTable.announcement +import app.revanced.api.configuration.schema.APIAnnouncement +import app.revanced.api.configuration.schema.APILatestAnnouncement +import app.revanced.api.configuration.schema.APIResponseAnnouncement import kotlinx.datetime.* import org.jetbrains.exposed.dao.IntEntity import org.jetbrains.exposed.dao.IntEntityClass diff --git a/src/main/kotlin/app/revanced/api/repository/ConfigurationRepository.kt b/src/main/kotlin/app/revanced/api/configuration/repository/ConfigurationRepository.kt similarity index 90% rename from src/main/kotlin/app/revanced/api/repository/ConfigurationRepository.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/ConfigurationRepository.kt index 531de56..3d5f28c 100644 --- a/src/main/kotlin/app/revanced/api/repository/ConfigurationRepository.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/ConfigurationRepository.kt @@ -1,4 +1,4 @@ -package app.revanced.api.repository +package app.revanced.api.configuration.repository import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/app/revanced/api/repository/backend/BackendRepository.kt b/src/main/kotlin/app/revanced/api/configuration/repository/backend/BackendRepository.kt similarity index 98% rename from src/main/kotlin/app/revanced/api/repository/backend/BackendRepository.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/backend/BackendRepository.kt index f27012d..279c354 100644 --- a/src/main/kotlin/app/revanced/api/repository/backend/BackendRepository.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/backend/BackendRepository.kt @@ -1,4 +1,4 @@ -package app.revanced.api.repository.backend +package app.revanced.api.configuration.repository.backend import io.ktor.client.* import kotlinx.datetime.LocalDateTime diff --git a/src/main/kotlin/app/revanced/api/repository/backend/github/GitHubBackendRepository.kt b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/GitHubBackendRepository.kt similarity index 60% rename from src/main/kotlin/app/revanced/api/repository/backend/github/GitHubBackendRepository.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/backend/github/GitHubBackendRepository.kt index 1664adf..cb22d58 100644 --- a/src/main/kotlin/app/revanced/api/repository/backend/github/GitHubBackendRepository.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/GitHubBackendRepository.kt @@ -1,18 +1,18 @@ -package app.revanced.api.repository.backend.github +package app.revanced.api.configuration.repository.backend.github -import app.revanced.api.repository.backend.BackendRepository -import app.revanced.api.repository.backend.BackendRepository.BackendOrganization.BackendMember -import app.revanced.api.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendContributor -import app.revanced.api.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendRelease -import app.revanced.api.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendRelease.BackendAsset -import app.revanced.api.repository.backend.github.api.Request -import app.revanced.api.repository.backend.github.api.Request.Organization.Members -import app.revanced.api.repository.backend.github.api.Request.Organization.Repository.Contributors -import app.revanced.api.repository.backend.github.api.Request.Organization.Repository.Releases -import app.revanced.api.repository.backend.github.api.Response -import app.revanced.api.repository.backend.github.api.Response.GitHubOrganization.GitHubMember -import app.revanced.api.repository.backend.github.api.Response.GitHubOrganization.GitHubRepository.GitHubContributor -import app.revanced.api.repository.backend.github.api.Response.GitHubOrganization.GitHubRepository.GitHubRelease +import app.revanced.api.configuration.repository.backend.BackendRepository +import app.revanced.api.configuration.repository.backend.BackendRepository.BackendOrganization.BackendMember +import app.revanced.api.configuration.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendContributor +import app.revanced.api.configuration.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendRelease +import app.revanced.api.configuration.repository.backend.BackendRepository.BackendOrganization.BackendRepository.BackendRelease.BackendAsset +import app.revanced.api.configuration.repository.backend.github.api.Request +import app.revanced.api.configuration.repository.backend.github.api.Request.Organization.Members +import app.revanced.api.configuration.repository.backend.github.api.Request.Organization.Repository.Contributors +import app.revanced.api.configuration.repository.backend.github.api.Request.Organization.Repository.Releases +import app.revanced.api.configuration.repository.backend.github.api.Response +import app.revanced.api.configuration.repository.backend.github.api.Response.GitHubOrganization.GitHubMember +import app.revanced.api.configuration.repository.backend.github.api.Response.GitHubOrganization.GitHubRepository.GitHubContributor +import app.revanced.api.configuration.repository.backend.github.api.Response.GitHubOrganization.GitHubRepository.GitHubRelease import io.ktor.client.* import io.ktor.client.call.* import io.ktor.client.plugins.resources.* diff --git a/src/main/kotlin/app/revanced/api/repository/backend/github/api/Request.kt b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Request.kt similarity index 92% rename from src/main/kotlin/app/revanced/api/repository/backend/github/api/Request.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Request.kt index 557f9e2..7eb9897 100644 --- a/src/main/kotlin/app/revanced/api/repository/backend/github/api/Request.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Request.kt @@ -1,4 +1,4 @@ -package app.revanced.api.repository.backend.github.api +package app.revanced.api.configuration.repository.backend.github.api import io.ktor.resources.* diff --git a/src/main/kotlin/app/revanced/api/repository/backend/github/api/Response.kt b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Response.kt similarity index 95% rename from src/main/kotlin/app/revanced/api/repository/backend/github/api/Response.kt rename to src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Response.kt index 2ddc8f1..0128ee4 100644 --- a/src/main/kotlin/app/revanced/api/repository/backend/github/api/Response.kt +++ b/src/main/kotlin/app/revanced/api/configuration/repository/backend/github/api/Response.kt @@ -1,4 +1,4 @@ -package app.revanced.api.repository.backend.github.api +package app.revanced.api.configuration.repository.backend.github.api import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt b/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt index 8296ee3..61e1edb 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt @@ -1,10 +1,10 @@ package app.revanced.api.configuration.routing +import app.revanced.api.configuration.repository.ConfigurationRepository import app.revanced.api.configuration.routing.routes.announcementsRoute import app.revanced.api.configuration.routing.routes.oldApiRoute import app.revanced.api.configuration.routing.routes.patchesRoute import app.revanced.api.configuration.routing.routes.rootRoute -import app.revanced.api.repository.ConfigurationRepository import io.ktor.server.application.* import io.ktor.server.routing.* import org.koin.ktor.ext.get diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt b/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt index bc4859d..560e4dd 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt @@ -1,8 +1,8 @@ package app.revanced.api.configuration.routing.routes -import app.revanced.api.schema.APIAnnouncement -import app.revanced.api.schema.APIAnnouncementArchivedAt -import app.revanced.api.services.AnnouncementService +import app.revanced.api.configuration.schema.APIAnnouncement +import app.revanced.api.configuration.schema.APIAnnouncementArchivedAt +import app.revanced.api.configuration.services.AnnouncementService import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt b/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt index 56eb553..762bdff 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt @@ -1,7 +1,7 @@ package app.revanced.api.configuration.routing.routes -import app.revanced.api.services.ApiService -import app.revanced.api.services.AuthService +import app.revanced.api.configuration.services.ApiService +import app.revanced.api.configuration.services.AuthService import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.auth.* diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt b/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt index 64f8006..d45785f 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt @@ -1,6 +1,6 @@ package app.revanced.api.configuration.routing.routes -import app.revanced.api.repository.OldApiService +import app.revanced.api.configuration.services.OldApiService import io.ktor.server.application.* import io.ktor.server.routing.* import org.koin.ktor.ext.get diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt b/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt index 4ddfd65..6567c48 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt @@ -1,6 +1,6 @@ package app.revanced.api.configuration.routing.routes -import app.revanced.api.services.PatchesService +import app.revanced.api.configuration.services.PatchesService import io.ktor.http.* import io.ktor.server.application.* import io.ktor.server.response.* diff --git a/src/main/kotlin/app/revanced/api/schema/APISchema.kt b/src/main/kotlin/app/revanced/api/configuration/schema/APISchema.kt similarity index 97% rename from src/main/kotlin/app/revanced/api/schema/APISchema.kt rename to src/main/kotlin/app/revanced/api/configuration/schema/APISchema.kt index ec6355b..8658460 100644 --- a/src/main/kotlin/app/revanced/api/schema/APISchema.kt +++ b/src/main/kotlin/app/revanced/api/configuration/schema/APISchema.kt @@ -1,4 +1,4 @@ -package app.revanced.api.schema +package app.revanced.api.configuration.schema import kotlinx.datetime.LocalDateTime import kotlinx.serialization.SerialName diff --git a/src/main/kotlin/app/revanced/api/services/AnnouncementService.kt b/src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt similarity index 80% rename from src/main/kotlin/app/revanced/api/services/AnnouncementService.kt rename to src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt index 63418da..80a3ddb 100644 --- a/src/main/kotlin/app/revanced/api/services/AnnouncementService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/AnnouncementService.kt @@ -1,8 +1,8 @@ -package app.revanced.api.services +package app.revanced.api.configuration.services -import app.revanced.api.repository.AnnouncementRepository -import app.revanced.api.schema.APIAnnouncement -import app.revanced.api.schema.APILatestAnnouncement +import app.revanced.api.configuration.repository.AnnouncementRepository +import app.revanced.api.configuration.schema.APIAnnouncement +import app.revanced.api.configuration.schema.APILatestAnnouncement import kotlinx.datetime.LocalDateTime internal class AnnouncementService( diff --git a/src/main/kotlin/app/revanced/api/services/ApiService.kt b/src/main/kotlin/app/revanced/api/configuration/services/ApiService.kt similarity index 71% rename from src/main/kotlin/app/revanced/api/services/ApiService.kt rename to src/main/kotlin/app/revanced/api/configuration/services/ApiService.kt index d36e64b..7e25b69 100644 --- a/src/main/kotlin/app/revanced/api/services/ApiService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/ApiService.kt @@ -1,10 +1,10 @@ -package app.revanced.api.services +package app.revanced.api.configuration.services -import app.revanced.api.repository.ConfigurationRepository -import app.revanced.api.repository.backend.BackendRepository -import app.revanced.api.schema.APIContributable -import app.revanced.api.schema.APIContributor -import app.revanced.api.schema.APIMember +import app.revanced.api.configuration.repository.ConfigurationRepository +import app.revanced.api.configuration.repository.backend.BackendRepository +import app.revanced.api.configuration.schema.APIContributable +import app.revanced.api.configuration.schema.APIContributor +import app.revanced.api.configuration.schema.APIMember import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/src/main/kotlin/app/revanced/api/services/AuthService.kt b/src/main/kotlin/app/revanced/api/configuration/services/AuthService.kt similarity index 96% rename from src/main/kotlin/app/revanced/api/services/AuthService.kt rename to src/main/kotlin/app/revanced/api/configuration/services/AuthService.kt index 29f9a81..8e4b8a9 100644 --- a/src/main/kotlin/app/revanced/api/services/AuthService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/AuthService.kt @@ -1,4 +1,4 @@ -package app.revanced.api.services +package app.revanced.api.configuration.services import com.auth0.jwt.JWT import com.auth0.jwt.algorithms.Algorithm diff --git a/src/main/kotlin/app/revanced/api/repository/OldApiService.kt b/src/main/kotlin/app/revanced/api/configuration/services/OldApiService.kt similarity index 98% rename from src/main/kotlin/app/revanced/api/repository/OldApiService.kt rename to src/main/kotlin/app/revanced/api/configuration/services/OldApiService.kt index 97a4443..ea15427 100644 --- a/src/main/kotlin/app/revanced/api/repository/OldApiService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/OldApiService.kt @@ -1,4 +1,4 @@ -package app.revanced.api.repository +package app.revanced.api.configuration.services import io.ktor.client.* import io.ktor.client.request.* diff --git a/src/main/kotlin/app/revanced/api/services/PatchesService.kt b/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt similarity index 88% rename from src/main/kotlin/app/revanced/api/services/PatchesService.kt rename to src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt index 22afd70..2281eed 100644 --- a/src/main/kotlin/app/revanced/api/services/PatchesService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt @@ -1,10 +1,10 @@ -package app.revanced.api.services +package app.revanced.api.configuration.services -import app.revanced.api.repository.ConfigurationRepository -import app.revanced.api.repository.backend.BackendRepository -import app.revanced.api.schema.APIAsset -import app.revanced.api.schema.APIRelease -import app.revanced.api.schema.APIReleaseVersion +import app.revanced.api.configuration.repository.ConfigurationRepository +import app.revanced.api.configuration.repository.backend.BackendRepository +import app.revanced.api.configuration.schema.APIAsset +import app.revanced.api.configuration.schema.APIRelease +import app.revanced.api.configuration.schema.APIReleaseVersion import app.revanced.library.PatchUtils import app.revanced.patcher.PatchBundleLoader import com.github.benmanes.caffeine.cache.Caffeine