You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/05 14:51:43 UTC
[1/2] camel git commit: [CAMEL-9943] Expose mail session as a URI
option
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 6d8182719 -> 2c2994fdc
refs/heads/master be868f701 -> 75158f549
[CAMEL-9943] Expose mail session as a URI option
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75158f54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75158f54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75158f54
Branch: refs/heads/master
Commit: 75158f5496b3a7c2cd8d31f9c3a34d12444875e9
Parents: be868f7
Author: James Netherton <ja...@gmail.com>
Authored: Thu May 5 09:19:09 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu May 5 16:48:20 2016 +0200
----------------------------------------------------------------------
.../camel/component/mail/MailConfiguration.java | 8 +-
.../mail/MailUsingCustomSessionTest.java | 91 ++++++++++++++++++++
2 files changed, 98 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/75158f54/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index ac1b5ab..a34449f 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -42,7 +42,6 @@ import org.apache.camel.util.jsse.SSLContextParameters;
public class MailConfiguration implements Cloneable {
private ClassLoader applicationClassLoader;
- private Session session;
private Properties javaMailProperties;
private Map<Message.RecipientType, String> recipients = new HashMap<Message.RecipientType, String>();
@@ -60,6 +59,8 @@ public class MailConfiguration implements Cloneable {
private String subject;
@UriParam @Metadata(label = "producer,advanced")
private JavaMailSender javaMailSender;
+ @UriParam(label = "advanced")
+ private Session session;
@UriParam(defaultValue = "true", label = "consumer,advanced")
private boolean mapMailMessage = true;
@UriParam(defaultValue = MailConstants.MAIL_DEFAULT_FROM, label = "producer")
@@ -391,6 +392,11 @@ public class MailConfiguration implements Cloneable {
return session;
}
+ /**
+ * Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where
+ * mail sessions are created and managed by some other resource, such as a JavaEE container.
+ * If this is not specified, Camel automatically creates the mail session for you.
+ */
public void setSession(Session session) {
this.session = session;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/75158f54/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
new file mode 100644
index 0000000..a77aab2
--- /dev/null
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -0,0 +1,91 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.mail.Message;
+import javax.mail.Session;
+
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
+
+public class MailUsingCustomSessionTest extends CamelTestSupport {
+
+ private Session mailSession;
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ Mailbox.clearAll();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+ mailSession = Session.getInstance(new Properties());
+ registry.bind("myCustomMailSession", mailSession);
+ return registry;
+ }
+
+ @Test
+ public void testEndpointConfigurationWithCustomSession() {
+ // Verify that the mail session bound to the bean registry is identical to the session tied to the endpoint configuration
+ assertSame(mailSession, getEndpointMailSession("smtp://james@localhost?session=#myCustomMailSession"));
+ }
+
+ @Test
+ public void testSendAndReceiveMailsWithCustomSession() throws Exception {
+ MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
+ mockEndpoint.expectedBodiesReceived("hello camel!");
+
+ Map<String, Object> headers = new HashMap<>();
+ headers.put("subject", "Hello Camel");
+ template.sendBodyAndHeaders("smtp://james@localhost?session=#myCustomMailSession", "hello camel!", headers);
+
+ mockEndpoint.assertIsSatisfied();
+
+ Mailbox mailbox = Mailbox.get("james@localhost");
+ assertEquals("Expected one mail for james@localhost", 1, mailbox.size());
+
+ Message message = mailbox.get(0);
+ assertEquals("hello camel!", message.getContent());
+ assertEquals("camel@localhost", message.getFrom()[0].toString());
+ }
+
+ private Session getEndpointMailSession(String uri) {
+ MailEndpoint endpoint = context.getEndpoint(uri, MailEndpoint.class);
+ return endpoint.getConfiguration().getSession();
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("pop3://james@localhost?session=#myCustomMailSession&consumer.delay=1000").to("mock:result");
+ }
+ };
+ }
+}
[2/2] camel git commit: [CAMEL-9943] Expose mail session as a URI
option
Posted by da...@apache.org.
[CAMEL-9943] Expose mail session as a URI option
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c2994fd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c2994fd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c2994fd
Branch: refs/heads/camel-2.17.x
Commit: 2c2994fdc46598306bcd030919105a1ea1e3a099
Parents: 6d81827
Author: James Netherton <ja...@gmail.com>
Authored: Thu May 5 09:19:09 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu May 5 16:51:27 2016 +0200
----------------------------------------------------------------------
.../camel/component/mail/MailConfiguration.java | 8 +-
.../mail/MailUsingCustomSessionTest.java | 91 ++++++++++++++++++++
2 files changed, 98 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2c2994fd/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index ac1b5ab..a34449f 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -42,7 +42,6 @@ import org.apache.camel.util.jsse.SSLContextParameters;
public class MailConfiguration implements Cloneable {
private ClassLoader applicationClassLoader;
- private Session session;
private Properties javaMailProperties;
private Map<Message.RecipientType, String> recipients = new HashMap<Message.RecipientType, String>();
@@ -60,6 +59,8 @@ public class MailConfiguration implements Cloneable {
private String subject;
@UriParam @Metadata(label = "producer,advanced")
private JavaMailSender javaMailSender;
+ @UriParam(label = "advanced")
+ private Session session;
@UriParam(defaultValue = "true", label = "consumer,advanced")
private boolean mapMailMessage = true;
@UriParam(defaultValue = MailConstants.MAIL_DEFAULT_FROM, label = "producer")
@@ -391,6 +392,11 @@ public class MailConfiguration implements Cloneable {
return session;
}
+ /**
+ * Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where
+ * mail sessions are created and managed by some other resource, such as a JavaEE container.
+ * If this is not specified, Camel automatically creates the mail session for you.
+ */
public void setSession(Session session) {
this.session = session;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2c2994fd/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
new file mode 100644
index 0000000..a77aab2
--- /dev/null
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -0,0 +1,91 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.mail.Message;
+import javax.mail.Session;
+
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
+
+public class MailUsingCustomSessionTest extends CamelTestSupport {
+
+ private Session mailSession;
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ Mailbox.clearAll();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+ mailSession = Session.getInstance(new Properties());
+ registry.bind("myCustomMailSession", mailSession);
+ return registry;
+ }
+
+ @Test
+ public void testEndpointConfigurationWithCustomSession() {
+ // Verify that the mail session bound to the bean registry is identical to the session tied to the endpoint configuration
+ assertSame(mailSession, getEndpointMailSession("smtp://james@localhost?session=#myCustomMailSession"));
+ }
+
+ @Test
+ public void testSendAndReceiveMailsWithCustomSession() throws Exception {
+ MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
+ mockEndpoint.expectedBodiesReceived("hello camel!");
+
+ Map<String, Object> headers = new HashMap<>();
+ headers.put("subject", "Hello Camel");
+ template.sendBodyAndHeaders("smtp://james@localhost?session=#myCustomMailSession", "hello camel!", headers);
+
+ mockEndpoint.assertIsSatisfied();
+
+ Mailbox mailbox = Mailbox.get("james@localhost");
+ assertEquals("Expected one mail for james@localhost", 1, mailbox.size());
+
+ Message message = mailbox.get(0);
+ assertEquals("hello camel!", message.getContent());
+ assertEquals("camel@localhost", message.getFrom()[0].toString());
+ }
+
+ private Session getEndpointMailSession(String uri) {
+ MailEndpoint endpoint = context.getEndpoint(uri, MailEndpoint.class);
+ return endpoint.getConfiguration().getSession();
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("pop3://james@localhost?session=#myCustomMailSession&consumer.delay=1000").to("mock:result");
+ }
+ };
+ }
+}