Merge pull request #25 from izumin5210/builder

Add builder method to generated store class
izumin5210 · Nov 29, 2015 · 6d1fdab · 6d1fdab
2 parents ea9c54e + a1207da
commit 6d1fdab
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/...main/java/info/izumin/android/droidux/processor/generator/StoreBuilderClassGenerator.java b/...main/java/info/izumin/android/droidux/processor/generator/StoreBuilderClassGenerator.java
@@ -73,7 +73,7 @@ public FieldSpec apply(ReducerModel input) {
 
     private MethodSpec createBuilderConstructor() {
         return MethodSpec.constructorBuilder()
-                .addModifiers(Modifier.PUBLIC)
+                .addModifiers(Modifier.PRIVATE)
                 .addStatement("$N = new $T<>()", BuilderModel.MIDDLEWARES_VARIABLE_NAME, ArrayList.class)
                 .build();
     }

diff --git a/...or/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java b/...or/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java
@@ -46,6 +46,7 @@ private TypeSpec createTypeSpec() {
                 .addSuperinterface(storeModel.getInterfaceName())
                 .addFields(createFieldSpecs())
                 .addMethod(createConstructor())
+                .addMethod(createBuilderMethodSpec())
                 .addMethods(createGetterMethodSpecs())
                 .addType(new StoreBuilderClassGenerator(storeModel).createBuilderTypeSpec())
                 .build();
@@ -97,6 +98,14 @@ public String apply(StoreImplModel input) {
                 .build();
     }
 
+    private MethodSpec createBuilderMethodSpec() {
+        return MethodSpec.methodBuilder(StoreModel.BUILDER_METHOD_NAME)
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(storeModel.getBuilderModel().getClassName())
+                .addStatement("return new $T()", storeModel.getBuilderModel().getClassName())
+                .build();
+    }
+
     private List<MethodSpec> createGetterMethodSpecs() {
         return FluentIterable.from(storeModel.getMethodModels())
                 .transform(new Function<StoreMethodModel, MethodSpec>() {

diff --git a/droidux-processor/src/main/java/info/izumin/android/droidux/processor/model/StoreModel.java b/droidux-processor/src/main/java/info/izumin/android/droidux/processor/model/StoreModel.java
@@ -24,6 +24,7 @@ public class StoreModel {
 
     public static final String MIDDLEWARES_FIELD_NAME = "middlewares";
     public static final String ATTACH_MIDDLEWARE_METHOD_NAME = "onAttach";
+    public static final String BUILDER_METHOD_NAME = "builder";
 
     private static final String CLASS_NAME_PREFIX = "Droidux";
 

diff --git a/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java b/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java
@@ -126,6 +126,10 @@ public static class Counter {
                 "        }",
                 "    }",
                 "",
+                "    public static Builder builder() {",
+                "        return new Builder();",
+                "    }",
+                "",
                 "    public Counter counter() {",
                 "        return counterStoreImpl.getState();",
                 "    }",
@@ -143,7 +147,7 @@ public static class Counter {
                 "        private CounterReducer counterReducer;",
                 "        private Counter counter;",
                 "",
-                "        public Builder() {",
+                "        private Builder() {",
                 "            middlewares = new ArrayList<>();",
                 "        }",
                 "",
@@ -222,6 +226,10 @@ public static class CombinedTwoReducers {
                 "        }",
                 "    }",
                 "",
+                "    public static Builder builder() {",
+                "        return new Builder();",
+                "    }",
+                "",
                 "    public Counter counter() {",
                 "        return counterStoreImpl.getState();",
                 "    }",
@@ -249,7 +257,7 @@ public static class CombinedTwoReducers {
                 "        private Counter counter;",
                 "        private TodoList todoList;",
                 "        ",
-                "        public Builder() {",
+                "        private Builder() {",
                 "            middlewares = new ArrayList<>();",
                 "        }",
                 "",

diff --git a/examples/todomvc/src/main/java/info/izumin/android/droidux/example/todomvc/App.java b/examples/todomvc/src/main/java/info/izumin/android/droidux/example/todomvc/App.java
@@ -19,7 +19,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        store = new DroiduxRootStore.Builder()
+        store = DroiduxRootStore.builder()
                 .addMiddleware(new Logger())
                 .setReducer(new TodoListReducer())
                 .setInitialState(new TodoList(new ArrayList<>()))

diff --git a/.../todos-with-undo/src/main/java/info/izumin/android/droidux/example/todoswithundo/App.java b/.../todos-with-undo/src/main/java/info/izumin/android/droidux/example/todoswithundo/App.java
@@ -17,7 +17,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        store = new DroiduxRootStore.Builder()
+        store = DroiduxRootStore.builder()
                 .addMiddleware(new Logger())
                 .setReducer(new TodoListReducer())
                 .setInitialState(new TodoList())

diff --git a/todos-with-dagger/src/main/java/info/izumin/android/droidux/example/todoswithdagger/App.java b/todos-with-dagger/src/main/java/info/izumin/android/droidux/example/todoswithdagger/App.java
@@ -30,7 +30,7 @@ public AppComponent getComponent() {
     }
 
     private void setupStore() {
-        store = new DroiduxRootStore.Builder()
+        store = DroiduxRootStore.builder()
                 .setInitialState(new TodoList())
                 .setReducer(new TodoListReducer())
                 .build();