From bf8c04bc1fba4a8b132c138584cd59f61516c8d9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Aug 2020 11:38:00 +0600 Subject: [PATCH] optimize imports --- .../core/ktor/client/post/ReadPostsRepoKtorClient.kt | 1 - .../server/content/WriteContentRepoRoutingConfigurator.kt | 1 - .../ktor/server/post/WritePostsRepoRoutingConfigurator.kt | 1 - .../postssystem/ktor/server/FlowsWebsocket.kt | 1 - .../postssystem/ktor/server/ServerRoutingShortcuts.kt | 1 - .../ktor/server/configurators/StatusPagesConfigurator.kt | 2 +- .../postssystem/ktor/tests/WebsocketsTest.kt | 1 - .../publishing/ktor/client/PublishingKeysRepoKtorClient.kt | 4 +--- .../ktor/client/WritePublishingKeysRepoKtorClient.kt | 4 +--- .../server/WritePublishingKeysRepoRoutingConfigurator.kt | 4 +--- utils/common/mimes_generator/mime_generator.py | 5 ++--- .../postssystem/utils/common/ByteArrayAllocator.kt | 2 +- .../postssystem/utils/common/MimeTypeTools.kt | 7 ++++++- .../repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt | 5 +++-- .../ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt | 6 ++---- .../utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt | 5 +++-- .../repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt | 3 ++- .../one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt | 3 ++- 18 files changed, 25 insertions(+), 31 deletions(-) diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt index c7c5a6e2..5713d975 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt @@ -11,7 +11,6 @@ import com.insanusmokrassar.postssystem.utils.common.pagination.Pagination import com.insanusmokrassar.postssystem.utils.common.pagination.PaginationResult import com.soywiz.klock.DateTime import io.ktor.client.HttpClient -import io.ktor.client.request.get import kotlinx.serialization.builtins.nullable class ReadPostsRepoKtorClient( diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt index 48ae1e53..573f30a1 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt @@ -5,7 +5,6 @@ import com.insanusmokrassar.postssystem.core.content.api.WriteContentRepo import com.insanusmokrassar.postssystem.core.ktor.* import com.insanusmokrassar.postssystem.ktor.server.* import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator -import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat import io.ktor.application.call import io.ktor.routing.Route import io.ktor.routing.post diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt index 820b6ea2..7aa0e333 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt @@ -5,7 +5,6 @@ import com.insanusmokrassar.postssystem.core.post.* import com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo import com.insanusmokrassar.postssystem.ktor.server.* import com.insanusmokrassar.postssystem.ktor.server.configurators.ApplicationRoutingConfigurator -import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat import io.ktor.application.call import io.ktor.routing.Route import io.ktor.routing.post diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FlowsWebsocket.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FlowsWebsocket.kt index f7c58dca..a1d9c7f9 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FlowsWebsocket.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/FlowsWebsocket.kt @@ -8,7 +8,6 @@ import io.ktor.routing.Route import io.ktor.websocket.webSocket import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect -import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerializationStrategy private suspend fun DefaultWebSocketSession.checkReceivedAndCloseIfExists() { diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt index 27734adb..3ce44c91 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt @@ -2,7 +2,6 @@ package com.insanusmokrassar.postssystem.ktor.server import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat import io.ktor.application.ApplicationCall -import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.response.respond import io.ktor.response.respondBytes diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt index ebb5bc5c..12cc0972 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt @@ -3,7 +3,7 @@ package com.insanusmokrassar.postssystem.ktor.server.configurators import io.ktor.application.Application import io.ktor.application.install import io.ktor.features.StatusPages -import kotlinx.serialization.* +import kotlinx.serialization.Contextual class StatusPagesConfigurator( private val elements: List<@Contextual Element> diff --git a/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt b/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt index 618f4e57..37ae8c2a 100644 --- a/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt +++ b/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt @@ -3,7 +3,6 @@ package com.insanusmokrassar.postssystem.ktor.tests import com.insanusmokrassar.postssystem.ktor.client.createStandardWebsocketFlow import com.insanusmokrassar.postssystem.ktor.server.createKtorServer import com.insanusmokrassar.postssystem.ktor.server.includeWebsocketHandling -import com.insanusmokrassar.postssystem.ktor.standardKtorSerialFormat import io.ktor.application.install import io.ktor.client.HttpClient import io.ktor.routing.routing diff --git a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/PublishingKeysRepoKtorClient.kt b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/PublishingKeysRepoKtorClient.kt index 7739efc0..09757076 100644 --- a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/PublishingKeysRepoKtorClient.kt +++ b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/PublishingKeysRepoKtorClient.kt @@ -1,8 +1,6 @@ package com.insanusmokrassar.postssystem.publishing.ktor.client -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.ReadPublishingKeysRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo +import com.insanusmokrassar.postssystem.core.publishing.repos.* import com.insanusmokrassar.postssystem.publishing.ktor.publishingKeysRootRoute import io.ktor.client.HttpClient import io.ktor.client.features.websocket.WebSockets diff --git a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt index bc4bc6b8..de281241 100644 --- a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt +++ b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/WritePublishingKeysRepoKtorClient.kt @@ -6,9 +6,7 @@ import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKey import com.insanusmokrassar.postssystem.ktor.buildStandardUrl import com.insanusmokrassar.postssystem.ktor.client.BodyPair import com.insanusmokrassar.postssystem.ktor.client.unipost -import com.insanusmokrassar.postssystem.publishing.ktor.SetPostTriggerControlKeyObject -import com.insanusmokrassar.postssystem.publishing.ktor.setPostTriggerControlKeyRoute -import com.insanusmokrassar.postssystem.publishing.ktor.unsetPostTriggerControlKeyRoute +import com.insanusmokrassar.postssystem.publishing.ktor.* import io.ktor.client.HttpClient import kotlinx.serialization.builtins.serializer diff --git a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt index aedca55c..150a1fab 100644 --- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt +++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/WritePublishingKeysRepoRoutingConfigurator.kt @@ -4,9 +4,7 @@ import com.insanusmokrassar.postssystem.core.post.PostId import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo import com.insanusmokrassar.postssystem.ktor.server.unianswer import com.insanusmokrassar.postssystem.ktor.server.uniload -import com.insanusmokrassar.postssystem.publishing.ktor.SetPostTriggerControlKeyObject -import com.insanusmokrassar.postssystem.publishing.ktor.setPostTriggerControlKeyRoute -import com.insanusmokrassar.postssystem.publishing.ktor.unsetPostTriggerControlKeyRoute +import com.insanusmokrassar.postssystem.publishing.ktor.* import io.ktor.application.call import io.ktor.routing.Route import io.ktor.routing.post diff --git a/utils/common/mimes_generator/mime_generator.py b/utils/common/mimes_generator/mime_generator.py index 7e8ac558..9265d98b 100644 --- a/utils/common/mimes_generator/mime_generator.py +++ b/utils/common/mimes_generator/mime_generator.py @@ -1,7 +1,6 @@ -import requests -from bs4 import BeautifulSoup import pandas as pd -import itertools +import pandas as pd + def fix_name(category, raw_name): splitted = raw_name.replace('-', '+').replace('.', '+').replace(',', '+').split('+') diff --git a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt index bd9c11c1..433b09f4 100644 --- a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt +++ b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt @@ -1,6 +1,6 @@ package com.insanusmokrassar.postssystem.utils.common -import kotlinx.serialization.* +import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.ByteArraySerializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder diff --git a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt index 125c7d0b..f5d7a8e3 100644 --- a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt +++ b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt @@ -1,9 +1,14 @@ package com.insanusmokrassar.postssystem.utils.common -import kotlinx.serialization.* +import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializer import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder +import kotlin.collections.forEach +import kotlin.collections.getOrPut +import kotlin.collections.mutableMapOf +import kotlin.collections.set private val mimesCache = mutableMapOf().also { knownMimeTypes.forEach { mimeType -> it[mimeType.raw] = mimeType } diff --git a/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt b/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt index dd8666fb..eb1d49ec 100644 --- a/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt +++ b/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt @@ -1,8 +1,9 @@ package com.insanusmokrassar.postssystem.utils.repos.ktor.client.crud -import com.insanusmokrassar.postssystem.ktor.* +import com.insanusmokrassar.postssystem.ktor.buildStandardUrl import com.insanusmokrassar.postssystem.ktor.client.* -import com.insanusmokrassar.postssystem.utils.repos.* +import com.insanusmokrassar.postssystem.utils.repos.UpdatedValuePair +import com.insanusmokrassar.postssystem.utils.repos.WriteStandardCRUDRepo import com.insanusmokrassar.postssystem.utils.repos.ktor.common.* import io.ktor.client.HttpClient import kotlinx.coroutines.flow.Flow diff --git a/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt b/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt index 034b9d87..02fe86e6 100644 --- a/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt +++ b/utils/repos/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt @@ -1,9 +1,7 @@ package com.insanusmokrassar.postssystem.utils.repos.ktor.client.one_to_many -import com.insanusmokrassar.postssystem.utils.repos.OneToManyKeyValueRepo -import com.insanusmokrassar.postssystem.utils.repos.OneToManyReadKeyValueRepo -import com.insanusmokrassar.postssystem.utils.repos.OneToManyWriteKeyValueRepo -import io.ktor.client.* +import com.insanusmokrassar.postssystem.utils.repos.* +import io.ktor.client.HttpClient import kotlinx.serialization.KSerializer class KtorOneToManyKeyValueRepo( diff --git a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt index e8410b03..664dba6e 100644 --- a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt +++ b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt @@ -1,7 +1,8 @@ package com.insanusmokrassar.postssystem.utils.repos.ktor.server.crud -import com.insanusmokrassar.postssystem.utils.repos.* -import io.ktor.routing.* +import com.insanusmokrassar.postssystem.utils.repos.StandardCRUDRepo +import io.ktor.routing.Route +import io.ktor.routing.route import kotlinx.serialization.KSerializer fun Route.configureStandardCrudRepoRoutes( diff --git a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt index 37f00f39..e065aee7 100644 --- a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt +++ b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt @@ -4,7 +4,8 @@ import com.insanusmokrassar.postssystem.ktor.server.* import com.insanusmokrassar.postssystem.utils.repos.WriteStandardCRUDRepo import com.insanusmokrassar.postssystem.utils.repos.ktor.common.* import io.ktor.application.call -import io.ktor.routing.* +import io.ktor.routing.Route +import io.ktor.routing.post import kotlinx.serialization.KSerializer import kotlinx.serialization.builtins.* diff --git a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt index 1463ced4..507f75c9 100644 --- a/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt +++ b/utils/repos/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt @@ -1,7 +1,8 @@ package com.insanusmokrassar.postssystem.utils.repos.ktor.server.one_to_many import com.insanusmokrassar.postssystem.utils.repos.OneToManyKeyValueRepo -import io.ktor.routing.* +import io.ktor.routing.Route +import io.ktor.routing.route import kotlinx.serialization.KSerializer fun Route.configureOneToManyKeyValueRepoRoutes(