add information about content client provider to readme

server/src/main/java/dev/inmo/postssystem/server/Config.kt

@@ -1,6 +1,6 @@
 package dev.inmo.postssystem.server
 
-import dev.inmo.postssystem.features.common.server.sessions.ModuleLoader
+import dev.inmo.postssystem.features.common.server.sessions.ServerModuleLoader
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.io.File
@@ -25,7 +25,7 @@ data class Config(
     val modules by lazy {
         modulesClassPaths.mapNotNull { moduleClassPath ->
             runCatching {
-                Class.forName(moduleClassPath).constructors.firstOrNull { it.parameterCount == 0 } ?.newInstance() as ModuleLoader
+                Class.forName(moduleClassPath).constructors.firstOrNull { it.parameterCount == 0 } ?.newInstance() as ServerModuleLoader
             }.onFailure {
                 println("Unable to load $moduleClassPath")
                 it.printStackTrace()

server/src/main/java/dev/inmo/postssystem/server/DI.kt

@@ -25,19 +25,13 @@ import dev.inmo.micro_utils.ktor.server.createKtorServer
 import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.onetomany.ExposedOneToManyKeyValueRepo
 import dev.inmo.postssystem.features.common.common.*
-import dev.inmo.postssystem.features.content.binary.server.BinaryServerContentStorage
+import dev.inmo.postssystem.features.common.server.sessions.Qualifiers
 import dev.inmo.postssystem.features.content.common.*
 import dev.inmo.postssystem.features.content.server.ServerContentStorageAggregator
-import dev.inmo.postssystem.features.content.server.ServerContentStorageWrapper
 import dev.inmo.postssystem.features.content.server.storage.*
-import dev.inmo.postssystem.features.content.text.common.TextContent
-import dev.inmo.postssystem.features.content.text.common.TextContentSerializerModuleConfigurator
-import dev.inmo.postssystem.features.content.text.server.TextServerContentStorage
 import dev.inmo.postssystem.features.posts.server.*
 import dev.inmo.postssystem.features.publication.server.PublicationManager
-import dev.inmo.postssystem.features.publication.server.PublicationTarget
 import dev.inmo.postssystem.services.posts.server.*
-import dev.inmo.postssystem.targets.telegram.publication.server.PublicationTargetTelegram
 import io.ktor.application.featureOrNull
 import io.ktor.application.log
 import io.ktor.routing.Route
@@ -56,7 +50,6 @@ import org.koin.core.module.Module
 import org.koin.core.parameter.ParametersHolder
 import org.koin.core.qualifier.StringQualifier
 import org.koin.dsl.*
-import org.w3c.dom.Text
 import java.io.File
 
 private fun Route.print() {
@@ -77,18 +70,8 @@ fun getDIModule(
     val configJsonElement = configJson.decodeFromString(JsonObject.serializer(), File(args.first()).readText())
     val config = configJson.decodeFromJsonElement(Config.serializer(), configJsonElement)
 
-    val originalFilesMetasKeyValueRepoQualifier = StringQualifier("OriginalFilesMetaKV")
-    val binaryOriginalFilesMetasKeyValueRepoQualifier = StringQualifier("BinaryOriginalFilesMetaKV")
-    val commonFilesMetasKeyValueRepoQualifier = StringQualifier("CommonFilesMetaKV")
-    val binaryFilesMetasKeyValueRepoQualifier = StringQualifier("BinaryFilesMetaKV")
-    val filesFolderQualifier = StringQualifier("rootFilesFolder")
-    val commonFilesFolderQualifier = StringQualifier("commonFilesFolder")
-    val binaryFilesFolderQualifier = StringQualifier("binaryFilesFolder")
-    val usersRolesKeyValueFactoryQualifier = StringQualifier("usersRolesKeyValueFactory")
-
     return module {
         singleWithRandomQualifier<ContentSerializersModuleConfigurator.Element> { OtherContentSerializerModuleConfigurator }
-        singleWithRandomQualifier<ContentSerializersModuleConfigurator.Element> { TextContentSerializerModuleConfigurator }
         singleWithRandomQualifier<SerializersModuleConfigurator.Element> { ContentSerializersModuleConfigurator(getAll()) }
         single { SerializersModuleConfigurator(getAll()) }
 
@@ -110,34 +93,34 @@ fun getDIModule(
         singleWithBinds { config }
         singleWithBinds { get<Config>().databaseConfig }
         singleWithBinds { get<Config>().authConfig }
-        singleWithBinds(filesFolderQualifier) { get<Config>().filesFolderFile }
-        singleWithBinds(commonFilesFolderQualifier) { get<Config>().commonFilesFolder }
-        singleWithBinds(binaryFilesFolderQualifier) { get<Config>().binaryFilesFolder }
+        singleWithBinds(Qualifiers.filesFolderQualifier) { get<Config>().filesFolderFile }
+        singleWithBinds(Qualifiers.commonFilesFolderQualifier) { get<Config>().commonFilesFolder }
+        singleWithBinds(Qualifiers.binaryFilesFolderQualifier) { get<Config>().binaryFilesFolder }
 
         singleWithBinds { get<DatabaseConfig>().database }
-        singleWithBinds(originalFilesMetasKeyValueRepoQualifier) {
+        singleWithBinds(Qualifiers.originalFilesMetasKeyValueRepoQualifier) {
             ExposedKeyValueRepo(get(), { text("fileid") }, { text("metaInfo") }, "FileIdsToMetas")
         }
-        singleWithBinds(binaryOriginalFilesMetasKeyValueRepoQualifier) {
+        singleWithBinds(Qualifiers.binaryOriginalFilesMetasKeyValueRepoQualifier) {
             ExposedKeyValueRepo(get(), { text("fileid") }, { text("metaInfo") }, "BinaryContentFileIdsToMetas")
         }
-        singleWithBinds(commonFilesMetasKeyValueRepoQualifier) {
+        singleWithBinds(Qualifiers.commonFilesMetasKeyValueRepoQualifier) {
             MetasKeyValueRepo(
                 get(),
-                get(originalFilesMetasKeyValueRepoQualifier)
+                get(Qualifiers.originalFilesMetasKeyValueRepoQualifier)
             )
         }
-        single<ReadFilesStorage> { DiskReadFilesStorage(get(commonFilesFolderQualifier), get(commonFilesMetasKeyValueRepoQualifier)) }
-        single<WriteFilesStorage> { WriteDistFilesStorage(get(commonFilesFolderQualifier), get(commonFilesMetasKeyValueRepoQualifier)) }
+        single<ReadFilesStorage> { DiskReadFilesStorage(get(Qualifiers.commonFilesFolderQualifier), get(Qualifiers.commonFilesMetasKeyValueRepoQualifier)) }
+        single<WriteFilesStorage> { WriteDistFilesStorage(get(Qualifiers.commonFilesFolderQualifier), get(Qualifiers.commonFilesMetasKeyValueRepoQualifier)) }
         single<FilesStorage> { DefaultFilesStorage(get(), get()) }
         singleWithBinds { ExposedUsersStorage(get()) }
         singleWithBinds { exposedUsersAuthenticator(get(), get()) }
 
-        factory<KeyValuesRolesOriginalRepo>(usersRolesKeyValueFactoryQualifier) { (tableName: String) ->
+        factory<KeyValuesRolesOriginalRepo>(Qualifiers.usersRolesKeyValueFactoryQualifier) { (tableName: String) ->
             ExposedOneToManyKeyValueRepo(get(), { text("subject") }, { text("role") }, tableName)
         }
         single {
-            RolesManagerRoleStorage(get(usersRolesKeyValueFactoryQualifier) { ParametersHolder(mutableListOf("rolesManager")) })
+            RolesManagerRoleStorage(get(Qualifiers.usersRolesKeyValueFactoryQualifier) { ParametersHolder(mutableListOf("rolesManager")) })
         }
         single<RolesStorage<RolesManagerRole>>(StringQualifier("RolesManagerRoleStorage")) { get<RolesManagerRoleStorage>() }
         singleWithBinds {
@@ -156,29 +139,16 @@ fun getDIModule(
         factory<CoroutineScope> { baseScope.LinkedSupervisorScope() }
 
         // Content storages
-        val binaryStorageFilesQualifier = StringQualifier("binaryContentFiles")
-        singleWithBinds(binaryFilesMetasKeyValueRepoQualifier) {
+        singleWithBinds(Qualifiers.binaryFilesMetasKeyValueRepoQualifier) {
             MetasKeyValueRepo(
                 get(),
-                get(binaryOriginalFilesMetasKeyValueRepoQualifier)
+                get(Qualifiers.binaryOriginalFilesMetasKeyValueRepoQualifier)
             )
         }
-        single<FilesStorage>(binaryStorageFilesQualifier) {
+        single<FilesStorage>(Qualifiers.binaryStorageFilesQualifier) {
             DefaultFilesStorage(
-                DiskReadFilesStorage(get(binaryFilesFolderQualifier), get(binaryFilesMetasKeyValueRepoQualifier)),
-                WriteDistFilesStorage(get(binaryFilesFolderQualifier), get(binaryFilesMetasKeyValueRepoQualifier))
-            )
-        }
-        singleWithRandomQualifier {
-            ServerContentStorageWrapper(
-                BinaryServerContentStorage(get(binaryStorageFilesQualifier)),
-                BinaryContent::class
-            )
-        }
-        singleWithRandomQualifier {
-            ServerContentStorageWrapper(
-                TextServerContentStorage(get()),
-                TextContent::class
+                DiskReadFilesStorage(get(Qualifiers.binaryFilesFolderQualifier), get(Qualifiers.binaryFilesMetasKeyValueRepoQualifier)),
+                WriteDistFilesStorage(get(Qualifiers.binaryFilesFolderQualifier), get(Qualifiers.binaryFilesMetasKeyValueRepoQualifier))
             )
         }
 

server/test.config.json

@@ -7,8 +7,10 @@
   "filesFolder": "/tmp/files",
   "debugMode": true,
   "modules": [
-    "dev.inmo.postssystem.targets.telegram.loader.server.TelegramTargetModuleLoader",
-    "dev.inmo.postssystem.publicators.simple.server.SimplePublicationTriggerLoader"
+    "dev.inmo.postssystem.features.content.text.server.TextContentServerModuleLoader",
+    "dev.inmo.postssystem.features.content.binary.server.BinaryContentServerModuleLoader",
+    "dev.inmo.postssystem.targets.telegram.loader.server.TelegramTargetServerModuleLoader",
+    "dev.inmo.postssystem.publicators.simple.server.SimplePublicationTriggerLoaderServer"
   ],
   "telegram": {
     "botToken": "YOUR BOT TOKEN",