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 c3c14142e66945ad551312d9ae6d946e0d6728a2 Author: Oliver Lietz <[email protected]> AuthorDate: Sun Jul 18 21:32:21 2021 +0200 [checkstyle] (coding) DeclarationOrder --- .../messaging/mail/internal/SimpleMailService.java | 16 +++++++-------- .../mail/internal/SimpleMessageBuilder.java | 24 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) 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 bc7d5e0..77e6d06 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 @@ -69,6 +69,14 @@ import org.slf4j.LoggerFactory; ) public final class SimpleMailService implements MailService { + private static final String SMTPS_PROTOCOL = "smtps"; + + // https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html + + private static final String MAIL_SMTPS_FROM = "mail.smtps.from"; + + private static final String MESSAGE_ID_HEADER = "Message-ID"; + @Reference( cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC, @@ -110,14 +118,6 @@ public final class SimpleMailService implements MailService { private Session session; - private static final String SMTPS_PROTOCOL = "smtps"; - - // https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html - - private static final String MAIL_SMTPS_FROM = "mail.smtps.from"; - - private static final String MESSAGE_ID_HEADER = "Message-ID"; - private final Logger logger = LoggerFactory.getLogger(SimpleMailService.class); public SimpleMailService() { // diff --git a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java index 62679cc..1270f37 100644 --- a/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java +++ b/src/main/java/org/apache/sling/commons/messaging/mail/internal/SimpleMessageBuilder.java @@ -49,6 +49,18 @@ import org.jetbrains.annotations.Nullable; public final class SimpleMessageBuilder implements MessageBuilder { + private static final String CONTENT_TYPE_TEXT_HTML = "text/html; charset=utf-8"; + + private static final String CONTENT_TYPE_TEXT_PLAIN = "text/plain; charset=utf-8"; + + private static final String CHARSET_UTF8 = "utf-8"; + + private static final String MULTIPART_SUBTYPE_MIXED = "mixed"; + + private static final String MULTIPART_SUBTYPE_ALTERNATIVE = "alternative"; + + private static final String MULTIPART_SUBTYPE_RELATED = "related"; + private final Session session; private final List<Header> headers = new LinkedList<>(); @@ -73,18 +85,6 @@ public final class SimpleMessageBuilder implements MessageBuilder { private final List<Inline> inlines = new LinkedList<>(); - private static final String CONTENT_TYPE_TEXT_HTML = "text/html; charset=utf-8"; - - private static final String CONTENT_TYPE_TEXT_PLAIN = "text/plain; charset=utf-8"; - - private static final String CHARSET_UTF8 = "utf-8"; - - private static final String MULTIPART_SUBTYPE_MIXED = "mixed"; - - private static final String MULTIPART_SUBTYPE_ALTERNATIVE = "alternative"; - - private static final String MULTIPART_SUBTYPE_RELATED = "related"; - SimpleMessageBuilder(@NotNull final Session session) { this.session = session; }
