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

Refactored MessageConsumer with onMessage to MessageHandler with handleMessage.

Browse Source
This commit is contained in:
Mark Fisher
2008-11-03 14:17:53 +00:00
parent 90dcb7e88b
commit 39a8486ac8
101 changed files with 745 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java → org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
View File

@@ -23,7 +23,7 @@ import org.springframework.core.io.ByteArrayResource;
import org.springframework.integration.adapter.MessageMappingException;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageHandler;
import org.springframework.mail.MailMessage;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender;
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* A {@link MessageConsumer} implementation for sending mail.
* A {@link MessageHandler} implementation for sending mail.
*
* <p>If the Message is an instance of {@link MailMessage}, it will be passed
* as-is. If the Message payload is a byte array, it will be passed as an
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
* @author Marius Bogoevici
* @author Mark Fisher
*/
public class MailSendingMessageConsumer implements MessageConsumer {
public class MailSendingMessageHandler implements MessageHandler {
private final JavaMailSender mailSender;
@@ -58,13 +58,13 @@ public class MailSendingMessageConsumer implements MessageConsumer {
* @param mailSender the {@link JavaMailSender} instance to which this
* adapter will delegate.
*/
public MailSendingMessageConsumer(JavaMailSender mailSender) {
public MailSendingMessageHandler(JavaMailSender mailSender) {
Assert.notNull(mailSender, "'mailSender' must not be null");
this.mailSender = mailSender;
}
public final void onMessage(Message<?> message) {
public final void handleMessage(Message<?> message) {
MailMessage mailMessage = this.convertMessageToMailMessage(message);
if (mailMessage instanceof SimpleMailMessage) {
this.mailSender.send((SimpleMailMessage) mailMessage);

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

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
import org.springframework.integration.mail.MailSendingMessageConsumer;
import org.springframework.integration.mail.MailSendingMessageHandler;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -38,7 +38,7 @@ public class MailOutboundChannelAdapterParser extends AbstractOutboundChannelAda
@Override
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MailSendingMessageConsumer.class);
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MailSendingMessageHandler.class);
String mailSenderRef = element.getAttribute("mail-sender");
String host = element.getAttribute("host");
String port = element.getAttribute("port");

12
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java → org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java
View File

@@ -42,11 +42,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Marius Bogoevici
*/
@RunWith(value = SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:/org/springframework/integration/mail/mailSendingMessageConsumerContextTests.xml"})
public class MailSendingMessageConsumerContextTests {
@ContextConfiguration(locations = {"classpath:/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml"})
public class MailSendingMessageHandlerContextTests {
@Autowired
private MailSendingMessageConsumer consumer;
private MailSendingMessageHandler handler;
@Autowired
private StubJavaMailSender mailSender;
@@ -59,7 +59,7 @@ public class MailSendingMessageConsumerContextTests {
@Test
public void stringMesssagesWithConfiguration() {
this.consumer.onMessage(MailTestsHelper.createIntegrationMessage());
this.handler.handleMessage(MailTestsHelper.createIntegrationMessage());
SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage();
assertEquals("no mime message should have been sent",
0, this.mailSender.getSentMimeMessages().size());
@@ -77,7 +77,7 @@ public class MailSendingMessageConsumerContextTests {
.setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt")
.setHeader(MailHeaders.TO, MailTestsHelper.TO)
.build();
this.consumer.onMessage(message);
this.handler.handleMessage(message);
assertEquals("no mime message should have been sent",
1, this.mailSender.getSentMimeMessages().size());
assertEquals("only one simple message must be sent",
@@ -96,7 +96,7 @@ public class MailSendingMessageConsumerContextTests {
@Test(expected = MessageMappingException.class)
public void byteArrayMessageWithoutAttachmentFileName() throws Exception {
byte[] payload = {1, 2, 3};
this.consumer.onMessage(new GenericMessage<byte[]>(payload));
this.handler.handleMessage(new GenericMessage<byte[]>(payload));
}
}

12
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java → org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java
View File

@@ -37,9 +37,9 @@ import org.springframework.mail.SimpleMailMessage;
/**
* @author Marius Bogoevici
*/
public class MailSendingMessageConsumerTests {
public class MailSendingMessageHandlerTests {
private MailSendingMessageConsumer consumer;
private MailSendingMessageHandler handler;
private StubJavaMailSender mailSender;
@@ -47,7 +47,7 @@ public class MailSendingMessageConsumerTests {
@Before
public void setUp() throws Exception {
this.mailSender = new StubJavaMailSender(new MimeMessage((Session) null));
this.consumer = new MailSendingMessageConsumer(this.mailSender);
this.handler = new MailSendingMessageHandler(this.mailSender);
}
@After
@@ -58,7 +58,7 @@ public class MailSendingMessageConsumerTests {
@Test
public void textMessage() {
this.consumer.onMessage(MailTestsHelper.createIntegrationMessage());
this.handler.handleMessage(MailTestsHelper.createIntegrationMessage());
SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage();
assertEquals("no mime message should have been sent",
0, mailSender.getSentMimeMessages().size());
@@ -76,7 +76,7 @@ public class MailSendingMessageConsumerTests {
.setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt")
.setHeader(MailHeaders.TO, MailTestsHelper.TO)
.build();
this.consumer.onMessage(message);
this.handler.handleMessage(message);
byte[] buffer = new byte[1024];
MimeMessage mimeMessage = this.mailSender.getSentMimeMessages().get(0);
assertTrue("message must be multipart", mimeMessage.getContent() instanceof Multipart);
@@ -90,7 +90,7 @@ public class MailSendingMessageConsumerTests {
@Test
public void mailHeaders() {
this.consumer.onMessage(MailTestsHelper.createIntegrationMessage());
this.handler.handleMessage(MailTestsHelper.createIntegrationMessage());
SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage();
assertEquals("no mime message should have been sent",
0, mailSender.getSentMimeMessages().size());

14
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.mail.MailSendingMessageConsumer;
import org.springframework.integration.mail.MailSendingMessageHandler;
import org.springframework.mail.MailSender;
/**
@@ -36,9 +36,9 @@ public class MailOutboundChannelAdapterParserTests {
ApplicationContext context = new ClassPathXmlApplicationContext(
"mailOutboundChannelAdapterParserTests.xml", this.getClass());
Object adapter = context.getBean("adapterWithMailSenderReference.adapter");
MailSendingMessageConsumer consumer = (MailSendingMessageConsumer)
new DirectFieldAccessor(adapter).getPropertyValue("consumer");
DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(consumer);
MailSendingMessageHandler handler = (MailSendingMessageHandler)
new DirectFieldAccessor(adapter).getPropertyValue("handler");
DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(handler);
MailSender mailSender = (MailSender) fieldAccessor.getPropertyValue("mailSender");
assertNotNull(mailSender);
}
@@ -48,9 +48,9 @@ public class MailOutboundChannelAdapterParserTests {
ApplicationContext context = new ClassPathXmlApplicationContext(
"mailOutboundChannelAdapterParserTests.xml", this.getClass());
Object adapter = context.getBean("adapterWithHostProperty.adapter");
MailSendingMessageConsumer consumer = (MailSendingMessageConsumer)
new DirectFieldAccessor(adapter).getPropertyValue("consumer");
DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(consumer);
MailSendingMessageHandler handler = (MailSendingMessageHandler)
new DirectFieldAccessor(adapter).getPropertyValue("handler");
DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(handler);
MailSender mailSender = (MailSender) fieldAccessor.getPropertyValue("mailSender");
assertNotNull(mailSender);
}

2
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageConsumerContextTests.xml → org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailSendingMessageHandlerContextTests.xml
View File

@@ -15,7 +15,7 @@
</constructor-arg>
</bean>
<bean id="mailSendingMessageConsumer" class="org.springframework.integration.mail.MailSendingMessageConsumer">
<bean id="mailSendingMessageConsumer" class="org.springframework.integration.mail.MailSendingMessageHandler">
<constructor-arg ref="javaMailSender"/>
</bean>