From 44f4b44c5034889289be6df2e98f128055832c59 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 25 Nov 2020 14:08:45 +0600 Subject: [PATCH] migration on new package --- business_cases/post_creating/client/build.gradle | 2 +- .../client/PostCreatingClientCase.kt | 10 +++++----- business_cases/post_creating/common/build.gradle | 2 +- .../server/BusinessPostCreatingCase.kt | 12 ++++++------ .../post_creating/server/PostCreatingCase.kt | 8 ++++---- .../post_creating/server/Routings.kt | 2 +- business_cases/post_creating/server/build.gradle | 2 +- .../server/PostCreatingRoutingCase.kt | 4 ++-- core/api/build.gradle | 2 +- core/api/publish.gradle | 8 ++++---- .../postssystem/core/post/repo/PostsRepo.kt | 3 --- .../inmo}/postssystem/core/DateTimeUtils.kt | 2 +- .../inmo}/postssystem/core/IdUtils.kt | 6 +++--- .../inmo}/postssystem/core/content/Content.kt | 6 +++--- .../postssystem/core/content/api/ContentRepo.kt | 2 +- .../core/content/api/ReadContentRepo.kt | 8 ++++---- .../core/content/api/WriteContentRepo.kt | 4 ++-- .../core/post/BusinessPublishablePostsRepo.kt | 4 ++-- .../inmo}/postssystem/core/post/Post.kt | 10 +++++----- .../inmo/postssystem/core/post/repo/PostsRepo.kt | 3 +++ .../postssystem/core/post/repo/ReadPostsRepo.kt | 12 ++++++------ .../postssystem/core/post/repo/WritePostsRepo.kt | 6 +++--- .../postssystem/core/api/ContentSerialization.kt | 6 +++--- core/exposed/build.gradle | 2 +- core/exposed/publish.gradle | 8 ++++---- .../core/exposed/ExposedContentRepo.kt | 10 +++++----- .../postssystem/core/exposed/ExposedPostsRepo.kt | 10 +++++----- .../exposed/content/BinaryContentHolderRepo.kt | 6 +++--- .../core/exposed/content/ContentHolderRepo.kt | 6 +++--- .../exposed/content/SpecialContentHolderRepo.kt | 6 +++--- .../exposed/content/TextContentHolderRepo.kt | 6 +++--- .../core/exposed/ExposedContentAPICommonTests.kt | 4 ++-- .../core/exposed/ExposedPostsRepoCommonTests.kt | 4 ++-- core/ktor/client/build.gradle | 2 +- core/ktor/client/publish.gradle | 8 ++++---- .../ktor/client/content/ContentRepoKtorClient.kt | 6 +++--- .../client/content/ReadContentRepoKtorClient.kt | 10 +++++----- .../client/content/WriteContentRepoKtorClient.kt | 8 ++++---- .../core/ktor/client/post/PostsRepoKtorClient.kt | 6 +++--- .../ktor/client/post/ReadPostsRepoKtorClient.kt | 12 ++++++------ .../ktor/client/post/WritePostsRepoKtorClient.kt | 8 ++++---- core/ktor/common/build.gradle | 2 +- core/ktor/common/publish.gradle | 8 ++++---- .../postssystem/core/ktor/UpdatePostObject.kt | 11 ----------- .../inmo}/postssystem/core/ktor/ContentRoutes.kt | 2 +- .../inmo}/postssystem/core/ktor/PostRoutes.kt | 2 +- .../inmo}/postssystem/core/ktor/Serializers.kt | 10 +++++----- .../postssystem/core/ktor/UpdatePostObject.kt | 11 +++++++++++ core/ktor/server/build.gradle | 2 +- .../content/ContentRepoRoutingConfigurator.kt | 6 +++--- .../ReadContentRepoRoutingConfigurator.kt | 10 +++++----- .../WriteContentRepoRoutingConfigurator.kt | 8 ++++---- .../server/post/PostsRepoRoutingConfigurator.kt | 6 +++--- .../post/ReadPostsRepoRoutingConfigurator.kt | 16 ++++++++-------- .../post/WritePostsRepoRoutingConfigurator.kt | 8 ++++---- gradle.properties | 1 + publishing/api/build.gradle | 2 +- publishing/api/publish.gradle | 8 ++++---- .../core/publishing/PostKeyGenerator.kt | 5 ----- .../core/publishing/PostKeyGenerator.kt | 5 +++++ .../core/publishing/PublishingKeyReceiver.kt | 4 ++-- .../core/publishing/PublishingRegistrar.kt | 6 +++--- .../core/publishing/PublishingService.kt | 8 ++++---- .../core/publishing/PublishingTrigger.kt | 12 ++++++------ .../inmo}/postssystem/core/publishing/Trigger.kt | 2 +- .../core/publishing/repos/PublishedPostsRepo.kt | 10 +++++----- .../core/publishing/repos/PublishingKeysRepo.kt | 6 +++--- publishing/exposed/build.gradle | 2 +- publishing/exposed/publish.gradle | 8 ++++---- .../exposed/ExposedPublishingKeysRepo.kt | 8 ++++---- publishing/ktor/client/build.gradle | 4 +--- publishing/ktor/client/publish.gradle | 0 .../ktor/client/PublishingKeysRepoKtorClient.kt | 6 +++--- .../client/ReadPublishingKeysRepoKtorClient.kt | 12 ++++++------ .../client/WritePublishingKeysRepoKtorClient.kt | 10 +++++----- publishing/ktor/common/build.gradle | 2 +- .../publishing/ktor/PublishingKeysRoutes.kt | 2 +- .../publishing/ktor/PublishingRegistrarRoutes.kt | 2 +- .../publishing/ktor/PublishingTriggerRoutes.kt | 2 +- .../postssystem/publishing/ktor/Serializers.kt | 6 +++--- .../ktor/SetPostTriggerControlKeyObject.kt | 6 +++--- publishing/ktor/server/build.gradle | 2 +- .../PublishingKeysRepoRoutingConfigurator.kt | 6 +++--- .../ReadPublishingKeysRepoRoutingConfigurator.kt | 12 ++++++------ ...WritePublishingKeysRepoRoutingConfigurator.kt | 8 ++++---- 85 files changed, 257 insertions(+), 258 deletions(-) rename business_cases/post_creating/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt (67%) rename business_cases/post_creating/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt (71%) rename business_cases/post_creating/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/business_cases/post_creating/server/PostCreatingCase.kt (54%) rename business_cases/post_creating/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/business_cases/post_creating/server/Routings.kt (57%) rename business_cases/post_creating/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt (81%) delete mode 100644 core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/PostsRepo.kt rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/DateTimeUtils.kt (76%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/IdUtils.kt (50%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/content/Content.kt (85%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/content/api/ContentRepo.kt (50%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/content/api/ReadContentRepo.kt (68%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/content/api/WriteContentRepo.kt (72%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/post/BusinessPublishablePostsRepo.kt (81%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/post/Post.kt (76%) create mode 100644 core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/PostsRepo.kt rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/post/repo/ReadPostsRepo.kt (79%) rename core/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/post/repo/WritePostsRepo.kt (72%) rename core/api/src/commonTest/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/api/ContentSerialization.kt (86%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/ExposedContentRepo.kt (94%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/ExposedPostsRepo.kt (95%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/content/BinaryContentHolderRepo.kt (90%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/content/ContentHolderRepo.kt (50%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/content/SpecialContentHolderRepo.kt (88%) rename core/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/content/TextContentHolderRepo.kt (87%) rename core/exposed/src/test/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/ExposedContentAPICommonTests.kt (94%) rename core/exposed/src/test/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt (94%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt (77%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt (78%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt (82%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt (77%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt (82%) rename core/ktor/client/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt (87%) delete mode 100644 core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/UpdatePostObject.kt rename core/ktor/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/ContentRoutes.kt (89%) rename core/ktor/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/PostRoutes.kt (92%) rename core/ktor/common/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/Serializers.kt (62%) create mode 100644 core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/UpdatePostObject.kt rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt (73%) rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt (80%) rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt (84%) rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt (73%) rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt (80%) rename core/ktor/server/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt (87%) delete mode 100644 publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PostKeyGenerator.kt create mode 100644 publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PostKeyGenerator.kt rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/PublishingKeyReceiver.kt (64%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/PublishingRegistrar.kt (88%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/PublishingService.kt (54%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/PublishingTrigger.kt (78%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/Trigger.kt (56%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/repos/PublishedPostsRepo.kt (78%) rename publishing/api/src/commonMain/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/repos/PublishingKeysRepo.kt (73%) rename publishing/exposed/src/main/kotlin/{com/insanusmokrassar => dev/inmo}/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt (86%) delete mode 100644 publishing/ktor/client/publish.gradle diff --git a/business_cases/post_creating/client/build.gradle b/business_cases/post_creating/client/build.gradle index 4d1dbc5b..86824bcb 100644 --- a/business_cases/post_creating/client/build.gradle +++ b/business_cases/post_creating/client/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" repositories { mavenLocal() diff --git a/business_cases/post_creating/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt b/business_cases/post_creating/client/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt similarity index 67% rename from business_cases/post_creating/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt rename to business_cases/post_creating/client/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt index fea320c9..4e3f2d4c 100644 --- a/business_cases/post_creating/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt +++ b/business_cases/post_creating/client/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/client/PostCreatingClientCase.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.business_cases.post_creating.client +package dev.inmo.postssystem.business_cases.post_creating.client -import com.insanusmokrassar.postssystem.business_cases.post_creating.server.* -import com.insanusmokrassar.postssystem.core.content.Content -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.publishing.TriggerId +import dev.inmo.postssystem.business_cases.post_creating.server.* +import dev.inmo.postssystem.core.content.Content +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.publishing.TriggerId import dev.inmo.micro_utils.ktor.client.BodyPair import dev.inmo.micro_utils.ktor.client.unipost import dev.inmo.micro_utils.ktor.common.buildStandardUrl diff --git a/business_cases/post_creating/common/build.gradle b/business_cases/post_creating/common/build.gradle index 6ae8ff13..7e2e2384 100644 --- a/business_cases/post_creating/common/build.gradle +++ b/business_cases/post_creating/common/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" repositories { mavenLocal() diff --git a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt similarity index 71% rename from business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt rename to business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt index 93150188..b201645f 100644 --- a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt +++ b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/BusinessPostCreatingCase.kt @@ -1,11 +1,11 @@ -package com.insanusmokrassar.postssystem.business_cases.post_creating.server +package dev.inmo.postssystem.business_cases.post_creating.server import com.benasher44.uuid.uuid4 -import com.insanusmokrassar.postssystem.core.content.Content -import com.insanusmokrassar.postssystem.core.content.api.ContentRepo -import com.insanusmokrassar.postssystem.core.post.* -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo -import com.insanusmokrassar.postssystem.core.publishing.* +import dev.inmo.postssystem.core.content.Content +import dev.inmo.postssystem.core.content.api.ContentRepo +import dev.inmo.postssystem.core.post.* +import dev.inmo.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.publishing.* class BusinessPostCreatingCase( private val postsRepo: PostsRepo, diff --git a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingCase.kt b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingCase.kt similarity index 54% rename from business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingCase.kt rename to business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingCase.kt index 123008da..2d2a231b 100644 --- a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingCase.kt +++ b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingCase.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.business_cases.post_creating.server +package dev.inmo.postssystem.business_cases.post_creating.server -import com.insanusmokrassar.postssystem.core.content.Content -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.publishing.TriggerId +import dev.inmo.postssystem.core.content.Content +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.publishing.TriggerId import kotlinx.serialization.Serializable @Serializable diff --git a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/Routings.kt b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/Routings.kt similarity index 57% rename from business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/Routings.kt rename to business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/Routings.kt index 4b7ded31..f8831f72 100644 --- a/business_cases/post_creating/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/Routings.kt +++ b/business_cases/post_creating/common/src/commonMain/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/Routings.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.business_cases.post_creating.server +package dev.inmo.postssystem.business_cases.post_creating.server const val postCreatingRootRoute = "postCreating" diff --git a/business_cases/post_creating/server/build.gradle b/business_cases/post_creating/server/build.gradle index 1d99462f..5cf1046d 100644 --- a/business_cases/post_creating/server/build.gradle +++ b/business_cases/post_creating/server/build.gradle @@ -16,7 +16,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply plugin: "java-library" apply plugin: "kotlin" diff --git a/business_cases/post_creating/server/src/main/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt b/business_cases/post_creating/server/src/main/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt similarity index 81% rename from business_cases/post_creating/server/src/main/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt rename to business_cases/post_creating/server/src/main/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt index fa9d2af6..923f168b 100644 --- a/business_cases/post_creating/server/src/main/kotlin/com/insanusmokrassar/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt +++ b/business_cases/post_creating/server/src/main/kotlin/dev/inmo/postssystem/business_cases/post_creating/server/PostCreatingRoutingCase.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.business_cases.post_creating.server +package dev.inmo.postssystem.business_cases.post_creating.server -import com.insanusmokrassar.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.post.RegisteredPost import dev.inmo.micro_utils.ktor.server.unianswer import dev.inmo.micro_utils.ktor.server.uniload import io.ktor.application.call diff --git a/core/api/build.gradle b/core/api/build.gradle index b5053a30..8d4483b4 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply from: "publish.gradle" diff --git a/core/api/publish.gradle b/core/api/publish.gradle index 5863597d..11b9082d 100644 --- a/core/api/publish.gradle +++ b/core/api/publish.gradle @@ -27,11 +27,11 @@ publishing { pom { description = "Core library for PostsSystem" name = "PostsSystem Core" - url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore" + url = "https://git.inmo.dev/PostsSystem/PostsSystemCore" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git[push=]https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git" - url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/PostsSystemCore.git[push=]https://git.inmo.dev/PostsSystem/PostsSystemCore.git" + url = "https://git.inmo.dev/PostsSystem/PostsSystemCore.git" } developers { @@ -55,7 +55,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/PostsSystemCore/src/master/LICENSE" } } diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/PostsRepo.kt b/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/PostsRepo.kt deleted file mode 100644 index 9d663574..00000000 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/PostsRepo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.insanusmokrassar.postssystem.core.post.repo - -interface PostsRepo : ReadPostsRepo, WritePostsRepo diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/DateTimeUtils.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/DateTimeUtils.kt similarity index 76% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/DateTimeUtils.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/DateTimeUtils.kt index 101a53ce..b91f03e6 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/DateTimeUtils.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/DateTimeUtils.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.core +package dev.inmo.postssystem.core import com.soywiz.klock.DateTime diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/IdUtils.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/IdUtils.kt similarity index 50% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/IdUtils.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/IdUtils.kt index dc4445a1..6d6e4607 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/IdUtils.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/IdUtils.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core +package dev.inmo.postssystem.core import com.benasher44.uuid.uuid4 -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.post.PostId +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.post.PostId fun generateId() = uuid4().toString() fun generatePostId(): PostId = generateId() diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/Content.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/Content.kt similarity index 85% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/Content.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/Content.kt index e21d2b06..68a0bdde 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/Content.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/Content.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.core.content +package dev.inmo.postssystem.core.content import dev.inmo.micro_utils.common.ByteArrayAllocator import dev.inmo.micro_utils.common.ByteArrayAllocatorSerializer @@ -41,8 +41,8 @@ val BinaryContent.isImage: Boolean /** * Content which is already registered in database. Using its [id] you can retrieve all known - * [com.insanusmokrassar.postssystem.core.post.RegisteredPost]s by using - * [com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo.getPostsByContent] + * [dev.inmo.postssystem.core.post.RegisteredPost]s by using + * [dev.inmo.postssystem.core.post.repo.ReadPostsRepo.getPostsByContent] */ @Serializable data class RegisteredContent( diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ContentRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ContentRepo.kt similarity index 50% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ContentRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ContentRepo.kt index 0273095a..fe2a6863 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ContentRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ContentRepo.kt @@ -1,3 +1,3 @@ -package com.insanusmokrassar.postssystem.core.content.api +package dev.inmo.postssystem.core.content.api interface ContentRepo : ReadContentRepo, WriteContentRepo diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ReadContentRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ReadContentRepo.kt similarity index 68% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ReadContentRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ReadContentRepo.kt index 24934542..1fc6e7e6 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/ReadContentRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/ReadContentRepo.kt @@ -1,12 +1,12 @@ -package com.insanusmokrassar.postssystem.core.content.api +package dev.inmo.postssystem.core.content.api -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.RegisteredContent +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.RegisteredContent import dev.inmo.micro_utils.pagination.Pagination import dev.inmo.micro_utils.pagination.PaginationResult /** - * Simple read API by different properties of [com.insanusmokrassar.postssystem.core.content.Content]. + * Simple read API by different properties of [dev.inmo.postssystem.core.content.Content]. */ interface ReadContentRepo { /** diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/WriteContentRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/WriteContentRepo.kt similarity index 72% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/WriteContentRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/WriteContentRepo.kt index 7557bbae..5fb9d19a 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/content/api/WriteContentRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/content/api/WriteContentRepo.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.content.api +package dev.inmo.postssystem.core.content.api -import com.insanusmokrassar.postssystem.core.content.* +import dev.inmo.postssystem.core.content.* import kotlinx.coroutines.flow.Flow interface WriteContentRepo { diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/BusinessPublishablePostsRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/BusinessPublishablePostsRepo.kt similarity index 81% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/BusinessPublishablePostsRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/BusinessPublishablePostsRepo.kt index 9d6d2073..c8ff909b 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/BusinessPublishablePostsRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/BusinessPublishablePostsRepo.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.post +package dev.inmo.postssystem.core.post -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.post.repo.PostsRepo class BusinessPublishablePostsRepo( /** diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/Post.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/Post.kt similarity index 76% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/Post.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/Post.kt index 3f9c16b8..aaf7187a 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/Post.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/Post.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.post +package dev.inmo.postssystem.core.post -import com.insanusmokrassar.postssystem.core.UnixMillis -import com.insanusmokrassar.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.UnixMillis +import dev.inmo.postssystem.core.content.ContentId import com.soywiz.klock.DateTime import kotlinx.serialization.Serializable import kotlinx.serialization.Transient @@ -18,8 +18,8 @@ sealed class Post { } /** - * Root entity of the whole system. Can be retrieved from [com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo] - * by getting and created in [com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo] by inserting of [Post] + * Root entity of the whole system. Can be retrieved from [dev.inmo.postssystem.core.post.repo.ReadPostsRepo] + * by getting and created in [dev.inmo.postssystem.core.post.repo.WritePostsRepo] by inserting of [Post] * instance */ @Serializable diff --git a/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/PostsRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/PostsRepo.kt new file mode 100644 index 00000000..1cd2494a --- /dev/null +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/PostsRepo.kt @@ -0,0 +1,3 @@ +package dev.inmo.postssystem.core.post.repo + +interface PostsRepo : ReadPostsRepo, WritePostsRepo diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/ReadPostsRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/ReadPostsRepo.kt similarity index 79% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/ReadPostsRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/ReadPostsRepo.kt index 42e67a52..60ab64dc 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/ReadPostsRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/ReadPostsRepo.kt @@ -1,10 +1,10 @@ -package com.insanusmokrassar.postssystem.core.post.repo +package dev.inmo.postssystem.core.post.repo -import com.insanusmokrassar.postssystem.core.MAX_DATE -import com.insanusmokrassar.postssystem.core.MIN_DATE -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.MAX_DATE +import dev.inmo.postssystem.core.MIN_DATE +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost import com.soywiz.klock.DateTime import dev.inmo.micro_utils.pagination.* diff --git a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/WritePostsRepo.kt b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/WritePostsRepo.kt similarity index 72% rename from core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/WritePostsRepo.kt rename to core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/WritePostsRepo.kt index 6139694f..4d2b5160 100644 --- a/core/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/post/repo/WritePostsRepo.kt +++ b/core/api/src/commonMain/kotlin/dev/inmo/postssystem/core/post/repo/WritePostsRepo.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.post.repo +package dev.inmo.postssystem.core.post.repo -import com.insanusmokrassar.postssystem.core.post.* +import dev.inmo.postssystem.core.post.* import kotlinx.coroutines.flow.Flow interface WritePostsRepo { @@ -9,7 +9,7 @@ interface WritePostsRepo { val postUpdatedFlow: Flow /** - * For creating of post you need to create all its [com.insanusmokrassar.postssystem.core.content.RegisteredContent] + * For creating of post you need to create all its [dev.inmo.postssystem.core.content.RegisteredContent] * and (or just) retrieve their [ContentIds] and put it into some [Post] implementation line [SimplePost]. * * This method SHOULD use [PostId] of [RegisteredPost.id] in case if [RegisteredPost] passed diff --git a/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt b/core/api/src/commonTest/kotlin/dev/inmo/postssystem/core/api/ContentSerialization.kt similarity index 86% rename from core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt rename to core/api/src/commonTest/kotlin/dev/inmo/postssystem/core/api/ContentSerialization.kt index 31617964..542a1dde 100644 --- a/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt +++ b/core/api/src/commonTest/kotlin/dev/inmo/postssystem/core/api/ContentSerialization.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.api +package dev.inmo.postssystem.core.api -import com.insanusmokrassar.postssystem.core.content.* -import com.insanusmokrassar.postssystem.core.generateContentId +import dev.inmo.postssystem.core.content.* +import dev.inmo.postssystem.core.generateContentId import kotlinx.serialization.json.Json import kotlin.test.Test import kotlin.test.assertEquals diff --git a/core/exposed/build.gradle b/core/exposed/build.gradle index d5b6c6a8..674572e3 100644 --- a/core/exposed/build.gradle +++ b/core/exposed/build.gradle @@ -16,7 +16,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply plugin: "java-library" apply plugin: "kotlin" diff --git a/core/exposed/publish.gradle b/core/exposed/publish.gradle index 433d3cc7..ac0a901a 100644 --- a/core/exposed/publish.gradle +++ b/core/exposed/publish.gradle @@ -23,11 +23,11 @@ publishing { description = "Exposed realisation for PostsSystem Core" name = "PostsSystem Core Exposed realization" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/" + url = "https://git.inmo.dev/PostsSystem/Core/" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" + url = "https://git.inmo.dev/PostsSystem/Core/.git" } developers { @@ -44,7 +44,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" } } diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentRepo.kt similarity index 94% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentRepo.kt index 97165dd1..5aa6e1fc 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentRepo.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.exposed +package dev.inmo.postssystem.core.exposed -import com.insanusmokrassar.postssystem.core.content.* -import com.insanusmokrassar.postssystem.core.content.api.ContentRepo -import com.insanusmokrassar.postssystem.core.exposed.content.* -import com.insanusmokrassar.postssystem.core.generateContentId +import dev.inmo.postssystem.core.content.* +import dev.inmo.postssystem.core.content.api.ContentRepo +import dev.inmo.postssystem.core.exposed.content.* +import dev.inmo.postssystem.core.generateContentId import dev.inmo.micro_utils.pagination.* import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepo.kt similarity index 95% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepo.kt index f81c4e63..b01d3020 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepo.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.exposed +package dev.inmo.postssystem.core.exposed -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.generatePostId -import com.insanusmokrassar.postssystem.core.post.* -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.generatePostId +import dev.inmo.postssystem.core.post.* +import dev.inmo.postssystem.core.post.repo.PostsRepo import com.soywiz.klock.* import dev.inmo.micro_utils.pagination.* import kotlinx.coroutines.channels.BroadcastChannel diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/BinaryContentHolderRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/BinaryContentHolderRepo.kt similarity index 90% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/BinaryContentHolderRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/BinaryContentHolderRepo.kt index 054cda22..209b528b 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/BinaryContentHolderRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/BinaryContentHolderRepo.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.exposed.content +package dev.inmo.postssystem.core.exposed.content -import com.insanusmokrassar.postssystem.core.content.BinaryContent -import com.insanusmokrassar.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.BinaryContent +import dev.inmo.postssystem.core.content.ContentId import dev.inmo.micro_utils.mime_types.mimeType import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.statements.api.ExposedBlob diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/ContentHolderRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/ContentHolderRepo.kt similarity index 50% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/ContentHolderRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/ContentHolderRepo.kt index 2e406c48..571724fc 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/ContentHolderRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/ContentHolderRepo.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.exposed.content +package dev.inmo.postssystem.core.exposed.content -import com.insanusmokrassar.postssystem.core.content.Content -import com.insanusmokrassar.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.Content +import dev.inmo.postssystem.core.content.ContentId interface ContentHolderRepo { suspend fun getContent(id: ContentId) : T? diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/SpecialContentHolderRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/SpecialContentHolderRepo.kt similarity index 88% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/SpecialContentHolderRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/SpecialContentHolderRepo.kt index 14f89040..c1518c58 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/SpecialContentHolderRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/SpecialContentHolderRepo.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.exposed.content +package dev.inmo.postssystem.core.exposed.content -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.SpecialContent +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.SpecialContent import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction diff --git a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/TextContentHolderRepo.kt b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/TextContentHolderRepo.kt similarity index 87% rename from core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/TextContentHolderRepo.kt rename to core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/TextContentHolderRepo.kt index c0e18123..ee70feba 100644 --- a/core/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/exposed/content/TextContentHolderRepo.kt +++ b/core/exposed/src/main/kotlin/dev/inmo/postssystem/core/exposed/content/TextContentHolderRepo.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.exposed.content +package dev.inmo.postssystem.core.exposed.content -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.TextContent +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.TextContent import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction diff --git a/core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentAPICommonTests.kt b/core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentAPICommonTests.kt similarity index 94% rename from core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentAPICommonTests.kt rename to core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentAPICommonTests.kt index fc55964d..116cbde6 100644 --- a/core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedContentAPICommonTests.kt +++ b/core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedContentAPICommonTests.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.exposed +package dev.inmo.postssystem.core.exposed -import com.insanusmokrassar.postssystem.core.content.TextContent +import dev.inmo.postssystem.core.content.TextContent import kotlinx.coroutines.runBlocking import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.transactions.transactionManager diff --git a/core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt b/core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt similarity index 94% rename from core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt rename to core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt index 4765e576..bf21d4a6 100644 --- a/core/exposed/src/test/kotlin/com/insanusmokrassar/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt +++ b/core/exposed/src/test/kotlin/dev/inmo/postssystem/core/exposed/ExposedPostsRepoCommonTests.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.exposed +package dev.inmo.postssystem.core.exposed -import com.insanusmokrassar.postssystem.core.post.SimplePost +import dev.inmo.postssystem.core.post.SimplePost import kotlinx.coroutines.runBlocking import org.jetbrains.exposed.sql.Database import org.jetbrains.exposed.sql.transactions.transactionManager diff --git a/core/ktor/client/build.gradle b/core/ktor/client/build.gradle index d8607229..d67565b8 100644 --- a/core/ktor/client/build.gradle +++ b/core/ktor/client/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply from: "publish.gradle" diff --git a/core/ktor/client/publish.gradle b/core/ktor/client/publish.gradle index 4d4ad979..c8fb12bc 100644 --- a/core/ktor/client/publish.gradle +++ b/core/ktor/client/publish.gradle @@ -27,11 +27,11 @@ publishing { pom { description = "Exposed realisation for PostsSystem Core" name = "PostsSystem Core Exposed realization" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/" + url = "https://git.inmo.dev/PostsSystem/Core/" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" + url = "https://git.inmo.dev/PostsSystem/Core/.git" } developers { @@ -48,7 +48,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" } } diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt similarity index 77% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt index f1498a92..0ffbda90 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ContentRepoKtorClient.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.content +package dev.inmo.postssystem.core.ktor.client.content -import com.insanusmokrassar.postssystem.core.content.api.* -import com.insanusmokrassar.postssystem.core.ktor.contentRootRoute +import dev.inmo.postssystem.core.content.api.* +import dev.inmo.postssystem.core.ktor.contentRootRoute import io.ktor.client.HttpClient import io.ktor.client.features.websocket.WebSockets diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt similarity index 78% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt index e2a603b9..cfa99329 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.content +package dev.inmo.postssystem.core.ktor.client.content -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.RegisteredContent -import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo -import com.insanusmokrassar.postssystem.core.ktor.* +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.RegisteredContent +import dev.inmo.postssystem.core.content.api.ReadContentRepo +import dev.inmo.postssystem.core.ktor.* import dev.inmo.micro_utils.ktor.client.uniget import dev.inmo.micro_utils.ktor.common.includeQueryParams import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt similarity index 82% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt index a6516b58..6e3b3f23 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.content +package dev.inmo.postssystem.core.ktor.client.content -import com.insanusmokrassar.postssystem.core.content.* -import com.insanusmokrassar.postssystem.core.content.api.WriteContentRepo -import com.insanusmokrassar.postssystem.core.ktor.* +import dev.inmo.postssystem.core.content.* +import dev.inmo.postssystem.core.content.api.WriteContentRepo +import dev.inmo.postssystem.core.ktor.* import dev.inmo.micro_utils.ktor.client.* import io.ktor.client.HttpClient import kotlinx.coroutines.flow.Flow diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt similarity index 77% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt index 924607e9..5089d3e0 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/PostsRepoKtorClient.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.post +package dev.inmo.postssystem.core.ktor.client.post -import com.insanusmokrassar.postssystem.core.ktor.postsRootRoute -import com.insanusmokrassar.postssystem.core.post.repo.* +import dev.inmo.postssystem.core.ktor.postsRootRoute +import dev.inmo.postssystem.core.post.repo.* import io.ktor.client.HttpClient import io.ktor.client.features.websocket.WebSockets 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/dev/inmo/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt similarity index 82% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt index f7b3268b..41545012 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt @@ -1,10 +1,10 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.post +package dev.inmo.postssystem.core.ktor.client.post -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.ktor.* -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.ktor.* +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.post.repo.ReadPostsRepo import com.soywiz.klock.DateTime import dev.inmo.micro_utils.ktor.client.uniget import dev.inmo.micro_utils.ktor.common.asFromToUrlPart diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt similarity index 87% rename from core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt rename to core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt index 09401258..90d11551 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.ktor.client.post +package dev.inmo.postssystem.core.ktor.client.post -import com.insanusmokrassar.postssystem.core.ktor.* -import com.insanusmokrassar.postssystem.core.post.* -import com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo +import dev.inmo.postssystem.core.ktor.* +import dev.inmo.postssystem.core.post.* +import dev.inmo.postssystem.core.post.repo.WritePostsRepo import dev.inmo.micro_utils.ktor.client.* import io.ktor.client.HttpClient import io.ktor.client.features.websocket.WebSockets diff --git a/core/ktor/common/build.gradle b/core/ktor/common/build.gradle index 664b3484..bf181a79 100644 --- a/core/ktor/common/build.gradle +++ b/core/ktor/common/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply from: "publish.gradle" diff --git a/core/ktor/common/publish.gradle b/core/ktor/common/publish.gradle index 4d4ad979..c8fb12bc 100644 --- a/core/ktor/common/publish.gradle +++ b/core/ktor/common/publish.gradle @@ -27,11 +27,11 @@ publishing { pom { description = "Exposed realisation for PostsSystem Core" name = "PostsSystem Core Exposed realization" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/" + url = "https://git.inmo.dev/PostsSystem/Core/" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" + url = "https://git.inmo.dev/PostsSystem/Core/.git" } developers { @@ -48,7 +48,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" } } diff --git a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/UpdatePostObject.kt b/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/UpdatePostObject.kt deleted file mode 100644 index ec15276c..00000000 --- a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/UpdatePostObject.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.insanusmokrassar.postssystem.core.ktor - -import com.insanusmokrassar.postssystem.core.post.Post -import com.insanusmokrassar.postssystem.core.post.PostId -import kotlinx.serialization.Serializable - -@Serializable -data class UpdatePostObject( - val postId: PostId, - val post: Post -) diff --git a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/ContentRoutes.kt b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/ContentRoutes.kt similarity index 89% rename from core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/ContentRoutes.kt rename to core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/ContentRoutes.kt index 84c7452e..6e5a18f2 100644 --- a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/ContentRoutes.kt +++ b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/ContentRoutes.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.core.ktor +package dev.inmo.postssystem.core.ktor const val contentRootRoute = "content" diff --git a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/PostRoutes.kt b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/PostRoutes.kt similarity index 92% rename from core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/PostRoutes.kt rename to core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/PostRoutes.kt index 2e3f6c64..16c6262b 100644 --- a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/PostRoutes.kt +++ b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/PostRoutes.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.core.ktor +package dev.inmo.postssystem.core.ktor const val postsRootRoute = "post" diff --git a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/Serializers.kt b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/Serializers.kt similarity index 62% rename from core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/Serializers.kt rename to core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/Serializers.kt index 007dc9f8..0b9daab9 100644 --- a/core/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/Serializers.kt +++ b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/Serializers.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.ktor +package dev.inmo.postssystem.core.ktor -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.RegisteredContent -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.RegisteredContent +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost import dev.inmo.micro_utils.pagination.PaginationResult import kotlinx.serialization.builtins.* diff --git a/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/UpdatePostObject.kt b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/UpdatePostObject.kt new file mode 100644 index 00000000..6e1137b3 --- /dev/null +++ b/core/ktor/common/src/commonMain/kotlin/dev/inmo/postssystem/core/ktor/UpdatePostObject.kt @@ -0,0 +1,11 @@ +package dev.inmo.postssystem.core.ktor + +import dev.inmo.postssystem.core.post.Post +import dev.inmo.postssystem.core.post.PostId +import kotlinx.serialization.Serializable + +@Serializable +data class UpdatePostObject( + val postId: PostId, + val post: Post +) diff --git a/core/ktor/server/build.gradle b/core/ktor/server/build.gradle index cd2c4371..0ffb4bc7 100644 --- a/core/ktor/server/build.gradle +++ b/core/ktor/server/build.gradle @@ -16,7 +16,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply plugin: "java-library" apply plugin: "kotlin" diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt similarity index 73% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt index 0e7e7409..58be96d8 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ContentRepoRoutingConfigurator.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.content +package dev.inmo.postssystem.core.ktor.server.content -import com.insanusmokrassar.postssystem.core.content.api.ContentRepo -import com.insanusmokrassar.postssystem.core.ktor.contentRootRoute +import dev.inmo.postssystem.core.content.api.ContentRepo +import dev.inmo.postssystem.core.ktor.contentRootRoute import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import io.ktor.routing.Route import io.ktor.routing.route diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt similarity index 80% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt index 37585954..2af37c13 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/ReadContentRepoRoutingConfigurator.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.content +package dev.inmo.postssystem.core.ktor.server.content -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.content.RegisteredContent -import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo -import com.insanusmokrassar.postssystem.core.ktor.* +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.content.RegisteredContent +import dev.inmo.postssystem.core.content.api.ReadContentRepo +import dev.inmo.postssystem.core.ktor.* import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import dev.inmo.micro_utils.ktor.server.getParameterOrSendError import dev.inmo.micro_utils.ktor.server.unianswer 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/dev/inmo/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt similarity index 84% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt index 32412376..c0150316 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.content +package dev.inmo.postssystem.core.ktor.server.content -import com.insanusmokrassar.postssystem.core.content.* -import com.insanusmokrassar.postssystem.core.content.api.WriteContentRepo -import com.insanusmokrassar.postssystem.core.ktor.* +import dev.inmo.postssystem.core.content.* +import dev.inmo.postssystem.core.content.api.WriteContentRepo +import dev.inmo.postssystem.core.ktor.* import dev.inmo.micro_utils.ktor.server.* import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import io.ktor.application.call diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt similarity index 73% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt index 8b238505..7c33bfe6 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/PostsRepoRoutingConfigurator.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.post +package dev.inmo.postssystem.core.ktor.server.post -import com.insanusmokrassar.postssystem.core.ktor.postsRootRoute -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.ktor.postsRootRoute +import dev.inmo.postssystem.core.post.repo.PostsRepo import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import io.ktor.routing.Route import io.ktor.routing.route diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt similarity index 80% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt index 508c553c..fe1e9166 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/ReadPostsRepoRoutingConfigurator.kt @@ -1,12 +1,12 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.post +package dev.inmo.postssystem.core.ktor.server.post -import com.insanusmokrassar.postssystem.core.MAX_DATE -import com.insanusmokrassar.postssystem.core.MIN_DATE -import com.insanusmokrassar.postssystem.core.content.ContentId -import com.insanusmokrassar.postssystem.core.ktor.* -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo +import dev.inmo.postssystem.core.MAX_DATE +import dev.inmo.postssystem.core.MIN_DATE +import dev.inmo.postssystem.core.content.ContentId +import dev.inmo.postssystem.core.ktor.* +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.post.repo.ReadPostsRepo import dev.inmo.micro_utils.ktor.server.* import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import dev.inmo.micro_utils.pagination.extractPagination 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/dev/inmo/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt similarity index 87% rename from core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt rename to core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt index 97cf3975..2fc36917 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/dev/inmo/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.ktor.server.post +package dev.inmo.postssystem.core.ktor.server.post -import com.insanusmokrassar.postssystem.core.ktor.* -import com.insanusmokrassar.postssystem.core.post.* -import com.insanusmokrassar.postssystem.core.post.repo.WritePostsRepo +import dev.inmo.postssystem.core.ktor.* +import dev.inmo.postssystem.core.post.* +import dev.inmo.postssystem.core.post.repo.WritePostsRepo import dev.inmo.micro_utils.ktor.server.* import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import io.ktor.application.call diff --git a/gradle.properties b/gradle.properties index 54793dbd..938b3c76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,4 @@ microutils_version=0.4.5 javax_activation_version=1.1.1 core_version=0.6.0 +group_name=dev.inmo diff --git a/publishing/api/build.gradle b/publishing/api/build.gradle index fc7debba..b62209b2 100644 --- a/publishing/api/build.gradle +++ b/publishing/api/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply from: "./publish.gradle" diff --git a/publishing/api/publish.gradle b/publishing/api/publish.gradle index b7bf27ca..02ea0500 100644 --- a/publishing/api/publish.gradle +++ b/publishing/api/publish.gradle @@ -27,11 +27,11 @@ publishing { pom { description = "Publishing subsystem with necessary functionality related to publish mechanism" name = "PostsSystem Core Publishing subsystem" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/" + url = "https://git.inmo.dev/PostsSystem/Core/" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" + url = "https://git.inmo.dev/PostsSystem/Core/.git" } developers { @@ -48,7 +48,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" } } diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PostKeyGenerator.kt b/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PostKeyGenerator.kt deleted file mode 100644 index 9d342bf4..00000000 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PostKeyGenerator.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.insanusmokrassar.postssystem.core.publishing - -import com.insanusmokrassar.postssystem.core.post.PostId - -typealias PostKeyGenerator = suspend (PostId, TriggerId) -> TriggerControlKey diff --git a/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PostKeyGenerator.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PostKeyGenerator.kt new file mode 100644 index 00000000..f47b3976 --- /dev/null +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PostKeyGenerator.kt @@ -0,0 +1,5 @@ +package dev.inmo.postssystem.core.publishing + +import dev.inmo.postssystem.core.post.PostId + +typealias PostKeyGenerator = suspend (PostId, TriggerId) -> TriggerControlKey diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingKeyReceiver.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingKeyReceiver.kt similarity index 64% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingKeyReceiver.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingKeyReceiver.kt index 12af993f..762d8d0a 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingKeyReceiver.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingKeyReceiver.kt @@ -1,6 +1,6 @@ -package com.insanusmokrassar.postssystem.core.publishing +package dev.inmo.postssystem.core.publishing -import com.insanusmokrassar.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.PostId typealias PublishingKeyReceiverGetter = suspend (TriggerId) -> PublishingKeyReceiver? diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingRegistrar.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingRegistrar.kt similarity index 88% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingRegistrar.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingRegistrar.kt index 6884eee4..f420ea65 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingRegistrar.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingRegistrar.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.publishing +package dev.inmo.postssystem.core.publishing -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.repos.PublishingKeysRepo import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingService.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingService.kt similarity index 54% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingService.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingService.kt index 44440029..bbefd81a 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingService.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingService.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.publishing +package dev.inmo.postssystem.core.publishing -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishedPostsWriteRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo +import dev.inmo.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.publishing.repos.PublishedPostsWriteRepo +import dev.inmo.postssystem.core.publishing.repos.PublishingKeysRepo class PublishingService( private val postsRepo: PostsRepo, diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingTrigger.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingTrigger.kt similarity index 78% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingTrigger.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingTrigger.kt index 217bf2f3..921f978e 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/PublishingTrigger.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/PublishingTrigger.kt @@ -1,10 +1,10 @@ -package com.insanusmokrassar.postssystem.core.publishing +package dev.inmo.postssystem.core.publishing -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishedPostsWriteRepo -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.publishing.repos.PublishedPostsWriteRepo +import dev.inmo.postssystem.core.publishing.repos.PublishingKeysRepo import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/Trigger.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/Trigger.kt similarity index 56% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/Trigger.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/Trigger.kt index 16b8703f..75abceaf 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/Trigger.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/Trigger.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.core.publishing +package dev.inmo.postssystem.core.publishing typealias TriggerId = String diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishedPostsRepo.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishedPostsRepo.kt similarity index 78% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishedPostsRepo.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishedPostsRepo.kt index 293c0d83..a4d51998 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishedPostsRepo.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishedPostsRepo.kt @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.core.publishing.repos +package dev.inmo.postssystem.core.publishing.repos -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.post.RegisteredPost -import com.insanusmokrassar.postssystem.core.post.repo.PostsRepo -import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.post.RegisteredPost +import dev.inmo.postssystem.core.post.repo.PostsRepo +import dev.inmo.postssystem.core.post.repo.ReadPostsRepo import kotlinx.coroutines.flow.Flow interface PublishedPostsReadRepo : ReadPostsRepo diff --git a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishingKeysRepo.kt b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishingKeysRepo.kt similarity index 73% rename from publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishingKeysRepo.kt rename to publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishingKeysRepo.kt index 68d729de..2e1d1f8c 100644 --- a/publishing/api/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/publishing/repos/PublishingKeysRepo.kt +++ b/publishing/api/src/commonMain/kotlin/dev/inmo/postssystem/core/publishing/repos/PublishingKeysRepo.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.core.publishing.repos +package dev.inmo.postssystem.core.publishing.repos -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey interface ReadPublishingKeysRepo { suspend fun getPostIdByTriggerControlKey( diff --git a/publishing/exposed/build.gradle b/publishing/exposed/build.gradle index d3bfb9c3..70a98131 100644 --- a/publishing/exposed/build.gradle +++ b/publishing/exposed/build.gradle @@ -16,7 +16,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply plugin: "java-library" apply plugin: "kotlin" diff --git a/publishing/exposed/publish.gradle b/publishing/exposed/publish.gradle index 0645195d..0e99383d 100644 --- a/publishing/exposed/publish.gradle +++ b/publishing/exposed/publish.gradle @@ -27,11 +27,11 @@ publishing { pom { description = "Exposed realisation for PostsSystem Core Publishing subsystem" name = "PostsSystem Core Publishing Exposed realization" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/" + url = "https://git.inmo.dev/PostsSystem/Core/" scm { - developerConnection = "scm:git:[fetch=]https://git.insanusmokrassar.com/PostsSystem/Core/.git[push=]https://git.insanusmokrassar.com/PostsSystem/Core/.git" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/.git" + developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" + url = "https://git.inmo.dev/PostsSystem/Core/.git" } developers { @@ -48,7 +48,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://git.insanusmokrassar.com/PostsSystem/Core/src/master/LICENSE" + url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" } } diff --git a/publishing/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt b/publishing/exposed/src/main/kotlin/dev/inmo/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt similarity index 86% rename from publishing/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt rename to publishing/exposed/src/main/kotlin/dev/inmo/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt index e028242e..6f800881 100644 --- a/publishing/exposed/src/main/kotlin/com/insanusmokrassar/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt +++ b/publishing/exposed/src/main/kotlin/dev/inmo/postssystem/core/publishing/exposed/ExposedPublishingKeysRepo.kt @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.core.publishing.exposed +package dev.inmo.postssystem.core.publishing.exposed -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.publishing.repos.PublishingKeysRepo import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction diff --git a/publishing/ktor/client/build.gradle b/publishing/ktor/client/build.gradle index af7289fe..ffb9e200 100644 --- a/publishing/ktor/client/build.gradle +++ b/publishing/ktor/client/build.gradle @@ -17,9 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" - -apply from: "publish.gradle" +project.group = "$group_name" repositories { mavenLocal() diff --git a/publishing/ktor/client/publish.gradle b/publishing/ktor/client/publish.gradle deleted file mode 100644 index e69de29b..00000000 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 09757076..62fbfcdb 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,7 +1,7 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.client +package dev.inmo.postssystem.publishing.ktor.client -import com.insanusmokrassar.postssystem.core.publishing.repos.* -import com.insanusmokrassar.postssystem.publishing.ktor.publishingKeysRootRoute +import dev.inmo.postssystem.core.publishing.repos.* +import dev.inmo.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/ReadPublishingKeysRepoKtorClient.kt b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/ReadPublishingKeysRepoKtorClient.kt index 9d9e4ffa..cf252d55 100644 --- a/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/ReadPublishingKeysRepoKtorClient.kt +++ b/publishing/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/client/ReadPublishingKeysRepoKtorClient.kt @@ -1,10 +1,10 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.client +package dev.inmo.postssystem.publishing.ktor.client -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey -import com.insanusmokrassar.postssystem.core.publishing.repos.ReadPublishingKeysRepo -import com.insanusmokrassar.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute -import com.insanusmokrassar.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.publishing.repos.ReadPublishingKeysRepo +import dev.inmo.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute +import dev.inmo.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute import dev.inmo.micro_utils.ktor.client.uniget import dev.inmo.micro_utils.ktor.common.buildStandardUrl import io.ktor.client.HttpClient 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 37fe8ffd..83930ed7 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 @@ -1,9 +1,9 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.client +package dev.inmo.postssystem.publishing.ktor.client -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey -import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo -import com.insanusmokrassar.postssystem.publishing.ktor.* +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.publishing.repos.WritePublishingKeysRepo +import dev.inmo.postssystem.publishing.ktor.* import dev.inmo.micro_utils.ktor.client.BodyPair import dev.inmo.micro_utils.ktor.client.unipost import dev.inmo.micro_utils.ktor.common.buildStandardUrl diff --git a/publishing/ktor/common/build.gradle b/publishing/ktor/common/build.gradle index 463e6b8c..586d49d5 100644 --- a/publishing/ktor/common/build.gradle +++ b/publishing/ktor/common/build.gradle @@ -17,7 +17,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" repositories { mavenLocal() diff --git a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingKeysRoutes.kt b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingKeysRoutes.kt index 91c89a2b..25dd57d4 100644 --- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingKeysRoutes.kt +++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingKeysRoutes.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.publishing.ktor +package dev.inmo.postssystem.publishing.ktor const val publishingKeysRootRoute = "publishingKeys" diff --git a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingRegistrarRoutes.kt b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingRegistrarRoutes.kt index 08e0a560..a81a04c9 100644 --- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingRegistrarRoutes.kt +++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingRegistrarRoutes.kt @@ -1,4 +1,4 @@ -package com.insanusmokrassar.postssystem.publishing.ktor +package dev.inmo.postssystem.publishing.ktor //const val getPostIdByTriggerControlKeyRoute = "getPostIdByTriggerControlKey" const val registerTriggerForPostRoute = "registerTriggerForPost" diff --git a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingTriggerRoutes.kt b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingTriggerRoutes.kt index 1b010fae..20881e68 100644 --- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingTriggerRoutes.kt +++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/PublishingTriggerRoutes.kt @@ -1,3 +1,3 @@ -package com.insanusmokrassar.postssystem.publishing.ktor +package dev.inmo.postssystem.publishing.ktor const val triggerPostingRoute = "triggerPosting" \ No newline at end of file diff --git a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt index 9d0302d7..728f4dd5 100644 --- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt +++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/Serializers.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.publishing.ktor +package dev.inmo.postssystem.publishing.ktor -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey import kotlinx.serialization.builtins.SetSerializer import kotlinx.serialization.builtins.serializer diff --git a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/SetPostTriggerControlKeyObject.kt b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/SetPostTriggerControlKeyObject.kt index edcb0c36..a77e6dc8 100644 --- a/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/SetPostTriggerControlKeyObject.kt +++ b/publishing/ktor/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/SetPostTriggerControlKeyObject.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.publishing.ktor +package dev.inmo.postssystem.publishing.ktor -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey import kotlinx.serialization.Serializable @Serializable diff --git a/publishing/ktor/server/build.gradle b/publishing/ktor/server/build.gradle index 130c9dd4..5d317958 100644 --- a/publishing/ktor/server/build.gradle +++ b/publishing/ktor/server/build.gradle @@ -16,7 +16,7 @@ plugins { } project.version = "$core_version" -project.group = "com.insanusmokrassar" +project.group = "$group_name" apply plugin: "java-library" apply plugin: "kotlin" diff --git a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt index 02fd9b16..356a7e33 100644 --- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt +++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/PublishingKeysRepoRoutingConfigurator.kt @@ -1,7 +1,7 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.server +package dev.inmo.postssystem.publishing.ktor.server -import com.insanusmokrassar.postssystem.core.publishing.repos.PublishingKeysRepo -import com.insanusmokrassar.postssystem.publishing.ktor.publishingKeysRootRoute +import dev.inmo.postssystem.core.publishing.repos.PublishingKeysRepo +import dev.inmo.postssystem.publishing.ktor.publishingKeysRootRoute import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import io.ktor.routing.Route import io.ktor.routing.route diff --git a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt index d4dcc679..1c322edd 100644 --- a/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt +++ b/publishing/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/publishing/ktor/server/ReadPublishingKeysRepoRoutingConfigurator.kt @@ -1,10 +1,10 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.server +package dev.inmo.postssystem.publishing.ktor.server -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.TriggerControlKey -import com.insanusmokrassar.postssystem.core.publishing.repos.ReadPublishingKeysRepo -import com.insanusmokrassar.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute -import com.insanusmokrassar.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.TriggerControlKey +import dev.inmo.postssystem.core.publishing.repos.ReadPublishingKeysRepo +import dev.inmo.postssystem.publishing.ktor.getPostIdByTriggerControlKeyRoute +import dev.inmo.postssystem.publishing.ktor.getTriggerControlKeyByPostIdRoute import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator import dev.inmo.micro_utils.ktor.server.getParameterOrSendError import dev.inmo.micro_utils.ktor.server.unianswer 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 2dd0e4c1..95e60416 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 @@ -1,8 +1,8 @@ -package com.insanusmokrassar.postssystem.publishing.ktor.server +package dev.inmo.postssystem.publishing.ktor.server -import com.insanusmokrassar.postssystem.core.post.PostId -import com.insanusmokrassar.postssystem.core.publishing.repos.WritePublishingKeysRepo -import com.insanusmokrassar.postssystem.publishing.ktor.* +import dev.inmo.postssystem.core.post.PostId +import dev.inmo.postssystem.core.publishing.repos.WritePublishingKeysRepo +import dev.inmo.postssystem.publishing.ktor.* import dev.inmo.micro_utils.ktor.server.unianswer import dev.inmo.micro_utils.ktor.server.uniload import io.ktor.application.call