From 5eb87c218e3e530eee46f1f1cc5915222eddb5f1 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 24 Apr 2008 00:08:28 +0000 Subject: [PATCH] MailTargetAdapter is now MailTarget. --- .../adapter/mail/DefaultMailHeaderGenerator.java | 2 +- .../{MailTargetAdapter.java => MailTarget.java} | 4 ++-- .../mail/config/MailTargetAdapterParser.java | 4 ++-- .../mail/MailTargetAdapterContextTests.java | 8 ++++---- .../adapter/mail/MailTargetAdapterTests.java | 16 ++++++++-------- .../config/MailTargetAdapterParserTests.java | 8 ++++---- .../adapter/mail/mailTargetAdapter.xml | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) rename spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/{MailTargetAdapter.java => MailTarget.java} (97%) diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java index 83a6221e51..383a8b60ff 100644 --- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java +++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java @@ -21,7 +21,7 @@ import org.springframework.integration.message.Message; /** * The default implementation of {@link MailHeaderGenerator}. Configures the * {@link org.springframework.mail.MailMessage} properties based on attributes - * provided with known attribute keys as defined in {@link MailTargetAdapter}. + * provided with known attribute keys as defined in {@link MailAttributeKeys}. * * @author Mark Fisher */ diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTargetAdapter.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java similarity index 97% rename from spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTargetAdapter.java rename to spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java index 22e89db3d6..ea2a159682 100644 --- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTargetAdapter.java +++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * @author Marius Bogoevici * @author Mark Fisher */ -public class MailTargetAdapter implements Target, InitializingBean { +public class MailTarget implements Target, InitializingBean { private final JavaMailSender mailSender; @@ -51,7 +51,7 @@ public class MailTargetAdapter implements Target, InitializingBean { * @param mailSender the {@link JavaMailSender} instance to which this * adapter will delegate. */ - public MailTargetAdapter(JavaMailSender mailSender) { + public MailTarget(JavaMailSender mailSender) { Assert.notNull(mailSender, "'mailSender' must not be null"); this.mailSender = mailSender; } diff --git a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParser.java b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParser.java index fd67fafba6..30bf3a7c32 100644 --- a/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParser.java +++ b/spring-integration-adapters/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParser.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.ConfigurationException; -import org.springframework.integration.adapter.mail.MailTargetAdapter; +import org.springframework.integration.adapter.mail.MailTarget; import org.springframework.integration.endpoint.TargetEndpoint; import org.springframework.integration.scheduling.Subscription; import org.springframework.mail.javamail.JavaMailSenderImpl; @@ -51,7 +51,7 @@ public class MailTargetAdapterParser extends AbstractSingleBeanDefinitionParser } protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - RootBeanDefinition adapterDef = new RootBeanDefinition(MailTargetAdapter.class); + RootBeanDefinition adapterDef = new RootBeanDefinition(MailTarget.class); String mailSenderRef = element.getAttribute("mail-sender"); String host = element.getAttribute("host"); String username = element.getAttribute("username"); diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterContextTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterContextTests.java index 6a1706e663..2953f485dd 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterContextTests.java +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterContextTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.adapter.mail.MailTargetAdapter; +import org.springframework.integration.adapter.mail.MailTarget; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.StringMessage; import org.springframework.mail.SimpleMailMessage; @@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class MailTargetAdapterContextTests { @Autowired - private MailTargetAdapter mailTargetAdapter; + private MailTarget mailTarget; @Autowired private StubJavaMailSender mailSender; @@ -59,7 +59,7 @@ public class MailTargetAdapterContextTests { @Test public void testStringMesssagesWithConfiguration() { - this.mailTargetAdapter.send(new StringMessage(MailTestsHelper.MESSAGE_TEXT)); + this.mailTarget.send(new StringMessage(MailTestsHelper.MESSAGE_TEXT)); SimpleMailMessage message = MailTestsHelper.createSimpleMailMessage(); assertEquals("no mime message should have been sent", 0, this.mailSender.getSentMimeMessages().size()); @@ -72,7 +72,7 @@ public class MailTargetAdapterContextTests { @Test public void testByteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - mailTargetAdapter.send(new GenericMessage(payload)); + mailTarget.send(new GenericMessage(payload)); assertEquals("no mime message should have been sent", 1, mailSender.getSentMimeMessages().size()); assertEquals("only one simple message must be sent", diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterTests.java index 9a84a86455..f462f347a5 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterTests.java +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/MailTargetAdapterTests.java @@ -40,7 +40,7 @@ import org.springframework.mail.SimpleMailMessage; */ public class MailTargetAdapterTests { - private MailTargetAdapter mailTargetAdapter; + private MailTarget mailTarget; private StubJavaMailSender mailSender; @@ -57,14 +57,14 @@ public class MailTargetAdapterTests { this.staticMailHeaderGenerator.setReplyTo(MailTestsHelper.REPLY_TO); this.staticMailHeaderGenerator.setSubject(MailTestsHelper.SUBJECT); this.staticMailHeaderGenerator.setTo(MailTestsHelper.TO); - this.mailTargetAdapter = new MailTargetAdapter(this.mailSender); - this.mailTargetAdapter.afterPropertiesSet(); + this.mailTarget = new MailTarget(this.mailSender); + this.mailTarget.afterPropertiesSet(); } @Test public void testTextMessage() { - this.mailTargetAdapter.setHeaderGenerator(this.staticMailHeaderGenerator); - this.mailTargetAdapter.send(new StringMessage(MailTestsHelper.MESSAGE_TEXT)); + this.mailTarget.setHeaderGenerator(this.staticMailHeaderGenerator); + this.mailTarget.send(new StringMessage(MailTestsHelper.MESSAGE_TEXT)); SimpleMailMessage message = MailTestsHelper.createSimpleMailMessage(); assertEquals("no mime message should have been sent", 0, mailSender.getSentMimeMessages().size()); @@ -76,9 +76,9 @@ public class MailTargetAdapterTests { @Test public void testByteArrayMessage() throws Exception { - this.mailTargetAdapter.setHeaderGenerator(this.staticMailHeaderGenerator); + this.mailTarget.setHeaderGenerator(this.staticMailHeaderGenerator); byte[] payload = {1, 2, 3}; - this.mailTargetAdapter.send(new GenericMessage(payload)); + this.mailTarget.send(new GenericMessage(payload)); byte[] buffer = new byte[1024]; MimeMessage mimeMessage = this.mailSender.getSentMimeMessages().get(0); assertTrue("message must be multipart", mimeMessage.getContent() instanceof Multipart); @@ -99,7 +99,7 @@ public class MailTargetAdapterTests { message.getHeader().setAttribute(MailAttributeKeys.BCC, MailTestsHelper.BCC); message.getHeader().setAttribute(MailAttributeKeys.FROM, MailTestsHelper.FROM); message.getHeader().setAttribute(MailAttributeKeys.REPLY_TO, MailTestsHelper.REPLY_TO); - this.mailTargetAdapter.send(message); + this.mailTarget.send(message); SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage(); assertEquals("no mime message should have been sent", 0, mailSender.getSentMimeMessages().size()); diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParserTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParserTests.java index 6b315969af..baf73cfaed 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParserTests.java +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetAdapterParserTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.adapter.mail.MailHeaderGenerator; -import org.springframework.integration.adapter.mail.MailTargetAdapter; +import org.springframework.integration.adapter.mail.MailTarget; import org.springframework.integration.endpoint.TargetEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.Target; @@ -44,7 +44,7 @@ public class MailTargetAdapterParserTests { TargetEndpoint endpoint = (TargetEndpoint) context.getBean("adapterWithMailSenderReference"); Target target = endpoint.getTarget(); assertNotNull(target); - assertTrue(target instanceof MailTargetAdapter); + assertTrue(target instanceof MailTarget); } @Test @@ -54,7 +54,7 @@ public class MailTargetAdapterParserTests { TargetEndpoint endpoint = (TargetEndpoint) context.getBean("adapterWithHostProperty"); Target target = endpoint.getTarget(); assertNotNull(target); - assertTrue(target instanceof MailTargetAdapter); + assertTrue(target instanceof MailTarget); } @Test @@ -64,7 +64,7 @@ public class MailTargetAdapterParserTests { TargetEndpoint endpoint = (TargetEndpoint) context.getBean("adapterWithHeaderGeneratorReference"); Target target = endpoint.getTarget(); assertNotNull(target); - assertTrue(target instanceof MailTargetAdapter); + assertTrue(target instanceof MailTarget); DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(target); MailHeaderGenerator headerGenerator = (MailHeaderGenerator) fieldAccessor.getPropertyValue("mailHeaderGenerator"); diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTargetAdapter.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTargetAdapter.xml index 051d280f22..c2a28ec92f 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTargetAdapter.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/mail/mailTargetAdapter.xml @@ -15,7 +15,7 @@ - +