draft

Author: mtumilowicz

src/main/kotlin/dsl/Fsm.kt

@@ -7,10 +7,9 @@ class Fsm(
 ) {
 
     companion object {
-        @JvmStatic
-        fun create(initialState: String, xxx: FsmSpec.() -> FsmSpec): Fsm {
+        fun create(initialState: String, fsmRecipe: FsmSpec.() -> FsmSpec): Fsm {
             return FsmSpec(initialState = initialState)
-                .xxx()
+                .fsmRecipe()
                 .build()
         }
     }

src/main/kotlin/dsl/FsmSpec.kt

@@ -1,18 +1,17 @@
 package dsl
 
 class FsmSpec(
-    private val transitions: MutableList<TransitionSpec.() -> TransitionSpec> = mutableListOf(),
+    private val transitions: MutableList<Transition> = mutableListOf(),
     val initialState: String
 ) {
 
     fun add(transitionRecipe: TransitionSpec.() -> TransitionSpec): FsmSpec {
-        transitions.add(transitionRecipe)
+        transitions.add(Transition.create(transitionRecipe))
         return this
     }
 
     fun build(): Fsm {
-        val map = transitions.map { func -> TransitionSpec().func().build() }
-            .associateBy({ it.event }, { it.stateFlow })
+        val map = transitions.associateBy({ it.event }, { it.stateFlow })
         return Fsm(
             transitions = map,
             initial = State(initialState),

src/main/kotlin/dsl/StateFlow.kt

@@ -3,7 +3,6 @@ package dsl
 data class StateFlow(val from: State, val into: State) {
 
     companion object {
-        @JvmStatic
         fun of(from: String, into: String): StateFlow {
             return StateFlow(State(from), State(into))
         }

src/main/kotlin/dsl/Transition.kt

@@ -2,6 +2,14 @@ package dsl
 
 data class Transition(val event: Event, val stateFlow: StateFlow) {
 
+    companion object {
+        fun create(transitionSpec: TransitionSpec.() -> TransitionSpec): Transition {
+            return TransitionSpec()
+                .transitionSpec()
+                .build()
+        }
+    }
+
     override fun toString(): String {
         return "$event: $stateFlow"
     }