fix: JsonCodec encode, decode private fields too (#134)

devxb · Apr 7, 2024 · a03b664 · a03b664
1 parent 25a600c
commit a03b664
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt b/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt
@@ -1,6 +1,8 @@
 package org.rooftop.netx.redis
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.PropertyAccessor
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
@@ -116,7 +118,9 @@ class RedisSagaConfigurer(
     @Bean
     @ConditionalOnProperty(prefix = "netx", name = ["mode"], havingValue = "redis")
     internal fun netxObjectMapper(): ObjectMapper =
-        ObjectMapper().registerModule(ParameterNamesModule(JsonCreator.Mode.PROPERTIES))
+        ObjectMapper()
+            .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
+            .registerModule(ParameterNamesModule(JsonCreator.Mode.PROPERTIES))
             .registerModule(KotlinModule.Builder().build())
             .registerModule(JavaTimeModule())
 

diff --git a/src/test/kotlin/org/rooftop/netx/engine/OrchestratorConfigurer.kt b/src/test/kotlin/org/rooftop/netx/engine/OrchestratorConfigurer.kt
@@ -12,7 +12,9 @@ import reactor.core.publisher.Mono
 import java.time.Instant
 
 @Configuration
-internal class OrchestratorConfigurer {
+internal class OrchestratorConfigurer(
+    private val orchestratorFactory: OrchestratorFactory,
+) {
 
     @Bean(name = ["numberOrchestrator"])
     fun numberOrchestrator(): Orchestrator<Int, Int> {
@@ -226,6 +228,15 @@ internal class OrchestratorConfigurer {
             })
     }
 
+    @Bean(name = ["privateFieldOrchestrator"])
+    fun privateFieldOrchestrator(): Orchestrator<OrchestratorTest.Private, OrchestratorTest.Private> {
+        return OrchestratorFactory.instance()
+            .create<OrchestratorTest.Private>("privateFieldOrchestrator")
+            .start({ it })
+            .join({ it })
+            .commit({ it })
+    }
+
     object PairOrchestrate :
         Orchestrate<Pair<OrchestratorTest.Foo, OrchestratorTest.Foo>, Pair<OrchestratorTest.Foo, OrchestratorTest.Foo>> {
         override fun orchestrate(request: Pair<OrchestratorTest.Foo, OrchestratorTest.Foo>): Pair<OrchestratorTest.Foo, OrchestratorTest.Foo> {

diff --git a/src/test/kotlin/org/rooftop/netx/engine/OrchestratorTest.kt b/src/test/kotlin/org/rooftop/netx/engine/OrchestratorTest.kt
@@ -6,6 +6,7 @@ import io.kotest.core.annotation.DisplayName
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.equality.shouldBeEqualToComparingFields
 import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.matchers.shouldBe
 import org.rooftop.netx.api.Orchestrator
 import org.rooftop.netx.api.TypeReference
 import org.rooftop.netx.meta.EnableSaga
@@ -36,7 +37,8 @@ internal class OrchestratorTest(
     @Qualifier("contextOrchestrator") private val contextOrchestrator: Orchestrator<String, String>,
     @Qualifier("pairOrchestrator") private val pairOrchestrator: Orchestrator<String, Pair<Foo, Foo>>,
     @Qualifier("startWithContextOrchestrator") private val startWithContextOrchestrator: Orchestrator<String, String>,
-    @Qualifier("fooContextOrchestrator") private val fooContextOrchestrator: Orchestrator<String, List<Foo>>
+    @Qualifier("fooContextOrchestrator") private val fooContextOrchestrator: Orchestrator<String, List<Foo>>,
+    private val privateOrchestrator: Orchestrator<Private, Private>,
 ) : DescribeSpec({
 
     describe("numberOrchestrator 구현채는") {
@@ -210,6 +212,19 @@ internal class OrchestratorTest(
             }
         }
     }
+
+    describe("privateFieldOrchestrator 구현채는") {
+        context("saga 메소드가 호출되면,") {
+            val private = Private("I'm private")
+
+            it("Private 필드가 포함된 객체를 반환한다.") {
+                val result = privateOrchestrator.sagaSync(private)
+
+                result.isSuccess shouldBeEqual true
+                result.decodeResultOrThrow(Private::class) shouldBeEqual private
+            }
+        }
+    }
 }) {
     data class Home(
         val address: String,
@@ -228,6 +243,8 @@ internal class OrchestratorTest(
 
     data class Foo(val name: String)
 
+    data class Private(private val name: String)
+
     companion object {
         val rollbackOrchestratorResult = mutableListOf<String>()
         val upChainResult = mutableListOf<String>()