From a76902ac6a1cf0a2ec9d10f8cec6b89970c6a5ab Mon Sep 17 00:00:00 2001
From: Vadim Dubs <catofflames@gmail.com>
Date: Thu, 19 Jan 2017 18:32:13 +0600
Subject: [PATCH] Version 1.3.5

---
 flower-core/pom.xml                           |  4 +--
 flower-spring/pom.xml                         |  4 +--
 .../impl/DefaultActionDefinitionFactory.java  | 22 +++++++--------
 .../spring/impl/DefaultActionFactory.java     |  6 ++--
 .../spring/impl/DefaultExtensionFactory.java  | 13 ++++++---
 .../spring/impl/DefaultFeatureFactory.java    |  6 ++--
 .../spring/impl/MiddlewareDefinition.java     | 23 +++++++--------
 .../spring/impl/flows/AsyncFlowFactory.java   |  7 ++++-
 .../spring/impl/flows/SyncFlowFactory.java    |  4 ++-
 .../selectors/KeywordSelectorFactory.java     |  4 ++-
 .../test/resources/application-context.xml    | 12 ++++----
 .../test/resources/features/email-feature.xml | 28 +++++++++----------
 .../test/resources/features/sms-feature.xml   | 22 +++++++--------
 flower-tools/pom.xml                          |  2 +-
 pom.xml                                       |  2 +-
 15 files changed, 89 insertions(+), 70 deletions(-)

diff --git a/flower-core/pom.xml b/flower-core/pom.xml
index 7117993..7d4ef67 100644
--- a/flower-core/pom.xml
+++ b/flower-core/pom.xml
@@ -9,14 +9,14 @@
         <groupId>com.github.xdcrafts</groupId>
         <artifactId>flower</artifactId>
         <relativePath>..</relativePath>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.github.xdcrafts</groupId>
             <artifactId>flower-tools</artifactId>
-            <version>1.3.4</version>
+            <version>1.3.5</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/flower-spring/pom.xml b/flower-spring/pom.xml
index 5502c1d..5db7ab1 100644
--- a/flower-spring/pom.xml
+++ b/flower-spring/pom.xml
@@ -9,14 +9,14 @@
         <groupId>com.github.xdcrafts</groupId>
         <artifactId>flower</artifactId>
         <relativePath>..</relativePath>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.github.xdcrafts</groupId>
             <artifactId>flower-core</artifactId>
-            <version>1.3.4</version>
+            <version>1.3.5</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionDefinitionFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionDefinitionFactory.java
index 442b6d8..91a4172 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionDefinitionFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionDefinitionFactory.java
@@ -17,8 +17,9 @@
 package com.github.xdcrafts.flower.spring.impl;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
@@ -31,16 +32,15 @@
  */
 public class DefaultActionDefinitionFactory implements BeanDefinitionRegistryPostProcessor {
 
-    private final String namespace;
-    private final Map<String, String> actions;
+    private String namespace;
+    private Map<String, String> actions;
 
-    public DefaultActionDefinitionFactory(Map<String, String> actions) {
-        this.namespace = null;
-        this.actions = actions;
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
     }
 
-    public DefaultActionDefinitionFactory(String namespace, Map<String, String> actions) {
-        this.namespace = namespace;
+    @Required
+    public void setActions(Map<String, String> actions) {
         this.actions = actions;
     }
 
@@ -50,11 +50,11 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
             final String name = entry.getKey();
             final String qualifiedName = Named.qualifiedName(this.namespace, name);
             final Object method = entry.getValue();
-            final ConstructorArgumentValues constructorArgumentValues = new ConstructorArgumentValues();
-            constructorArgumentValues.addGenericArgumentValue(method);
+            final MutablePropertyValues propertyValues = new MutablePropertyValues();
+            propertyValues.add("method", method);
             final GenericBeanDefinition beanDefinition = new GenericBeanDefinition();
             beanDefinition.setBeanClass(DefaultActionFactory.class);
-            beanDefinition.setConstructorArgumentValues(constructorArgumentValues);
+            beanDefinition.setPropertyValues(propertyValues);
             registry.registerBeanDefinition(qualifiedName, beanDefinition);
         });
     }
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionFactory.java
index a48e0cf..64c530e 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultActionFactory.java
@@ -17,6 +17,7 @@
 package com.github.xdcrafts.flower.spring.impl;
 
 import com.github.xdcrafts.flower.core.impl.actions.DefaultAction;
