Merge pull request #21 from Trendyol/development

Version 1.1.0
Trendyol · Aug 5, 2024 · d6ecc1b · d6ecc1b
2 parents 99608db + f8f6bbd
commit d6ecc1b
Show file tree

Hide file tree

Showing 27 changed files with 336 additions and 224 deletions.
diff --git a/sample/src/main/java/com/trendyol/transmission/features/FeaturesModule.kt b/sample/src/main/java/com/trendyol/transmission/features/FeaturesModule.kt
@@ -5,6 +5,7 @@ import com.trendyol.transmission.features.colorpicker.ColorPickerTransformer
 import com.trendyol.transmission.features.input.InputTransformer
 import com.trendyol.transmission.features.multioutput.MultiOutputTransformer
 import com.trendyol.transmission.features.output.OutputTransformer
+import com.trendyol.transmission.router.builder.TransmissionRouterBuilder
 import com.trendyol.transmission.transformer.Transformer
 import dagger.Binds
 import dagger.Module
@@ -42,7 +43,9 @@ interface FeaturesModule {
 		fun provideRouter(
 			transformerSet: @JvmSuppressWildcards Set<Transformer>
 		): TransmissionRouter {
-			return TransmissionRouter(transformerSet)
+			return TransmissionRouterBuilder.build {
+				withTransformerSet(transformerSet)
+			}
 		}
 	}
 

diff --git a/sample/src/main/java/com/trendyol/transmission/features/input/InputTransformer.kt b/sample/src/main/java/com/trendyol/transmission/features/input/InputTransformer.kt
@@ -11,6 +11,8 @@ import com.trendyol.transmission.transformer.handler.registerSignal
 import com.trendyol.transmission.transformer.request.buildComputationContract
 import com.trendyol.transmission.transformer.request.buildComputationContractWithArgs
 import com.trendyol.transmission.transformer.request.buildDataContract
+import com.trendyol.transmission.transformer.request.computation.ComputationRegistry
+import com.trendyol.transmission.transformer.request.computation.computationRegistry
 import com.trendyol.transmission.transformer.request.computation.registerComputation
 import com.trendyol.transmission.ui.InputUiState
 import kotlinx.coroutines.CoroutineDispatcher
