You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/02/14 17:04:06 UTC
[sling-org-apache-sling-commons-messaging-mail] branch master
updated (f487f36 -> b67038c)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git.
from f487f36 use org.apache.sling.commons.crypto 1.0.0
new 66ae4c2 SLING-8920 Provide a simple API and implementation to build and send mails
new b67038c SLING-9072 Update to Sling Bundle Parent 37
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../sling/commons/messaging/mail/MailService.java | 4 ++--
.../messaging/mail/internal/SimpleMailService.java | 7 +++----
.../messaging/mail/it/tests/SimpleMailServiceIT.java | 18 +++++++++---------
4 files changed, 15 insertions(+), 16 deletions(-)
[sling-org-apache-sling-commons-messaging-mail] 01/02: SLING-8920
Provide a simple API and implementation to build and send mails
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git
commit 66ae4c2cae2c9d2ebaa32fab64010e3a96c5efb8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Feb 14 17:58:45 2020 +0100
SLING-8920 Provide a simple API and implementation to build and send mails
Do not return sent message as result
---
.../sling/commons/messaging/mail/MailService.java | 4 ++--
.../messaging/mail/internal/SimpleMailService.java | 7 +++----
.../messaging/mail/it/tests/SimpleMailServiceIT.java | 18 +++++++++---------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/MailService.java b/src/main/java/org/apache/sling/commons/messaging/mail/MailService.java
index 258b619..f203d8d 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/MailService.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/MailService.java
@@ -27,10 +27,10 @@ import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
-public interface MailService extends MessageService<MimeMessage> {
+public interface MailService extends MessageService<MimeMessage, Void> {
@NotNull MessageBuilder getMessageBuilder();
- @NotNull CompletableFuture<MimeMessage> sendMessage(@NotNull final MimeMessage message);
+ @NotNull CompletableFuture<Void> sendMessage(@NotNull final MimeMessage message);
}
diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
index 3c2c87d..bc459f1 100644
--- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
+++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMailService.java
@@ -165,11 +165,11 @@ public class SimpleMailService implements MailService {
}
@Override
- public @NotNull CompletableFuture<MimeMessage> sendMessage(@NotNull final MimeMessage message) {
- return CompletableFuture.supplyAsync(() -> send(message), runnable -> threadPool.submit(runnable));
+ public @NotNull CompletableFuture<Void> sendMessage(@NotNull final MimeMessage message) {
+ return CompletableFuture.runAsync(() -> send(message), runnable -> threadPool.submit(runnable));
}
- private @NotNull MimeMessage send(@NotNull final MimeMessage message) {
+ private void send(@NotNull final MimeMessage message) {
try {
final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
@@ -188,7 +188,6 @@ public class SimpleMailService implements MailService {
}
logger.debug("sending message '{}'", message.getMessageID());
transport.sendMessage(message, message.getAllRecipients());
- return message;
} finally {
Thread.currentThread().setContextClassLoader(tccl);
}
diff --git a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/SimpleMailServiceIT.java b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/SimpleMailServiceIT.java
index 8eeb27d..2aeab8c 100644
--- a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/SimpleMailServiceIT.java
+++ b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/SimpleMailServiceIT.java
@@ -106,7 +106,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
private GreenMail greenMail;
@Inject
- protected MessageService<MimeMessage> messageService;
+ protected MessageService<MimeMessage, Void> messageService;
@Inject
@Filter(value = "(protocol=SMTPS)")
@@ -200,7 +200,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
final Properties properties = new Properties();
final Session session = Session.getDefaultInstance(properties);
final MimeMessage message = new MimeMessage(session);
- final CompletableFuture<MimeMessage> future = messageService.sendMessage(message);
+ final CompletableFuture<Void> future = messageService.sendMessage(message);
future.get();
}
@@ -219,7 +219,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.text(text)
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -254,7 +254,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.attachment(support, "image/png", "SupportApache-small.png")
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -286,7 +286,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.html(html)
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -320,7 +320,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.attachment(support, "image/png", "SupportApache-small.png")
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -356,7 +356,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.inline(sling, "image/png", "sling")
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -393,7 +393,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.inline(sling, "image/png", "sling")
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
if (local) {
@@ -436,7 +436,7 @@ public class SimpleMailServiceIT extends MailTestSupport {
.text("Testing Connection and Transport Listeners")
.build();
- final CompletableFuture<MimeMessage> future = mailService.sendMessage(message);
+ final CompletableFuture<Void> future = mailService.sendMessage(message);
future.get();
assertThat(unusedCLSR.getReference().getUsingBundles()).isNull();
[sling-org-apache-sling-commons-messaging-mail] 02/02: SLING-9072
Update to Sling Bundle Parent 37
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git
commit b67038ca1ee82b165fc5e3ec34691fb1a11b94ec
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Feb 14 18:03:23 2020 +0100
SLING-9072 Update to Sling Bundle Parent 37
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index db37f41..9571428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>37</version>
<relativePath/>
</parent>