You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2012/01/22 22:22:50 UTC
svn commit: r1234613 - in
/camel/branches/camel-2.8.x/components/camel-mail/src:
main/java/org/apache/camel/component/mail/
test/java/org/apache/camel/component/mail/
Author: cmueller
Date: Sun Jan 22 21:22:50 2012
New Revision: 1234613
URL: http://svn.apache.org/viewvc?rev=1234613&view=rev
Log:
CAMEL-4804: Add replyTo option to camel mail component
Added:
camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
Modified:
camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
Modified: camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1234613&r1=1234612&r2=1234613&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Sun Jan 22 21:22:50 2012
@@ -82,7 +82,17 @@ public class MailBinding {
// fallback to endpoint configuration
setRecipientFromEndpointConfiguration(mimeMessage, endpoint);
}
-
+
+ // set the replyTo if it was passed in as an option in the uri. Note: if it is in both the URI
+ // and headers the headers win.
+ String replyTo = exchange.getIn().getHeader("Reply-To", String.class);
+ if (replyTo == null) {
+ replyTo = endpoint.getConfiguration().getReplyTo();
+ }
+ if (replyTo != null) {
+ mimeMessage.setReplyTo(new InternetAddress[]{new InternetAddress(replyTo)});
+ }
+
// must have at least one recipients otherwise we do not know where to send the mail
if (mimeMessage.getAllRecipients() == null) {
throw new IllegalArgumentException("The mail message does not have any recipients set.");
Modified: camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=1234613&r1=1234612&r2=1234613&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java (original)
+++ camel/branches/camel-2.8.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java Sun Jan 22 21:22:50 2012
@@ -54,6 +54,7 @@ public class MailConfiguration implement
private boolean unseen = true;
private boolean ignoreUriScheme;
private Map<Message.RecipientType, String> recipients = new HashMap<Message.RecipientType, String>();
+ private String replyTo;
private int fetchSize = -1;
private boolean debugMode;
private long connectionTimeout = MailConstants.MAIL_DEFAULT_CONNECTION_TIMEOUT;
@@ -399,6 +400,14 @@ public class MailConfiguration implement
public Map<Message.RecipientType, String> getRecipients() {
return recipients;
}
+
+ public String getReplyTo() {
+ return replyTo;
+ }
+
+ public void setReplyTo(String replyTo) {
+ this.replyTo = replyTo;
+ }
public int getFetchSize() {
return fetchSize;
Added: camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java?rev=1234613&view=auto
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java (added)
+++ camel/branches/camel-2.8.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java Sun Jan 22 21:22:50 2012
@@ -0,0 +1,88 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import javax.mail.internet.InternetAddress;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
+
+/**
+ * Unit test for Mail replyTo support.
+ */
+public class MailReplyToTest extends CamelTestSupport {
+
+ @Test
+ public void testMailReplyTo() throws Exception {
+ Mailbox.clearAll();
+
+ String body = "The Camel riders";
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived("Reply-To", "noReply@localhost");
+ mock.expectedBodiesReceived(body);
+
+ template.sendBodyAndHeader("direct:a", body, "Reply-To", "noReply@localhost");
+
+ mock.assertIsSatisfied();
+
+ Mailbox mailbox = Mailbox.get("christian@localhost");
+ assertEquals(1, mailbox.size());
+ assertEquals("noReply@localhost", ((InternetAddress) mailbox.get(0).getReplyTo()[0]).getAddress());
+ assertEquals(body, mailbox.get(0).getContent());
+ }
+
+ @Test
+ public void testMailReplyTo2() throws Exception {
+ Mailbox.clearAll();
+
+ String body = "The Camel riders";
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived("Reply-To", "noReply@localhost");
+ mock.expectedBodiesReceived(body);
+
+ template.sendBody("direct:b", body);
+
+ mock.assertIsSatisfied();
+
+ Mailbox mailbox = Mailbox.get("christian@localhost");
+ assertEquals(1, mailbox.size());
+ assertEquals("noReply@localhost", ((InternetAddress) mailbox.get(0).getReplyTo()[0]).getAddress());
+ assertEquals(body, mailbox.get(0).getContent());
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:a")
+ .to("smtp://christian@localhost?subject=Camel");
+
+ from("direct:b")
+ .to("smtp://christian@localhost?subject=Camel&replyTo=noReply@localhost");
+
+ from("pop3://localhost?username=christian&password=secret&consumer.delay=1000")
+ .to("mock:result");
+ }
+ };
+ }
+}