@@ -24,14 +26,14 @@ class InputTransformer @Inject constructor(
 
     private val holder = buildDataHolder(InputUiState(), holderContract)
 
-    init {
-        computationRegistry
-            .registerComputation(writtenInputContract) {
-                delay(1.seconds)
-                WrittenInput(holder.getValue().writtenText)
-            }.registerComputation(writtenInputWithArgs) {
-                WrittenInput(it)
-            }
+    override val computationRegistry: ComputationRegistry = computationRegistry {
+        registerComputation(writtenInputContract) {
+            delay(1.seconds)
+            WrittenInput(holder.getValue().writtenText)
+        }
+        registerComputation(writtenInputWithArgs) {
+            WrittenInput(it)
+        }
     }
 
     override val handlerRegistry: HandlerRegistry = handlerRegistry {

diff --git a/sample/src/main/java/com/trendyol/transmission/features/output/OutputTransformer.kt b/sample/src/main/java/com/trendyol/transmission/features/output/OutputTransformer.kt
@@ -1,5 +1,6 @@
 package com.trendyol.transmission.features.output
 
+import android.util.Log
 import com.trendyol.transmission.DefaultDispatcher
 import com.trendyol.transmission.effect.RouterEffect
 import com.trendyol.transmission.features.colorpicker.ColorPickerEffect
@@ -14,7 +15,11 @@ import com.trendyol.transmission.transformer.handler.handlerRegistry
 import com.trendyol.transmission.transformer.handler.registerEffect
 import com.trendyol.transmission.transformer.request.buildComputationContract
 import com.trendyol.transmission.transformer.request.buildExecutionContract
+import com.trendyol.transmission.transformer.request.computation.ComputationRegistry
+import com.trendyol.transmission.transformer.request.computation.computationRegistry
 import com.trendyol.transmission.transformer.request.computation.registerComputation
+import com.trendyol.transmission.transformer.request.execution.ExecutionRegistry
+import com.trendyol.transmission.transformer.request.execution.executionRegistry
 import com.trendyol.transmission.transformer.request.execution.registerExecution
 import com.trendyol.transmission.ui.ColorPickerUiState
 import com.trendyol.transmission.ui.OutputUiState
@@ -33,20 +38,25 @@ class OutputTransformer @Inject constructor(
 
     private val holder2 = buildDataHolder(ColorPickerUiState(), publishUpdates = false)
 
-    init {
-        computationRegistry
-            .registerComputation(outputCalculationContract) {
-                delay(2.seconds)
-                val data = getData(ColorPickerTransformer.holderContract)?.selectedColorIndex
-                val writtenOutput = compute(InputTransformer.writtenInputContract)
-                val result = Random.nextInt(5, 15) * Random.nextInt(5, 15)
-                OutputCalculationResult("result is $result with ($writtenOutput) and $data")
-            }
-        executionRegistry
-            .registerExecution(outputExecutionContract) {
-                delay(4.seconds)
-                communicationScope.publish(ColorPickerEffect.BackgroundColorUpdate(Pink80))
-            }
+    override val computationRegistry: ComputationRegistry = computationRegistry {
+        registerComputation(outputCalculationContract) {
+            delay(2.seconds)
+            val data = getData(ColorPickerTransformer.holderContract)?.selectedColorIndex
+            val writtenOutput = compute(InputTransformer.writtenInputContract)
+            val result = Random.nextInt(5, 15) * Random.nextInt(5, 15)
+            OutputCalculationResult("result is $result with ($writtenOutput) and $data")
+        }
+    }
+
+    override val executionRegistry: ExecutionRegistry = executionRegistry {
+        registerExecution(outputExecutionContract) {
+            delay(4.seconds)
+            communicationScope.publish(ColorPickerEffect.BackgroundColorUpdate(Pink80))
+            throw RuntimeException(
+                "This exception will be properly handled and caught " +
+                        "inside of the onError() function"
+            )
+        }
     }
 
     override val handlerRegistry: HandlerRegistry = handlerRegistry {
@@ -71,7 +81,13 @@ class OutputTransformer @Inject constructor(
         }
     }
 
+    override fun onError(throwable: Throwable) {
+        super.onError(throwable)
+        Log.e(TAG, "onError: ${throwable.localizedMessage}")
+    }
+
     companion object {
+        private const val TAG = "OutputTransformer"
         val outputCalculationContract =
             buildComputationContract<OutputCalculationResult>("OutputCalculationResult")
         val outputExecutionContract =

diff --git a/...rc/test/java/com/trendyol/transmission/features/colorpicker/ColorPickerTransformerTest.kt b/...rc/test/java/com/trendyol/transmission/features/colorpicker/ColorPickerTransformerTest.kt
@@ -60,15 +60,15 @@ class ColorPickerTransformerTest {
             .test(signal = ColorPickerSignal.SelectColor(3, Color.Blue)) {
                 assertEquals(
                     Color.Blue.copy(alpha = 0.1f),
-                    (effectStream.first().effect as ColorPickerEffect.BackgroundColorUpdate).color
+                    (effectStream.first() as ColorPickerEffect.BackgroundColorUpdate).color
                 )
             }
     }
 
     @Test
     fun `GIVEN inputTransformer, WHEN SelectColor signal is sent, THEN SelectedColorUpdate is sent to MultiOutputTransformer`() {
         sut.attachToRouter().test(signal = ColorPickerSignal.SelectColor(3, Color.Blue)) {
-            assertTrue { effectStream.last().effect is ColorPickerEffect.SelectedColorUpdate }
+            assertTrue { effectStream.last() is ColorPickerEffect.SelectedColorUpdate }
         }
     }
 }
diff --git a/sample/src/test/java/com/trendyol/transmission/features/input/InputTransformerTest.kt b/sample/src/test/java/com/trendyol/transmission/features/input/InputTransformerTest.kt
@@ -27,7 +27,7 @@ class InputTransformerTest {
     fun `GIVEN inputTransformer, WHEN inputUpdate signal is sent, THEN inputUpdate effect is published`() {
         sut.attachToRouter()
             .test(signal = InputSignal.InputUpdate("test")) {
-                assertEquals(InputEffect.InputUpdate("test"), effectStream.first().effect)
+                assertEquals(InputEffect.InputUpdate("test"), effectStream.first())
                 assertEquals(InputUiState("test"), dataStream.last())
             }
     }

diff --git a/sample/src/test/java/com/trendyol/transmission/features/output/OutputTransformerTest.kt b/sample/src/test/java/com/trendyol/transmission/features/output/OutputTransformerTest.kt
@@ -49,7 +49,7 @@ class OutputTransformerTest {
             }
             .test(effect = InputEffect.InputUpdate("test")) {
                 assertEquals(OutputUiState(outputText = "test"), dataStream[1])
-                assertTrue(effectStream.last().effect is RouterEffect)
+                assertTrue(effectStream.last() is RouterEffect)
             }
     }
 }
diff --git a/transmission-test/build.gradle.kts b/transmission-test/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
         create<MavenPublication>("release") {
             groupId = "com.trendyol"
             artifactId = "transmission-test"
-            version = "1.0.7"
+            version = "1.1.0"
             afterEvaluate {
                 from(components["java"])
             }

diff --git a/transmission-test/src/main/java/com/trendyol/transmissiontest/TestRouter.kt b/transmission-test/src/main/java/com/trendyol/transmissiontest/TestRouter.kt
diff --git a/transmission-test/src/main/java/com/trendyol/transmissiontest/TestSuite.kt b/transmission-test/src/main/java/com/trendyol/transmissiontest/TestSuite.kt
@@ -1,7 +1,9 @@
 package com.trendyol.transmissiontest
 
 import com.trendyol.transmission.Transmission
-import com.trendyol.transmission.effect.EffectWrapper
+import com.trendyol.transmission.TransmissionRouter
+import com.trendyol.transmission.router.RegistryScope
+import com.trendyol.transmission.router.builder.TransmissionTestingRouterBuilder
 import com.trendyol.transmission.transformer.Transformer
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.toList
@@ -15,16 +17,16 @@ import kotlinx.coroutines.test.runTest
 class TestSuite {
     private var orderedInitialProcessing: List<Transmission> = emptyList()
     private var transformer: Transformer? = null
-    private lateinit var router: TestRouter
+    private var registryScope: RegistryScope.() -> Unit = {}
+    private lateinit var router: TransmissionRouter
 
     fun initialize(transformer: Transformer): TestSuite {
         this.transformer = transformer
-        router = TestRouter(transformer, UnconfinedTestDispatcher())
         return this
     }
 
     fun register(registry: RegistryScope.() -> Unit = {}): TestSuite {
-        router.registry = RegistryScopeImpl().apply(registry)
+        this.registryScope = registry
         return this
     }
 
@@ -39,10 +41,15 @@ class TestSuite {
         transmission: Transmission,
         scope: suspend TransformerTestScope.(scope: TestScope) -> Unit
     ) {
+        router = TransmissionTestingRouterBuilder.build {
+            withDispatcher(UnconfinedTestDispatcher())
+            this@TestSuite.transformer?.let { withTransformerSet(setOf(it)) }
+            testing(this@TestSuite.registryScope)
+        }
 
         runTest {
             val dataStream: MutableList<Transmission.Data> = mutableListOf()
-            val effectStream: MutableList<EffectWrapper> = mutableListOf()
+            val effectStream: MutableList<Transmission.Effect> = mutableListOf()
             try {
                 backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
                     router.dataStream.toList(dataStream)
@@ -52,20 +59,20 @@ class TestSuite {
                 }
                 val testScope = object : TransformerTestScope {
                     override val dataStream: List<Transmission.Data> = dataStream
-                    override val effectStream: List<EffectWrapper> = effectStream
+                    override val effectStream: List<Transmission.Effect> = effectStream
                 }
                 orderedInitialProcessing.forEach {
                     when (it) {
                         is Transmission.Data -> throw IllegalArgumentException("Transmission.Data should not be sent for processing")
-                        is Transmission.Effect -> router.sendEffect(it)
-                        is Transmission.Signal -> router.sendSignal(it)
+                        is Transmission.Effect -> router.processEffect(it)
+                        is Transmission.Signal -> router.processSignal(it)
                     }
                     transformer?.waitProcessingToFinish()
                 }
                 if (transmission is Transmission.Signal) {
-                    router.sendSignal(transmission)
+                    router.processSignal(transmission)
                 } else if (transmission is Transmission.Effect) {
-                    router.sendEffect(transmission)
+                    router.processEffect(transmission)
                 }
                 transformer?.waitProcessingToFinish()
                 testScope.scope(this)

diff --git a/transmission-test/src/main/java/com/trendyol/transmissiontest/TransformerTestScope.kt b/transmission-test/src/main/java/com/trendyol/transmissiontest/TransformerTestScope.kt
@@ -5,5 +5,5 @@ import com.trendyol.transmission.effect.EffectWrapper
 
 interface TransformerTestScope {
     val dataStream: List<Transmission.Data>
-    val effectStream: List<EffectWrapper>
+    val effectStream: List<Transmission.Effect>
 }
diff --git a/transmission/build.gradle.kts b/transmission/build.gradle.kts
@@ -27,7 +27,7 @@ publishing {
         create<MavenPublication>("release") {
             groupId = "com.trendyol"
             artifactId = "transmission"
-            version = "1.0.7"
+            version = "1.1.0"
             afterEvaluate {
                 from(components["java"])
             }