Fix code smells

micronaut-projects · Jul 21, 2023 · 1d8a179 · 1d8a179
1 parent acae562
commit 1d8a179
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/email-amazon-ses/src/main/java/io/micronaut/email/ses/SesEmailComposer.java b/email-amazon-ses/src/main/java/io/micronaut/email/ses/SesEmailComposer.java
@@ -43,8 +43,6 @@
 import java.nio.ByteBuffer;
 import java.util.Properties;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * @author Sergio del Amo
  * @since 1.0.0
@@ -100,7 +98,7 @@ private SendEmailRequest sendEmailRequest(@NonNull Email email) {
                 .message(message(email));
         if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
             requestBuilder = requestBuilder.replyToAddresses(
-                email.getReplyToCollection().stream().map(Contact::getEmail).collect(toList()));
+                email.getReplyToCollection().stream().map(Contact::getEmail).toList());
         }
         return requestBuilder.build();
     }

diff --git a/email-mailjet/src/main/java/io/micronaut/email/mailjet/MailjetEmailComposer.java b/email-mailjet/src/main/java/io/micronaut/email/mailjet/MailjetEmailComposer.java
@@ -53,10 +53,8 @@ public MailjetRequest compose(@NonNull @NotNull @Valid Email email) throws Email
         JSONObject message = new JSONObject();
         message.put(Emailv31.Message.FROM, createJsonObject(email.getFrom()));
         if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
-            if (email.getReplyToCollection().size() > 1) {
-                if (LOG.isWarnEnabled()) {
-                    LOG.warn("Mailjet does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
-                }
+            if (email.getReplyToCollection().size() > 1 && LOG.isWarnEnabled()) {
+                LOG.warn("Mailjet does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
             }
             message.put(Emailv31.Message.REPLYTO, createJsonObject(CollectionUtils.last(email.getReplyToCollection())));
         }

diff --git a/email-postmark/src/main/java/io/micronaut/email/postmark/PostmarkEmailComposer.java b/email-postmark/src/main/java/io/micronaut/email/postmark/PostmarkEmailComposer.java
@@ -66,10 +66,8 @@ public Message compose(@NonNull @NotNull @Valid Email email) throws EmailExcepti
             message.setTo(email.getTo().stream().map(Contact::getEmail).collect(Collectors.toList()));
         }
         if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
-            if (email.getReplyToCollection().size() > 1) {
-                if (LOG.isWarnEnabled()) {
-                    LOG.warn("Postmark does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
-                }
+            if (email.getReplyToCollection().size() > 1 && LOG.isWarnEnabled()) {
+                LOG.warn("Postmark does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
             }
             message.setReplyTo(CollectionUtils.last(email.getReplyToCollection()).getEmail());
         }

diff --git a/email-sendgrid/src/main/java/io/micronaut/email/sendgrid/SendgridEmailComposer.java b/email-sendgrid/src/main/java/io/micronaut/email/sendgrid/SendgridEmailComposer.java
@@ -82,10 +82,8 @@ private Mail createMail(@NonNull Email email) {
     private Optional<com.sendgrid.helpers.mail.objects.Email> createReplyTo(@NonNull Email email) {
         if (CollectionUtils.isEmpty(email.getReplyToCollection())) {
             return Optional.empty();
-        } else if (email.getReplyToCollection().size() > 1) {
-            if (LOG.isWarnEnabled()) {
-                LOG.warn("Sendgrid does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
-            }
+        } else if (email.getReplyToCollection().size() > 1 && LOG.isWarnEnabled()) {
+            LOG.warn("Sendgrid does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
         }
         final Contact contact = CollectionUtils.last(email.getReplyToCollection());
         com.sendgrid.helpers.mail.objects.Email replyTo = new com.sendgrid.helpers.mail.objects.Email();