You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2017/09/30 16:36:30 UTC
svn commit: r1810225 - in /aries/trunk/blueprint/plugin:
blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
Author: alien11689
Date: Sat Sep 30 16:36:29 2017
New Revision: 1810225
URL: http://svn.apache.org/viewvc?rev=1810225&view=rev
Log:
[ARIES-1745] Change property name and convert to boolean
Modified:
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml?rev=1810225&r1=1810224&r2=1810225&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml Sat Sep 30 16:36:29 2017
@@ -55,7 +55,7 @@
</executions>
<configuration>
<customParameters>
- <blueprint.beanFromFactory.name>fromFactoryMethodName</blueprint.beanFromFactory.name>
+ <blueprint.beanFromFactory.nameFromFactoryMethodName>true</blueprint.beanFromFactory.nameFromFactoryMethodName>
</customParameters>
</configuration>
</plugin>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java?rev=1810225&r1=1810224&r2=1810225&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java Sat Sep 30 16:36:29 2017
@@ -26,8 +26,7 @@ import org.apache.aries.blueprint.plugin
import java.lang.reflect.Method;
class BeanFromFactory extends Bean {
- private static final String BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY = "blueprint.beanFromFactory.name";
- private static final String BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY_VALUE = "fromFactoryMethodName";
+ private static final String BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY = "blueprint.beanFromFactory.nameFromFactoryMethodName";
private final Method producingMethod;
BeanFromFactory(Bean factoryBean, Method factoryMethod, ContextEnricher contextEnricher) {
@@ -47,8 +46,8 @@ class BeanFromFactory extends Bean {
}
private boolean shouldGetBeanNameFromMethodName(ContextEnricher contextEnricher) {
- String beanFromFactoryName = contextEnricher.getBlueprintConfiguration().getCustomParameters().get(BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY);
- return BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY_VALUE.equals(beanFromFactoryName);
+ String value = contextEnricher.getBlueprintConfiguration().getCustomParameters().get(BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY);
+ return Boolean.parseBoolean(value);
}
private void setScope(Method factoryMethod) {