M8l1 statemachine

.github/workflows/build.yml

@@ -31,10 +31,10 @@ jobs:
           submodules: recursive
           token: ${{ secrets.PAT_TOKEN }}
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Validate Gradle wrapper
@@ -50,5 +50,5 @@ jobs:
       - name: Run Tests
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 8.6
+          gradle-version: 8.7
           arguments: check -i

build-plugin/src/main/kotlin/BuildPluginJvm.kt

@@ -1,13 +1,37 @@
 package ru.otus.otuskotlin.marketplace.plugin
 
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.the
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
 @Suppress("unused")
 internal class BuildPluginJvm : Plugin<Project> {
 
     override fun apply(project: Project) = with(project) {
         pluginManager.apply("org.jetbrains.kotlin.jvm")
+        plugins.withId("org.jetbrains.kotlin.jvm") {
+            extensions.configure<KotlinJvmProjectExtension> {
+                val libs = project.the<LibrariesForLibs>()
+                sourceSets.configureEach {
+                    languageSettings.apply {
+                        languageVersion = libs.versions.kotlin.language.get()
+                        progressiveMode = true
+                        optIn("kotlin.time.ExperimentalTime")
+                    }
+                }
+                jvmToolchain {
+                    languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.language.get()))
+                }
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.valueOf("JVM_${libs.versions.jvm.compiler.get()}"))
+                }
+            }
+        }
         group = rootProject.group
         version = rootProject.version
     }

build-plugin/src/main/kotlin/BuildPluginMultiplatform.kt

