From 59fd5cd7356dba8e0d737ae7540c2c5335fce832 Mon Sep 17 00:00:00 2001 From: izumin5210 Date: Sun, 6 Dec 2015 18:50:24 +0900 Subject: [PATCH 1/3] Fix StoreModel --- .../droidux/processor/model/StoreModel.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) 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 index 9f9a9be..58da143 100644 --- 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 @@ -6,7 +6,6 @@ import com.squareup.javapoet.ClassName; import java.util.List; -import java.util.function.Consumer; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; @@ -74,25 +73,22 @@ public StoreMethodModel apply(ExecutableElement input) { }) .toList(); - FluentIterable.from(storeImplModels) - .forEach(new Consumer() { - @Override - public void accept(final StoreImplModel storeImplModel) { - storeImplModel.setIsBindable(FluentIterable.from(methodModels) - .filter(new Predicate() { - @Override - public boolean apply(StoreMethodModel input) { - return ClassName.get(input.getReturnType()).equals(storeImplModel.getState()); - } - }) - .anyMatch(new Predicate() { - @Override - public boolean apply(StoreMethodModel input) { - return input.isBindable(); - } - })); - } - }); + for (final StoreImplModel storeImplModel : storeImplModels) { + storeImplModel.setIsBindable(FluentIterable.from(methodModels) + .filter(new Predicate() { + @Override + public boolean apply(StoreMethodModel input) { + return ClassName.get(input.getReturnType()).equals(storeImplModel.getState()); + } + }) + .anyMatch(new Predicate() { + @Override + public boolean apply(StoreMethodModel input) { + return input.isBindable(); + } + })); + } + this.builderModel = new BuilderModel(this); } From 322ae9b0e8939f3b4bd9dabdbc788c5aa3c13f17 Mon Sep 17 00:00:00 2001 From: izumin5210 Date: Sun, 6 Dec 2015 19:04:16 +0900 Subject: [PATCH 2/3] Fix constructor param of generated class --- .../droidux/processor/generator/StoreClassGenerator.java | 2 +- .../izumin/android/droidux/processor/fixture/Source.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/droidux-processor/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java b/droidux-processor/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java index 27abdb1..d2565b3 100644 --- a/droidux-processor/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java +++ b/droidux-processor/src/main/java/info/izumin/android/droidux/processor/generator/StoreClassGenerator.java @@ -80,7 +80,7 @@ public FieldSpec apply(StoreImplModel input) { private MethodSpec createConstructor() { MethodSpec.Builder builder = MethodSpec.constructorBuilder() .addModifiers(Modifier.PROTECTED) - .addParameter(getParameterSpec(storeModel.getBuilderModel().getClassName())); + .addParameter(getParameterSpec(storeModel.getBuilderModel().getClassName(), Modifier.FINAL)); for (StoreImplModel storeImpl : storeModel.getStoreImplModels()) { builder = builder.addStatement("$N = new $T($N.$N, $N.$N)", 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 index b1352c5..e825c29 100644 --- 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 @@ -113,7 +113,7 @@ public static class Counter { " private final DroiduxRootStore_CounterStoreImpl counterStoreImpl;", " private final Dispatcher dispatcher;", "", - " protected DroiduxRootStore(Builder builder) {", + " protected DroiduxRootStore(final Builder builder) {", " counterStoreImpl= new DroiduxRootStore_CounterStoreImpl(builder.counter, builder.counterReducer);", " dispatcher = new Dispatcher(builder.middlewares, counterStoreImpl);", " for (Middleware middleware : builder.middlewares) {", @@ -211,7 +211,7 @@ public static class BindableCounter { " private final DroiduxRootStore_CounterStoreImpl counterStoreImpl;", " private final Dispatcher dispatcher;", "", - " protected DroiduxRootStore(Builder builder) {", + " protected DroiduxRootStore(final Builder builder) {", " counterStoreImpl = new DroiduxRootStore_CounterStoreImpl(builder.counter, builder.counterReducer);", " counterStoreImpl.addListener(new OnStateChangedListener() {", " @Override", @@ -322,7 +322,7 @@ public static class CombinedTwoReducers { " private final DroiduxRootStore_TodoListStoreImpl todoListStoreImpl;", " private final Dispatcher dispatcher;", "", - " protected DroiduxRootStore(Builder builder) {", + " protected DroiduxRootStore(final Builder builder) {", " counterStoreImpl= new DroiduxRootStore_CounterStoreImpl(builder.counter, builder.counterReducer);", " todoListStoreImpl= new DroiduxRootStore_TodoListStoreImpl(builder.todoList, builder.todoListReducer);", " dispatcher = new Dispatcher(builder.middlewares, counterStoreImpl, todoListStoreImpl);", @@ -453,7 +453,7 @@ public static class CombinedReducerAndBindableReducer { " private final DroiduxRootStore_TodoListStoreImpl todoListStoreImpl;", " private final Dispatcher dispatcher;", "", - " protected DroiduxRootStore(Builder builder) {", + " protected DroiduxRootStore(final Builder builder) {", " counterStoreImpl= new DroiduxRootStore_CounterStoreImpl(builder.counter, builder.counterReducer);", " todoListStoreImpl= new DroiduxRootStore_TodoListStoreImpl(builder.todoList, builder.todoListReducer);", " todoListStoreImpl.addListener(new OnStateChangedListener() {", From 35807dc3626fc566d3c52fb3842f1957ff7376c4 Mon Sep 17 00:00:00 2001 From: izumin5210 Date: Sun, 6 Dec 2015 19:19:16 +0900 Subject: [PATCH 3/3] Fix upload task --- build.gradle | 2 +- droidux-processor/build.gradle | 2 +- droidux/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0d80eec..832fbc9 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ ext { def versionMajor = 0 def versionMinor = 5 def versionPatch = 0 - version = "${versionMajor}.${versionMinor}.${versionPatch}" + versionName = "${versionMajor}.${versionMinor}.${versionPatch}" compileSdkVersion = 23 buildToolsVersion = '23.0.2' diff --git a/droidux-processor/build.gradle b/droidux-processor/build.gradle index 98db7d8..e9bba9b 100644 --- a/droidux-processor/build.gradle +++ b/droidux-processor/build.gradle @@ -34,7 +34,7 @@ publish { userOrg = project_bintray_org groupId = project_group artifactId = 'droidux-processor' - version = project.version + version = project.versionName description = 'Code generator for info.izumin.android.droidux' website = project_url } diff --git a/droidux/build.gradle b/droidux/build.gradle index 99c86ad..569930b 100644 --- a/droidux/build.gradle +++ b/droidux/build.gradle @@ -40,7 +40,7 @@ publish { userOrg = project_bintray_org groupId = project_group artifactId = 'droidux' - version = project.version + version = project.versionName description = '"Predictable state container" implementation, inspired by Redux for JS.' website = project_url }