Many fixes

Author: dao-ming-dev

app/fn-guru/pnpm-lock.yaml

@@ -41,6 +41,7 @@ dependencies {
     implementation(project(":platform:backend:bridge"))
     implementation(project(":platform:backend:core"))
     implementation(project(":platform:runner:runner"))
+    implementation(project(":platform:backend:shared"))
 }
 
 tasks.named<BootJar>("bootJar") {

app/hamal-mono/build.gradle.kts

@@ -3,7 +3,7 @@ package io.hamal.mono
 import io.hamal.api.ApiConfig
 import io.hamal.bridge.BridgeConfig
 import io.hamal.core.CoreConfig
-import io.hamal.runner.RunnerConfig
+import io.hamal.shared.SharedConfig
 import org.springframework.boot.Banner.Mode.OFF
 import org.springframework.boot.WebApplicationType.NONE
 import org.springframework.boot.WebApplicationType.SERVLET
@@ -19,7 +19,7 @@ class Mono
 fun main(args: Array<String>) {
 
     val applicationBuilder = SpringApplicationBuilder()
-        .parent(CoreConfig::class.java)
+        .parent(SharedConfig::class.java)
         .banner { _: Environment, _: Class<*>, out: PrintStream ->
             out.println("")
             out.println("")
@@ -40,6 +40,13 @@ fun main(args: Array<String>) {
 
     val parent: ConfigurableApplicationContext = applicationBuilder.run(*args)
 
+    applicationBuilder
+        .parent(parent)
+        .child(CoreConfig::class.java)
+        .web(NONE)
+        .bannerMode(OFF)
+        .run(*args)
+
     applicationBuilder
         .parent(parent)
         .child(ApiConfig::class.java)
@@ -56,10 +63,11 @@ fun main(args: Array<String>) {
         .bannerMode(OFF)
         .run(*args)
 
-    applicationBuilder
-        .parent(parent)
-        .child(RunnerConfig::class.java)
-        .web(NONE)
-        .bannerMode(OFF)
-        .run(*args)
+
+//    applicationBuilder
+//        .parent(parent)
+//        .child(RunnerConfig::class.java)
+//        .web(NONE)
+//        .bannerMode(OFF)
+//        .run(*args)
 }

app/hamal-mono/src/main/kotlin/io/hamal/mono/Mono.kt

@@ -2,7 +2,7 @@ package io.hamal.api
 
 import io.hamal.bridge.BridgeConfig
 import io.hamal.core.CoreConfig
-import io.hamal.core.component.SetupInternalTopics
+import io.hamal.shared.component.SetupInternalTopics
 import io.hamal.lib.common.domain.CmdId
 import io.hamal.lib.common.domain.CmdId.Companion.CmdId
 import io.hamal.lib.common.util.TimeUtils

app/nyanbot/pnpm-lock.yaml

@@ -1,8 +1,8 @@
 package io.hamal.api
 
-import io.hamal.core.component.DelayRetry
-import io.hamal.core.component.DelayRetryNoDelay
-import io.hamal.core.component.SetupInternalTopics
+import io.hamal.shared.component.DelayRetry
+import io.hamal.shared.component.DelayRetryNoDelay
+import io.hamal.shared.component.SetupInternalTopics
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.test.context.TestConfiguration

platform/backend/api/src/integrationTest/kotlin/io/hamal/api/BaseTest.kt

@@ -41,7 +41,7 @@ internal sealed class StateBaseControllerTest : BaseControllerTest() {
     }
 
     fun completeExec(execId: ExecId, state: ExecState): BridgeExecCompleteRequested {
-        val response = httpTemplate.post("/b1/execs/{execId}/complete")
+        val response = httpTemplate.post("/v1/execs/{execId}/complete")
             .path("execId", execId)
             .body(
                 BridgeExecCompleteRequest(

platform/backend/api/src/integrationTest/kotlin/io/hamal/api/TestConfig.kt

@@ -10,15 +10,12 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
-import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.web.servlet.DispatcherServlet
 import org.springframework.web.servlet.config.annotation.EnableWebMvc
 
-
 @EnableWebMvc
 @Configuration
 @ComponentScan
-@EnableScheduling
 @EnableAutoConfiguration(
     exclude = [
         DataSourceAutoConfiguration::class,
@@ -27,7 +24,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc
         JdbcTemplateAutoConfiguration::class,
         SpringApplicationAdminJmxAutoConfiguration::class,
         JmxAutoConfiguration::class
-    ]
+    ],
 )
 open class ApiConfig {
     @Bean

platform/backend/api/src/integrationTest/kotlin/io/hamal/api/http/controller/state/StateBaseControllerTest.kt

@@ -1,6 +1,6 @@
 package io.hamal.api.http.auth
 
-import io.hamal.core.security.SecurityContext
+import io.hamal.shared.security.SecurityContext
 import io.hamal.lib.domain.GenerateCmdId
 import io.hamal.lib.domain.vo.AuthToken.Companion.AuthToken
 import io.hamal.lib.domain.vo.ExecToken.Companion.ExecToken

platform/backend/api/src/main/kotlin/io/hamal/api/ApiConfig.kt

@@ -2,9 +2,9 @@ package io.hamal.api.http.controller.account
 
 
 import io.hamal.api.http.controller.accepted
-import io.hamal.core.adapter.account.AccountConvertAnonymousPort
-import io.hamal.core.component.Retry
-import io.hamal.core.security.SecurityContext
+import io.hamal.shared.adapter.account.AccountConvertAnonymousPort
+import io.hamal.shared.component.Retry
+import io.hamal.shared.security.SecurityContext
 import io.hamal.lib.sdk.api.ApiAccountConvertAnonymousRequest
 import io.hamal.lib.sdk.api.ApiRequested
 import org.springframework.http.ResponseEntity
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 internal class AccountConvertController(
     private val retry: Retry,
-    private val convertAccount: AccountConvertAnonymousPort
+    private val convertAccount: io.hamal.shared.adapter.account.AccountConvertAnonymousPort
 ) {
     @PostMapping("/v1/anonymous-accounts/convert")
     fun convert(