@@ -20,10 +20,11 @@ internal class BuildPluginMultiplatform : Plugin<Project> {
 
         plugins.withId("org.jetbrains.kotlin.multiplatform") {
             extensions.configure<KotlinMultiplatformExtension> {
+                val libs = project.the<LibrariesForLibs>()
                 configureTargets(this@with)
                 sourceSets.configureEach {
                     languageSettings.apply {
-                        languageVersion = "1.9"
+                        languageVersion = libs.versions.kotlin.language.get()
                         progressiveMode = true
                         optIn("kotlin.time.ExperimentalTime")
                     }

build.gradle.kts

@@ -19,6 +19,12 @@ subprojects {
 }
 
 tasks {
+    create("clean") {
+        group = "build"
+        gradle.includedBuilds.forEach {
+            dependsOn(it.task(":clean"))
+        }
+    }
     val buildImages: Task by creating {
         dependsOn(gradle.includedBuild("ok-marketplace-be").task(":buildImages"))
     }
@@ -29,7 +35,6 @@ tasks {
 
     create("check") {
         group = "verification"
-//        dependsOn(gradle.includedBuild("ok-marketplace-be").task(":check"))
         dependsOn(buildImages)
         dependsOn(e2eTests)
     }

deploy/docker-compose.yml

@@ -58,6 +58,7 @@ services:
       - http.port=9200
       - bootstrap.memory_lock=true
       - ES_JAVA_OPTS=-Xms512m -Xmx512m
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=adm-Password0
     ports:
       - '9200:9200'
       - '9600:9600'
@@ -68,8 +69,8 @@ services:
       nofile:
         soft: 65536
         hard: 65536
-    volumes:
-      - opensearch-data:/usr/share/opensearch/data
+#    volumes:
+#      - opensearch-data:/usr/share/opensearch/data
 
   dashboards:
     image: opensearchproject/opensearch-dashboards:latest

gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.ignoreDisabledTargets=true
 #kotlin.native.cacheKind.linuxX64=none

gradle/libs.versions.toml

@@ -1,4 +1,5 @@
 [versions]
+mkpl = "0.0.1"
 kotlin = "1.9.23"
 
 kotlinx-datetime = "0.5.0"
@@ -29,8 +30,9 @@ testcontainers = "1.19.7"
 muschko = "9.4.0"
 
 # BASE
-jvm-compiler = "17"
-jvm-language = "17"
+kotlin-language = "1.9"
+jvm-compiler = "21"
+jvm-language = "21"
 
 [libraries]
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -44,7 +46,6 @@ coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", ve
 coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutines" }
 coroutines-reactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version.ref = "coroutines" }
 coroutines-jdk9 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk9", version.ref = "coroutines" }
-cor = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-cor" }
 uuid = "com.benasher44:uuid:0.8.4"
 
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
@@ -123,6 +124,15 @@ testcontainers-rabbitmq = { module = "org.testcontainers:rabbitmq", version.ref
 testcontainers-postgres = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
 testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" }
 
+mkpl-logs-common = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-common", version.ref = "mkpl" }
+mkpl-logs-kermit = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-kermit", version.ref = "mkpl" }
+mkpl-logs-logback = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback", version.ref = "mkpl" }
+mkpl-logs-socket = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-socket", version.ref = "mkpl" }
+mkpl-cor = { module = "ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-cor", version.ref = "mkpl" }
+mkpl-state-common = { module = "ru.otus.otuskotlin.marketplace.state:ok-marketplace-states-common", version.ref = "mkpl" }
+mkpl-state-biz = { module = "ru.otus.otuskotlin.marketplace.state:ok-marketplace-states-biz", version.ref = "mkpl" }
+
+
 [bundles]
 kotest = ["kotest-junit5", "kotest-core", "kotest-datatest", "kotest-property"]
 exposed = ["db-exposed-core", "db-exposed-dao", "db-exposed-jdbc"]

ok-marketplace-be/gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.cacheKind.linuxX64=none
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
 
 

ok-marketplace-be/ok-marketplace-app-kafka/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     implementation(libs.coroutines.core)
     implementation(libs.kotlinx.atomicfu)
 
-    implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback")
+    implementation(libs.mkpl.logs.logback)
 
     implementation(project(":ok-marketplace-app-common"))
 

ok-marketplace-be/ok-marketplace-app-ktor/build.gradle.kts

@@ -22,7 +22,7 @@ ktor {
     docker {
         localImageName.set(project.name)
         imageTag.set(project.version.toString())
-        jreVersion.set(JavaVersion.VERSION_17)
+        jreVersion.set(JavaVersion.valueOf("VERSION_${libs.versions.jvm.compiler.get()}"))
     }
 }
 
@@ -81,11 +81,15 @@ kotlin {
                 implementation(projects.okMarketplaceRepoInmemory)
                 implementation(projects.okMarketplaceRepoPostgres)
 
+                // States
+                implementation(libs.mkpl.state.common)
+                implementation(libs.mkpl.state.biz)
+
                 // logging
                 implementation(project(":ok-marketplace-api-log1"))
-                implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-common")
-                implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-kermit")
-                implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-socket")
+                implementation(libs.mkpl.logs.common)
+                implementation(libs.mkpl.logs.kermit)
+                implementation(libs.mkpl.logs.socket)
             }
         }
 
@@ -115,13 +119,14 @@ kotlin {
                 implementation(libs.logback)
 
                 // transport models
-                implementation(project(":ok-marketplace-api-v1-jackson"))
-                implementation(project(":ok-marketplace-api-v1-mappers"))
+                implementation(projects.okMarketplaceApiV1Jackson)
+                implementation(projects.okMarketplaceApiV1Mappers)
+                implementation(projects.okMarketplaceApiV2Kmp)
 
                 implementation(projects.okMarketplaceRepoCassandra)
                 implementation(projects.okMarketplaceRepoGremlin)
 
-                implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback")
+                implementation(libs.mkpl.logs.logback)
                 implementation(libs.testcontainers.cassandra)
                 implementation(libs.testcontainers.core)
             }

ok-marketplace-be/ok-marketplace-app-ktor/src/commonMain/kotlin/plugins/InitAppSettings.kt

@@ -5,15 +5,22 @@ import ru.otus.otuskotlin.marketplace.app.ktor.MkplAppSettings
 import ru.otus.otuskotlin.marketplace.app.ktor.base.KtorWsSessionRepo
 import ru.otus.otuskotlin.marketplace.backend.repository.inmemory.AdRepoStub
 import ru.otus.otuskotlin.marketplace.biz.MkplAdProcessor
+import ru.otus.otuskotlin.marketplace.biz.statemachine.resolver.SMAdStateResolverDefault
 import ru.otus.otuskotlin.marketplace.common.MkplCorSettings
+import ru.otus.otuskotlin.marketplace.states.common.MkplStatesCorSettings
 
 fun Application.initAppSettings(): MkplAppSettings {
+    val loggerProvider = getLoggerProviderConf()
     val corSettings = MkplCorSettings(
-        loggerProvider = getLoggerProviderConf(),
+        loggerProvider = loggerProvider,
         wsSessions = KtorWsSessionRepo(),
         repoTest = getDatabaseConf(AdDbType.TEST),
         repoProd = getDatabaseConf(AdDbType.PROD),
         repoStub = AdRepoStub(),
+        stateSettings = MkplStatesCorSettings(
+            loggerProvider = loggerProvider,
+            stateMachine = SMAdStateResolverDefault(),
+        ),
     )
     return MkplAppSettings(
         appUrls = environment.config.propertyOrNull("ktor.urls")?.getList() ?: emptyList(),

ok-marketplace-be/ok-marketplace-app-rabbit/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
 
     implementation(project(":ok-marketplace-common"))
     implementation(project(":ok-marketplace-app-common"))
-    implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback")
+    implementation(libs.mkpl.logs.logback)
 
     // v1 api
     implementation(project(":ok-marketplace-api-v1-jackson"))

ok-marketplace-be/ok-marketplace-app-spring/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     // Внутренние модели
     implementation(project(":ok-marketplace-common"))
     implementation(project(":ok-marketplace-app-common"))
-    implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback")
+    implementation(libs.mkpl.logs.logback)
 
     // v1 api
     implementation(project(":ok-marketplace-api-v1-jackson"))
@@ -42,6 +42,10 @@ dependencies {
     testImplementation(projects.okMarketplaceRepoCommon)
     testImplementation(projects.okMarketplaceStubs)
 
+    // State
+    implementation(libs.mkpl.state.common)
+    implementation(libs.mkpl.state.biz)
+
     // tests
     testImplementation(kotlin("test-junit5"))
     testImplementation(libs.spring.test)

ok-marketplace-be/ok-marketplace-app-tmp/build.gradle.kts

@@ -10,7 +10,7 @@ application {
 dependencies {
     implementation(project(":ok-marketplace-api-log1"))
     implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-common")
-    implementation("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-logback")
+    implementation(libs.mkpl.logs.logback)
 
     implementation(project(":ok-marketplace-common"))
 

ok-marketplace-be/ok-marketplace-biz/build.gradle.kts

@@ -10,7 +10,8 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-common"))
 
-                implementation(libs.cor)
+                implementation(libs.mkpl.cor)
+                implementation(libs.mkpl.state.common)
 
                 implementation(project(":ok-marketplace-common"))
                 implementation(project(":ok-marketplace-stubs"))

ok-marketplace-be/ok-marketplace-biz/src/commonMain/kotlin/MkplAdProcessor.kt

@@ -1,5 +1,7 @@
 package ru.otus.otuskotlin.marketplace.biz
 
+import ru.otus.otuskotlin.marketplace.biz.general.getAdState
+import ru.otus.otuskotlin.marketplace.biz.general.getAdStates
 import ru.otus.otuskotlin.marketplace.biz.general.initStatus
 import ru.otus.otuskotlin.marketplace.biz.general.operation
 import ru.otus.otuskotlin.marketplace.biz.repo.*
@@ -49,6 +51,7 @@ class MkplAdProcessor(
                 repoPrepareCreate("Подготовка объекта для сохранения")
                 repoCreate("Создание объявления в БД")
             }
+            getAdState("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
         operation("Получить объявление", MkplCommand.READ) {
@@ -75,6 +78,7 @@ class MkplAdProcessor(
                     handle { adRepoDone = adRepoRead }
                 }
             }
+            getAdState("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
         operation("Изменить объявление", MkplCommand.UPDATE) {
@@ -110,6 +114,7 @@ class MkplAdProcessor(
                 repoPrepareUpdate("Подготовка объекта для обновления")
                 repoUpdate("Обновление объявления в БД")
             }
+            getAdState("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
         operation("Удалить объявление", MkplCommand.DELETE) {
@@ -138,6 +143,7 @@ class MkplAdProcessor(
                 repoPrepareDelete("Подготовка объекта для удаления")
                 repoDelete("Удаление объявления из БД")
             }
+            getAdState("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
         operation("Поиск объявлений", MkplCommand.SEARCH) {
@@ -154,6 +160,7 @@ class MkplAdProcessor(
                 finishAdFilterValidation("Успешное завершение процедуры валидации")
             }
             repoSearch("Поиск объявления в БД по фильтру")
+            getAdStates("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
         operation("Поиск подходящих предложений для объявления", MkplCommand.OFFERS) {
@@ -177,8 +184,8 @@ class MkplAdProcessor(
                 repoPrepareOffers("Подготовка данных для поиска предложений")
                 repoOffers("Поиск предложений для объявления в БД")
             }
+            getAdStates("Вычисление состояния объявления")
             prepareResult("Подготовка ответа")
         }
     }.build()
 }
-

ok-marketplace-be/ok-marketplace-biz/src/commonMain/kotlin/general/GetAdState.kt

@@ -0,0 +1,17 @@
+package ru.otus.otuskotlin.marketplace.biz.general
+
+import ru.otus.otuskotlin.marketplace.common.MkplContext
+import ru.otus.otuskotlin.marketplace.common.models.MkplState
+import ru.otus.otuskotlin.marketplace.cor.ICorChainDsl
+import ru.otus.otuskotlin.marketplace.cor.worker
+
+fun ICorChainDsl<MkplContext>.getAdState(title: String) = worker {
+    this.title = title
+    this.description = """
+        Получаем состояние из сервиса состояний
+    """.trimIndent()
+    on { state == MkplState.RUNNING }
+    handle {
+        corSettings.stateSettings.stateMachine
+    }
+}

ok-marketplace-be/ok-marketplace-biz/src/commonMain/kotlin/general/GetAdStates.kt

@@ -0,0 +1,17 @@
+package ru.otus.otuskotlin.marketplace.biz.general
+
+import ru.otus.otuskotlin.marketplace.common.MkplContext
+import ru.otus.otuskotlin.marketplace.common.models.MkplState
+import ru.otus.otuskotlin.marketplace.cor.ICorChainDsl
+import ru.otus.otuskotlin.marketplace.cor.worker
+
+fun ICorChainDsl<MkplContext>.getAdStates(title: String) = worker {
+    this.title = title
+    this.description = """
+        Получаем состояние из сервиса состояний
+    """.trimIndent()
+    on { state == MkplState.RUNNING }
+    handle {
+        corSettings.stateSettings.stateMachine
+    }
+}

ok-marketplace-be/ok-marketplace-common/build.gradle.kts

@@ -13,7 +13,7 @@ kotlin {
 
                 api(libs.kotlinx.datetime)
                 implementation(libs.coroutines.core)
-                api("ru.otus.otuskotlin.marketplace.libs:ok-marketplace-lib-logging-common")
+                api(libs.mkpl.state.common)
             }
         }
         val commonTest by getting {