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

INT-901 removed ReplyMessageHolder and refactored AbstractReplyProducingMessageHandler accordingly

Browse Source
This commit is contained in:
Mark Fisher
2009-12-02 02:37:51 +00:00
parent 40f80d96cb
commit 4a13e38fde
17 changed files with 118 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
View File

@@ -29,7 +29,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.integration.core.Message;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.handler.ReplyMessageHolder;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageHandler;
import org.springframework.integration.message.MessageHandlingException;
@@ -150,7 +149,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
@Override
protected void handleRequestMessage(Message<?> requestMessage, ReplyMessageHolder replyMessageHolder) {
protected Object handleRequestMessage(Message<?> requestMessage) {
Assert.notNull(requestMessage, "message must not be null");
Object payload = requestMessage.getPayload();
Assert.notNull(payload, "message payload must not be null");
@@ -180,14 +179,11 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
if (resultFile != null) {
if (originalFileFromHeader == null && payload instanceof File) {
replyMessageHolder.set(MessageBuilder.withPayload(resultFile)
.setHeader(FileHeaders.ORIGINAL_FILE, (File) payload)
.build());
}
else {
replyMessageHolder.set(resultFile);
return MessageBuilder.withPayload(resultFile)
.setHeader(FileHeaders.ORIGINAL_FILE, (File) payload);
}
}
return resultFile;
}
/**