Simplify codegen, prepare to include runtime variant

Author: Pablo Orgaz

app/src/main/java/org/sample/SampleActivity.kt

@@ -9,16 +9,16 @@ import mini.*
 
 class SampleActivity : AppCompatActivity(), SubscriptionTracker by DefaultSubscriptionTracker() {
 
-    private val dispatcher = Dispatcher(Mini.actionTypes)
-    private val dummyStore = DummyStore(dispatcher)
+    private val dispatcher = Dispatcher()
+    private val dummyStore = DummyStore()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.home_activity)
         Grove.plant(ConsoleLogTree())
         val stores = listOf(dummyStore)
 
-        Mini.register(dispatcher, stores)
+        MiniGen.initialize(dispatcher, stores)
         dispatcher.addInterceptor(LoggerInterceptor(stores, { tag, msg ->
             Grove.tag(tag).d { msg }
         }))
@@ -48,17 +48,17 @@ data class ActionOne(override val text: String) : ActionInterface, SampleAbstrac
 @Action class ActionTwo(val text: String)
 
 data class DummyState(val text: String = "dummy")
-class DummyStore(dispatcher: Dispatcher) : Store<DummyState>(dispatcher) {
+class DummyStore : Store<DummyState>() {
 
     @Reducer fun onInterfaceAction(a: ActionInterface) {
 
     }
 
     @Reducer fun onSampleAction(a: ActionOne) {
-        setState(state.copy(text = a.text))
+        newState = state.copy(text = a.text)
     }
 
     @Reducer fun anotherAction(a: ActionTwo) {
-        setState(state.copy(text = a.text))
+        state.copy(text = a.text).newState()
     }
 }

mini-common/src/main/java/mini/Dispatcher.kt

@@ -9,7 +9,9 @@ import java.util.*
  * If map is empty, the runtime type itself will be used. If using code generation,
  * Mini.actionTypes will contain a map with all super types of @Action annotated classes.
  */
-class Dispatcher(val actionTypes: Map<Class<*>, List<Class<*>>> = emptyMap()) {
+class Dispatcher {
+
+    var actionTypes: Map<Class<*>, List<Class<*>>> = emptyMap()
 
     private val subscriptionCaller: Chain = object : Chain {
         override fun proceed(action: Any): Any {

mini-common/src/main/java/mini/Store.kt

@@ -8,7 +8,7 @@ import java.lang.reflect.ParameterizedType
 /**
  * State holder.
  */
-abstract class Store<S : Any>(val dispatcher: Dispatcher) {
+abstract class Store<S : Any> {
 
     companion object {
         const val INITIALIZE_ORDER_PROP = "store.init.order"
@@ -21,17 +21,33 @@ abstract class Store<S : Any>(val dispatcher: Dispatcher) {
 
     private var _state: S? = null
 
-    fun setState(state: S) {
+    /** Set new state, equivalent to [newState]*/
+    protected fun setState(state: S) {
         setStateInternal(state)
     }
 
-    fun setState(fn: S.() -> Unit) {
+    /** Hook for write only property */
+    protected var newState: S
+        get() = throw UnsupportedOperationException("This is a write only property")
+        set(value) = setStateInternal(value)
 
+    /**
+     * Same as property, suffix style
+     */
+    protected fun S.newState(): S {
+        setStateInternal(this)
+        return this
     }
 
     val state: S
         get() {
-            if (_state == null) _state = initialState()
+            if (_state == null) {
+                synchronized(this) {
+                    if (_state == null) {
+                        _state = initialState()
+                    }
+                }
+            }
             return _state!!
         }
 

mini-processor/src/main/java/mini/processor/ActionTypesGenerator.kt

@@ -20,7 +20,7 @@ object ActionTypesGenerator {
                 .parameterizedBy(anyClassTypeName, listTypeName)
 
             val prop = PropertySpec.builder("actionTypes", mapType)
-                .addAnnotation(JvmField::class)
+                .addModifiers(KModifier.PRIVATE)
                 //⇤⇥«»
                 .initializer(CodeBlock.builder()
                     .add("mapOf(\n⇥")

mini-processor/src/main/java/mini/processor/MiniProcessor.kt

@@ -32,8 +32,9 @@ class MiniProcessor : AbstractProcessor() {
 
         if (roundActions.isEmpty()) return false
 
-        val file = FileSpec.builder("mini", "Mini")
-        val container = TypeSpec.objectBuilder("Mini")
+        val className = "MiniGen"
+        val file = FileSpec.builder("mini", className)
+        val container = TypeSpec.objectBuilder(className)
         container.addKdoc("Automatically generated, do not edit.\n")
 
         //Get non-abstract actions

mini-processor/src/main/java/mini/processor/ReducersGenerator.kt

@@ -16,7 +16,6 @@ object ReducersGenerator {
 
         val whenBlock = CodeBlock.builder()
             //⇤⇥«»
-            .beginControlFlow("stores.forEach { store ->")
             .addStatement("when (store) {").indent()
             .apply {
                 reducers.forEach { (storeName, reducers) ->
@@ -32,29 +31,39 @@ object ReducersGenerator {
                 }
             }
             .unindent().addStatement("}")
-            .endControlFlow()
             .build()
 
         val storeTypeName = Store::class.asTypeName().parameterizedBy(STAR)
         val listOfStoresTypeName = List::class.asTypeName().parameterizedBy(storeTypeName)
 
-        val registerListFunction = FunSpec.builder("register")
-            .addAnnotation(JvmStatic::class)
+        val registerListFn = FunSpec.builder("register")
+            .addModifiers(KModifier.PRIVATE)
             .addParameter("dispatcher", Dispatcher::class)
             .addParameter("stores", listOfStoresTypeName)
-            .addCode(whenBlock)
+            .beginControlFlow("stores.forEach { store ->")
+            .addStatement("register(dispatcher, store)")
+            .endControlFlow()
             .build()
 
-        val registerOneFunction = FunSpec.builder("register")
-            .addAnnotation(JvmStatic::class)
+        val registerOneFn = FunSpec.builder("register")
+            .addModifiers(KModifier.PRIVATE)
             .addParameter("dispatcher", Dispatcher::class)
             .addParameter("store", storeTypeName)
-            .addCode(CodeBlock.of(
-                "register(dispatcher, listOf(store))"
-            )).build()
+            .addCode(whenBlock)
+            .build()
+
+        val initDispatcherFn = FunSpec.builder("initialize")
+            .addParameter("dispatcher", Dispatcher::class)
+            .addParameter("stores", listOfStoresTypeName)
+            .addCode(CodeBlock.builder()
+                .addStatement("dispatcher.actionTypes = actionTypes")
+                .addStatement("register(dispatcher, stores)")
+                .build())
+            .build()
 
-        container.addFunction(registerOneFunction)
-        container.addFunction(registerListFunction)
+        container.addFunction(registerOneFn)
+        container.addFunction(registerListFn)
+        container.addFunction(initDispatcherFn)
 
     }
 }

mini-runtime/.gitignore

@@ -0,0 +1 @@
+/build

mini-runtime/build.gradle

@@ -0,0 +1,12 @@
+apply plugin: 'kotlin'
+apply from: "../jitpack.gradle"
+
+dependencies {
+    compile project(":mini-common")
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    compile 'com.github.yanex:takenoko:0.1'
+    compile 'io.github.classgraph:classgraph:4.6.32'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'com.google.testing.compile:compile-testing:0.15'
+}

mini-runtime/src/main/java/com/minikorp/runtime/MyClass.java

@@ -0,0 +1,4 @@
+package com.minikorp.runtime;
+
+public class MyClass {
+}

settings.gradle

@@ -1 +1 @@
-include ':mini-processor', ':mini-common', ':mini-android-testing', ':app'
+include ':mini-processor', ':mini-common', ':mini-android-testing', ':app', ':mini-runtime'