+import org.springframework.beans.factory.annotation.Required;
 
 /**
  * Spring factory bean for default action that uses bean name as action name.
@@ -25,9 +26,10 @@
 public class DefaultActionFactory
     extends AbstractActionFactoryBean<DefaultAction> {
 
-    private final String method;
+    private String method;
 
-    public DefaultActionFactory(String method) {
+    @Required
+    public void setMethod(String method) {
         this.method = method;
     }
 
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultExtensionFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultExtensionFactory.java
index eccb05f..18d22bb 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultExtensionFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultExtensionFactory.java
@@ -20,6 +20,7 @@
 import com.github.xdcrafts.flower.core.Middleware;
 import com.github.xdcrafts.flower.core.impl.actions.DefaultAction;
 import com.github.xdcrafts.flower.core.impl.extensions.DefaultExtension;
+import org.springframework.beans.factory.annotation.Required;
 
 import java.security.SecureRandom;
 import java.util.Collections;
@@ -34,17 +35,21 @@ public class DefaultExtensionFactory extends AbstractActionFactoryBean<DefaultEx
 
     private static final SecureRandom RANDOM = new SecureRandom();
 
-    private final Object action;
-    private final Map configuration;
-
+    private Object action;
+    private Map configuration;
     private MiddlewareDefinition middleware;
 
     public void setMiddleware(MiddlewareDefinition middleware) {
         this.middleware = middleware;
     }
 
-    public DefaultExtensionFactory(Object action, Map configuration) {
+    @Required
+    public void setAction(Object action) {
         this.action = action;
+    }
+
+    @Required
+    public void setConfiguration(Map configuration) {
         this.configuration = configuration;
     }
 
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultFeatureFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultFeatureFactory.java
index 7113b8b..75435ce 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultFeatureFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/DefaultFeatureFactory.java
@@ -19,6 +19,7 @@
 import com.github.xdcrafts.flower.core.Extension;
 import com.github.xdcrafts.flower.core.Selector;
 import com.github.xdcrafts.flower.core.impl.DefaultFeature;
+import org.springframework.beans.factory.annotation.Required;
 
 import java.util.Map;
 
@@ -27,9 +28,10 @@
  */
 public class DefaultFeatureFactory extends AbstractNameAwareFactoryBean<DefaultFeature> {
 
-    private final Map<Extension, Selector> extensions;
+    private Map<Extension, Selector> extensions;
 
-    public DefaultFeatureFactory(Map<Extension, Selector> extensions) {
+    @Required
+    public void setExtensions(Map<Extension, Selector> extensions) {
         this.extensions = extensions;
     }
 
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/MiddlewareDefinition.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/MiddlewareDefinition.java
index 29b6bbf..4df7200 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/MiddlewareDefinition.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/MiddlewareDefinition.java
@@ -17,6 +17,7 @@
 package com.github.xdcrafts.flower.spring.impl;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import com.github.xdcrafts.flower.core.Middleware;
@@ -38,24 +39,24 @@ private static List<String> split(String string) {
         return Arrays.stream(string.split(SPLITTER_REGEX)).map(String::trim).collect(Collectors.toList());
     }
 
-    private final boolean shared;
-    private final String namespace;
-    private final Map<String, String> rawDefinition;
+    private boolean shared = true;
+    private String namespace;
+    private Map<String, String> rawDefinition;
     private Map<String, List<Middleware>> definition;
 
-    public MiddlewareDefinition(boolean shared, Map<String, String> definition) {
-        this(shared, null, definition);
+    public void setShared(boolean shared) {
+        this.shared = shared;
     }
 
-    public MiddlewareDefinition(boolean shared, String namespace, Map<String, String> definition) {
-        if (definition == null) {
-            throw new IllegalArgumentException("'definition' can not be null.");
-        }
-        this.shared = shared;
-        this.rawDefinition = definition;
+    public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
+    @Required
+    public void setDefinition(Map<String, String> definition) {
+        this.rawDefinition = definition;
+    }
+
     public boolean isShared() {
         return shared;
     }
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/AsyncFlowFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/AsyncFlowFactory.java
index fb24d65..f03d6a0 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/AsyncFlowFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/AsyncFlowFactory.java
@@ -17,6 +17,7 @@
 package com.github.xdcrafts.flower.spring.impl.flows;
 
 import com.github.xdcrafts.flower.core.impl.flows.AsyncFlow;
+import org.springframework.beans.factory.annotation.Required;
 
 import java.util.List;
 import java.util.Map;
@@ -30,8 +31,12 @@ public class AsyncFlowFactory extends AbstractFlowFactoryBean<AsyncFlow> {
     private List<Object> actions;
     private Map configuration;
 
-    public AsyncFlowFactory(List<Object> actions, Map configuration) {
+    public void setActions(List<Object> actions) {
         this.actions = actions;
+    }
+
+    @Required
+    public void setConfiguration(Map configuration) {
         this.configuration = configuration;
     }
 
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/SyncFlowFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/SyncFlowFactory.java
index 8dc70d8..e171951 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/SyncFlowFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/flows/SyncFlowFactory.java
@@ -17,6 +17,7 @@
 package com.github.xdcrafts.flower.spring.impl.flows;
 
 import com.github.xdcrafts.flower.core.impl.flows.SyncFlow;
+import org.springframework.beans.factory.annotation.Required;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -28,7 +29,8 @@ public class SyncFlowFactory extends AbstractFlowFactoryBean<SyncFlow> {
 
     private List<Object> actions;
 
-    public SyncFlowFactory(List<Object> actions) {
+    @Required
+    public void setActions(List<Object> actions) {
         this.actions = actions;
     }
 
diff --git a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/selectors/KeywordSelectorFactory.java b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/selectors/KeywordSelectorFactory.java
index e0b9134..344969d 100644
--- a/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/selectors/KeywordSelectorFactory.java
+++ b/flower-spring/src/main/java/com/github/xdcrafts/flower/spring/impl/selectors/KeywordSelectorFactory.java
@@ -18,6 +18,7 @@
 
 import com.github.xdcrafts.flower.core.impl.selectors.KeywordSelector;
 import com.github.xdcrafts.flower.spring.impl.AbstractActionFactoryBean;
+import org.springframework.beans.factory.annotation.Required;
 
 /**
  * KeywordSelector factory bean.
@@ -26,7 +27,8 @@ public class KeywordSelectorFactory extends AbstractActionFactoryBean<KeywordSel
 
     private String keyword;
 
-    public KeywordSelectorFactory(String keyword) {
+    @Required
+    public void setKeyword(String keyword) {
         this.keyword = keyword;
     }
 
diff --git a/flower-spring/src/test/resources/application-context.xml b/flower-spring/src/test/resources/application-context.xml
index 344a787..dcc7f6c 100644
--- a/flower-spring/src/test/resources/application-context.xml
+++ b/flower-spring/src/test/resources/application-context.xml
@@ -78,12 +78,12 @@
     <!--                                  Middleware start                                                       -->
 
     <bean class="com.github.xdcrafts.flower.spring.impl.MiddlewareDefinition">
-        <constructor-arg name="shared" value="true"/>
-        <constructor-arg name="definition">
+        <property name="shared" value="true"/>
+        <property name="definition">
             <map>
                 <entry key="selector" value="loggingMiddleware"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Middleware end                                                         -->
@@ -91,7 +91,7 @@
     <!--                                  Actions start                                                          -->
 
     <bean id="selector" class="com.github.xdcrafts.flower.spring.impl.selectors.KeywordSelectorFactory">
-        <constructor-arg name="keyword" value="request.type"/>
+        <property name="keyword" value="request.type"/>
     </bean>
 
     <!--                                  Actions end                                                            -->
@@ -99,13 +99,13 @@
     <!--                                  Flows start                                                            -->
 
     <bean id="mainFlow" class="com.github.xdcrafts.flower.spring.impl.flows.SyncFlowFactory">
-        <constructor-arg name="actions">
+        <property name="actions">
             <list>
                 <value>authenticator::authenticate</value>
                 <ref bean="selector"/>
                 <value>receiver::receive</value>
             </list>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Flows end                                                              -->
diff --git a/flower-spring/src/test/resources/features/email-feature.xml b/flower-spring/src/test/resources/features/email-feature.xml
index 642905e..d76804d 100644
--- a/flower-spring/src/test/resources/features/email-feature.xml
+++ b/flower-spring/src/test/resources/features/email-feature.xml
@@ -37,13 +37,13 @@
     <!--                                  Middleware start                                                       -->
 
     <bean class="com.github.xdcrafts.flower.spring.impl.MiddlewareDefinition">
-        <constructor-arg name="shared" value="true"/>
-        <constructor-arg name="namespace" value="email"/>
-        <constructor-arg name="definition">
+        <property name="shared" value="true"/>
+        <property name="namespace" value="email"/>
+        <property name="definition">
             <map>
                 <entry key="Validate, Authorize, Send" value="loggingMiddleware"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Middleware end                                                         -->
@@ -51,14 +51,14 @@
     <!--                                  Actions start                                                          -->
 
     <bean class="com.github.xdcrafts.flower.spring.impl.DefaultActionDefinitionFactory">
-        <constructor-arg name="namespace" value="email"/>
-        <constructor-arg name="actions">
+        <property name="namespace" value="email"/>
+        <property name="actions">
             <map>
                 <entry key="Validate" value="email.RequestValidator::validate"/>
                 <entry key="Authorize" value="email.Authorizer::authorize"/>
                 <entry key="Send" value="email.Sender::send"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Actions end                                                            -->
@@ -66,13 +66,13 @@
     <!--                                  Flows start                                                            -->
 
     <bean id="email.Flow" class="com.github.xdcrafts.flower.spring.impl.flows.SyncFlowFactory">
-        <constructor-arg name="actions">
+        <property name="actions">
             <list>
                 <ref bean="email.Validate"/>
                 <ref bean="email.Authorize"/>
                 <ref bean="email.Send"/>
             </list>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Flows end                                                              -->
@@ -80,22 +80,22 @@
     <!--                                  Extensions start                                                       -->
 
     <bean id="email.Extension" class="com.github.xdcrafts.flower.spring.impl.DefaultExtensionFactory">
-        <constructor-arg name="action" ref="email.Flow"/>
-        <constructor-arg name="configuration">
+        <property name="action" ref="email.Flow"/>
+        <property name="configuration">
             <map>
                 <entry key="keyword-value" value="email"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Extensions end                                                         -->
 
     <bean id="email.Feature" class="com.github.xdcrafts.flower.spring.impl.DefaultFeatureFactory">
-        <constructor-arg name="extensions">
+        <property name="extensions">
             <map>
                 <entry key-ref="email.Extension" value-ref="selector"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
 </beans>
diff --git a/flower-spring/src/test/resources/features/sms-feature.xml b/flower-spring/src/test/resources/features/sms-feature.xml
index d1ca6cc..9b3a295 100644
--- a/flower-spring/src/test/resources/features/sms-feature.xml
+++ b/flower-spring/src/test/resources/features/sms-feature.xml
@@ -19,13 +19,13 @@
     <!--                                  Middleware start                                                       -->
 
     <bean id="sms.FlowMiddleware" class="com.github.xdcrafts.flower.spring.impl.MiddlewareDefinition">
-        <constructor-arg name="shared" value="false"/>
-        <constructor-arg name="namespace" value="sms"/>
-        <constructor-arg name="definition">
+        <property name="shared" value="false"/>
+        <property name="namespace" value="sms"/>
+        <property name="definition">
             <map>
                 <entry key="RequestValidator::validate, Authorizer::authorize, Sender::send" value="loggingMiddleware"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Middleware end                                                         -->
@@ -33,13 +33,13 @@
     <!--                                  Flows start                                                            -->
 
     <bean id="sms.Flow" class="com.github.xdcrafts.flower.spring.impl.flows.SyncFlowFactory">
-        <constructor-arg name="actions">
+        <property name="actions">
             <list>
                 <value>sms.RequestValidator::validate</value>
                 <value>sms.Authorizer::authorize</value>
                 <value>sms.Sender::send</value>
             </list>
-        </constructor-arg>
+        </property>
         <property name="middleware" ref="sms.FlowMiddleware"/>
     </bean>
 
@@ -48,22 +48,22 @@
     <!--                                  Extensions start                                                       -->
 
     <bean id="sms.Extension" class="com.github.xdcrafts.flower.spring.impl.DefaultExtensionFactory">
-        <constructor-arg name="action" ref="sms.Flow"/>
-        <constructor-arg name="configuration">
+        <property name="action" ref="sms.Flow"/>
+        <property name="configuration">
             <map>
                 <entry key="keyword-value" value="sms"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
     <!--                                  Extensions end                                                         -->
 
     <bean id="sms.Feature" class="com.github.xdcrafts.flower.spring.impl.DefaultFeatureFactory">
-        <constructor-arg name="extensions">
+        <property name="extensions">
             <map>
                 <entry key-ref="sms.Extension" value-ref="selector"/>
             </map>
-        </constructor-arg>
+        </property>
     </bean>
 
 </beans>
diff --git a/flower-tools/pom.xml b/flower-tools/pom.xml
index e856c1e..c1b326f 100644
--- a/flower-tools/pom.xml
+++ b/flower-tools/pom.xml
@@ -9,7 +9,7 @@
         <groupId>com.github.xdcrafts</groupId>
         <artifactId>flower</artifactId>
         <relativePath>..</relativePath>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 12314db..6a8408c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.github.xdcrafts</groupId>
     <artifactId>flower</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Data-driven workflows with Java.</description>
     <url>https://github.com/xdcrafts/flower</url>