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

INT-776 Renamed 'createHandler' method to 'createMethodInvokingHandler' for clarity and converted template methods to be package-protected.

Browse Source
This commit is contained in:
Mark Fisher
2009-08-28 19:49:19 +00:00
parent d1352a03b8
commit d164e18ed7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractMessageHandlerFactoryBean.java
View File

@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
* @author Mark Fisher
* @author Alexander Peters
*/
public abstract class AbstractMessageHandlerFactoryBean implements FactoryBean<MessageHandler>, BeanFactoryAware {
abstract class AbstractMessageHandlerFactoryBean implements FactoryBean<MessageHandler>, BeanFactoryAware {
private volatile MessageHandler handler;
@@ -118,7 +118,7 @@ public abstract class AbstractMessageHandlerFactoryBean implements FactoryBean<M
if (this.targetObject != null) {
Assert.state(this.expression == null,
"The 'targetObject' and 'expression' properties are mutually exclusive.");
this.handler = this.createHandler(this.targetObject, this.targetMethodName);
this.handler = this.createMethodInvokingHandler(this.targetObject, this.targetMethodName);
}
else if (this.expression != null) {
this.handler = this.createExpressionEvaluatingHandler(this.expression);
@@ -133,13 +133,13 @@ public abstract class AbstractMessageHandlerFactoryBean implements FactoryBean<M
/**
* Subclasses must implement this method to create the MessageHandler.
*/
protected abstract MessageHandler createHandler(Object targetObject, String targetMethodName);
abstract MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName);
protected MessageHandler createExpressionEvaluatingHandler(String expression) {
MessageHandler createExpressionEvaluatingHandler(String expression) {
throw new UnsupportedOperationException(this.getClass().getName() + " does not support expressions.");
}
protected MessageHandler createDefaultHandler() {
MessageHandler createDefaultHandler() {
throw new IllegalArgumentException(
"Exactly one of the 'targetObject' or 'expression' property is required.");
}

2
org.springframework.integration/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
View File

@@ -65,7 +65,7 @@ public class RouterFactoryBean extends AbstractMessageHandlerFactoryBean {
}
@Override
protected MessageHandler createHandler(Object targetObject, String targetMethodName) {
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
Assert.notNull(targetObject, "target object must not be null");
AbstractMessageRouter router = this.createRouter(targetObject, targetMethodName);
if (this.defaultOutputChannel != null) {

6
org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java
View File

@@ -31,7 +31,7 @@ import org.springframework.util.StringUtils;
public class SplitterFactoryBean extends AbstractMessageHandlerFactoryBean {
@Override
protected MessageHandler createHandler(Object targetObject, String targetMethodName) {
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
if (targetObject instanceof AbstractMessageSplitter) {
return (AbstractMessageSplitter) targetObject;
}
@@ -41,12 +41,12 @@ public class SplitterFactoryBean extends AbstractMessageHandlerFactoryBean {
}
@Override
protected MessageHandler createExpressionEvaluatingHandler(String expression) {
MessageHandler createExpressionEvaluatingHandler(String expression) {
return new ExpressionEvaluatingSplitter(expression);
}
@Override
protected MessageHandler createDefaultHandler() {
MessageHandler createDefaultHandler() {
return new DefaultMessageSplitter();
}

4
org.springframework.integration/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java
View File

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
public class TransformerFactoryBean extends AbstractMessageHandlerFactoryBean {
@Override
protected MessageHandler createHandler(Object targetObject, String targetMethodName) {
MessageHandler createMethodInvokingHandler(Object targetObject, String targetMethodName) {
Assert.notNull(targetObject, "targetObject must not be null");
Transformer transformer = null;
if (targetObject instanceof Transformer) {
@@ -53,7 +53,7 @@ public class TransformerFactoryBean extends AbstractMessageHandlerFactoryBean {
}
@Override
protected MessageHandler createExpressionEvaluatingHandler(String expression) {
MessageHandler createExpressionEvaluatingHandler(String expression) {
MessageProcessor processor = new ExpressionEvaluatingMessageProcessor(expression);
Transformer transformer = new MessageProcessingTransformer(processor);
return new MessageTransformingHandler(transformer);