Fixes #434: Regression bug: Email parameter missing in CustomMailer interface

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/mailer/CustomMailer.java

@@ -3,6 +3,7 @@
 import jakarta.mail.Session;
 import jakarta.mail.internet.MimeMessage;
 import org.jetbrains.annotations.NotNull;
+import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.mailer.config.OperationalConfig;
 
 /**
@@ -13,10 +14,11 @@
  * configuring a {@code Session} instance, producing a {@code MimeMessage}, all with full S/MIME, DKIM support and everything else.
  * <p>
  * <strong>Note:</strong> in this mode, proxy support is turned off assuming it is handled by the custom mailer as well.
+ * <strong>Note:</strong> in this mode, the batch-module (SMTP cluster(s) / smtp connection pooling) won't be used either.
  *
  * @see MailerGenericBuilder#withCustomMailer(CustomMailer)
  */
 public interface CustomMailer {
 	void testConnection(@NotNull OperationalConfig operationalConfig, @NotNull Session session);
-	void sendMessage(@NotNull OperationalConfig operationalConfig, @NotNull Session session, MimeMessage mimeMessage);
+	void sendMessage(@NotNull OperationalConfig operationalConfig, @NotNull Session session, @NotNull Email email, @NotNull MimeMessage message);
 }

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/SendMailClosure.java

@@ -47,7 +47,7 @@ public void executeClosure() {
 				LOGGER.info("TRANSPORT_MODE_LOGGING_ONLY: skipping actual sending...");
 			} else if (operationalConfig.getCustomMailer() != null) {
 				val message = SessionBasedEmailToMimeMessageConverter.convertAndLogMimeMessage(session, email);
-				operationalConfig.getCustomMailer().sendMessage(operationalConfig, session, message);
+				operationalConfig.getCustomMailer().sendMessage(operationalConfig, session, email, message);
 			} else {
 				TransportRunner.sendMessage(operationalConfig.getClusterKey(), session, email);
 			}

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerInjectionScanTest.java

@@ -50,7 +50,7 @@ public void testCustomMailer_sendEmail_dontFailOn_injectionAttackOrInvalidAddres
 				.disablingAllClientValidation(true).buildMailer()
 				.sendMail(email);
 
-		verify(customMailerMock).sendMessage(any(OperationalConfig.class), any(Session.class), any(MimeMessage.class));
+		verify(customMailerMock).sendMessage(any(OperationalConfig.class), any(Session.class), any(Email.class), any(MimeMessage.class));
 		verifyNoMoreInteractions(customMailerMock);
 	}
 

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerTest.java

@@ -401,7 +401,7 @@ public void testCustomMailer_sendEmail() throws IOException {
 
 		getMailerWithCustomMailer(customMailerMock).sendMail(email);
 
-		verify(customMailerMock).sendMessage(any(OperationalConfig.class), any(Session.class), any(MimeMessage.class));
+		verify(customMailerMock).sendMessage(any(OperationalConfig.class), any(Session.class), any(Email.class), any(MimeMessage.class));
 		verifyNoMoreInteractions(customMailerMock);
 	}
 

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/ResultHandlingTest.java

@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
+import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.mailer.CustomMailer;
 import org.simplejavamail.api.mailer.config.OperationalConfig;
 import org.simplejavamail.email.EmailBuilder;
@@ -139,7 +140,7 @@ public void testConnection(@NotNull final OperationalConfig operationalConfig, @
 		}
 
 		@Override
-		public void sendMessage(@NotNull OperationalConfig operationalConfig, @NotNull Session session, MimeMessage mimeMessage) {
+		public void sendMessage(@NotNull OperationalConfig operationalConfig, @NotNull Session session, @NotNull Email email, @NotNull MimeMessage message) {
 			if (!shouldSendSuccesfully) {
 				throw new RuntimeException("simulating fail...");
 			}