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

MessagePublishingInterceptor uses MessageBuilder instead of MessageCreator.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-25 15:12:53 +00:00
parent 51eb976236
commit d30fe71dc2
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -18,14 +18,12 @@ package org.springframework.integration.aop;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageCreator;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.util.Assert;
/**
@@ -40,8 +38,6 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
protected final Log logger = LogFactory.getLog(getClass());
private volatile MessageCreator messageCreator;
private volatile MessageChannel defaultChannel;
private volatile PayloadType payloadType = PayloadType.RETURN_VALUE;
@@ -56,16 +52,6 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
this.payloadType = payloadType;
}
/**
* Specify the {@link MessageCreator} to use when creating a message from the
* return value Object.
*
* @param messageCreator the MessageCreator to use
*/
public void setMessageCreator(MessageCreator messageCreator) {
this.messageCreator = messageCreator;
}
/**
* Invoke the target method and publish its return value.
*/
@@ -104,8 +90,9 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
}
}
else {
Message<?> message = (this.messageCreator != null) ?
this.messageCreator.createMessage(payload) : new GenericMessage<Object>(payload);
Message<?> message = (payload instanceof Message)
? (Message<?>) payload
: MessageBuilder.withPayload(payload).build();
channel.send(message);
}
}