Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1270 ExpressionFactoryBean now extends AbstractFactoryBean

Browse Source
This commit is contained in:
Mark Fisher
2010-08-17 19:28:45 +00:00
parent a8fb06ee07
commit 71f78c807e
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-integration-core/src/main/java/org/springframework/integration/config/ExpressionFactoryBean.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.config;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.SpelParserConfiguration;
@@ -29,15 +29,13 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @since 2.0
*/
public class ExpressionFactoryBean implements FactoryBean<Expression> {
public class ExpressionFactoryBean extends AbstractFactoryBean<Expression> {
private final static ExpressionParser DEFAULT_PARSER = new SpelExpressionParser();
private final String expressionString;
private volatile Expression expression;
private volatile ExpressionParser parser = DEFAULT_PARSER;
@@ -52,19 +50,15 @@ public class ExpressionFactoryBean implements FactoryBean<Expression> {
this.parser = new SpelExpressionParser(parserConfiguration);
}
public Expression getObject() throws Exception {
if (this.expression == null) {
this.expression = this.parser.parseExpression(this.expressionString);
}
return this.expression;
}
@Override
public Class<?> getObjectType() {
return (this.expression != null) ? this.expression.getClass() : Expression.class;
return Expression.class;
}
public boolean isSingleton() {
return true;
@Override
protected Expression createInstance() throws Exception {
return this.parser.parseExpression(this.expressionString);
}
}