Fixed default ignoreDefaults setting anywhere a builder was created internally (for example when converting an Outlook message to Email)

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/internal/general/EmailPopulatingBuilderFactory.java

@@ -3,8 +3,8 @@
 import org.simplejavamail.api.email.EmailPopulatingBuilder;
 
 /**
- * This factory allows modules to create new builders. This is pretty rare as they get the current builder along already, but in case of nested Outlook emails for example, we need a new clean
- * builder to construct a new Email object with.
+ * This factory allows modules to create new builders. This use case is pretty rare as modules get the current builder along already,
+ * but in case of nested Outlook emails for example, we need a new clean builder to construct a new Email object with.
  */
 public interface EmailPopulatingBuilderFactory {
 	EmailPopulatingBuilder create();

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java

@@ -72,7 +72,7 @@ public EmailFromOutlookMessage outlookMsgToEmailBuilder(
 			@NotNull final EmailPopulatingBuilderFactory builderFactory,
 			@NotNull final InternalEmailConverter internalEmailConverter) {
 		return buildEmailFromOutlookMessage(
-				emailStartingBuilder.ignoringDefaults().startingBlank(),
+				emailStartingBuilder.startingBlank(),
 				parseOutlookMsg(checkNonEmptyArgument(msgInputStream, "msgInputStream")),
 				builderFactory,
 				internalEmailConverter);

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -120,7 +120,7 @@ public static EmailPopulatingBuilder mimeMessageToEmailBuilder(@NotNull final Mi
 	@NotNull
 	public static EmailPopulatingBuilder mimeMessageToEmailBuilder(@NotNull final MimeMessage mimeMessage, @Nullable final Pkcs12Config pkcs12Config, final boolean fetchAttachmentData) {
 		checkNonEmptyArgument(mimeMessage, "mimeMessage");
-		val builder = EmailBuilder.ignoringDefaults().startingBlank();
+		val builder = EmailBuilder.startingBlank();
 		val parsed = MimeMessageParser.parseMimeMessage(mimeMessage, fetchAttachmentData);
 		val emailBuilder = buildEmailFromMimeMessage(builder, parsed);
 		return decryptAttachments(emailBuilder, mimeMessage, pkcs12Config);

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderFactoryImpl.java

@@ -9,7 +9,6 @@
 public final class EmailPopulatingBuilderFactoryImpl implements EmailPopulatingBuilderFactory {
 	@Override
 	public EmailPopulatingBuilder create() {
-		// FIXME shouldn't this be .ignoringDefaults(true)?
-		return 	new EmailPopulatingBuilderImpl().ignoringOverrides(true);
+		return 	new EmailPopulatingBuilderImpl();
 	}
 }

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

@@ -142,8 +142,7 @@ public void createMailSession_StandardDummyMailWithIdAndSendDate()
 	@Test
 	public void createMailSession_OutlookMessageTest()
 			throws IOException, MessagingException, ExecutionException, InterruptedException {
-		val builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false);
+		val builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg");
 		Email email = assertSendingEmail(builder, false, false, false, true, false);
 		verifyReceivedOutlookEmail(email, false, false);
 	}
@@ -152,7 +151,6 @@ public void createMailSession_OutlookMessageTest()
 	public void createMailSession_OutlookMessageSmimeSignTest()
 			throws IOException, MessagingException, ExecutionException, InterruptedException {
 		EmailPopulatingBuilder builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false)
 				.signWithSmime(new File(RESOURCES_PKCS + "/smime_keystore.pkcs12"), "letmein", "smime_test_user_alias", "letmein");
 		Email email = assertSendingEmail(builder, false, true, false, true, false);
 		verifyReceivedOutlookEmail(email, true, false);
@@ -182,8 +180,7 @@ public void createMailSession_OutlookMessageDefaultSmimeSignTest()
 						.buildEmail())
 				.buildMailer();
 
-		EmailPopulatingBuilder builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false);
+		EmailPopulatingBuilder builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg");
 		Email email = assertSendingEmail(builder, false, true, false, true, false);
 
 		// verify that S/MIME was indeed only configured on the mailer instance
@@ -246,7 +243,6 @@ public void testOutlookMessageWithNestedOutlookMessageAttachmentThatHasItsOwnNes
 	public void createMailSession_OutlookMessageSmimeEncryptTest()
 			throws IOException, MessagingException, ExecutionException, InterruptedException {
 		EmailPopulatingBuilder builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false)
 				.encryptWithSmime(new File(RESOURCES_PKCS + "/smime_test_user.pem.standard.crt"));
 		Email email = assertSendingEmail(builder, false, true, false, true, false);
 		verifyReceivedOutlookEmail(email, false, true);
@@ -265,7 +261,6 @@ public void createMailSession_OutlookMessageSmimeEncryptTest()
 	public void createMailSession_OutlookMessageSmimeSignEncryptTest()
 			throws IOException, MessagingException, ExecutionException, InterruptedException {
 		EmailPopulatingBuilder builder = readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false)
 				.signWithSmime(new File(RESOURCES_PKCS + "/smime_keystore.pkcs12"), "letmein", "smime_test_user_alias", "letmein")
 				.encryptWithSmime(new File(RESOURCES_PKCS + "/smime_test_user.pem.standard.crt"));
 		Email email = assertSendingEmail(builder, false, true, false, true, false);
@@ -388,9 +383,7 @@ private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopul
 			assertThat(receivedMimeMessage.getEnvelopeSender()).isEqualTo(originalEmail.getFromRecipient().getAddress());
 		}
 
-		Email receivedEmail = mimeMessageToEmailBuilder(receivedMimeMessage.getMimeMessage(), loadPkcs12KeyStore())
-				.ignoringDefaults(false) // FIXME perhaps we should make this default, when converting a MimeMessage to an Email?
-				.buildEmail();
+		Email receivedEmail = mimeMessageToEmailBuilder(receivedMimeMessage.getMimeMessage(), loadPkcs12KeyStore()).buildEmail();
 
 		if (!sentDateWasFixed) {
 			GregorianCalendar receiveWindowStart = new GregorianCalendar();
@@ -485,9 +478,7 @@ private List<AttachmentResource> fixAttachmentResourcesWith7Bit(final List<Attac
 	public void createMailSession_ReplyToMessage()
 			throws MessagingException, ExecutionException, InterruptedException {
 		// send initial mail
-		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false)
-				.buildEmail());
+		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg").buildEmail());
 		MimeMessageAndEnvelope receivedMimeMessage = smtpServerRule.getOnlyMessage();
 		EmailPopulatingBuilder receivedEmailPopulatingBuilder = mimeMessageToEmailBuilder(receivedMimeMessage.getMimeMessage());
 
@@ -519,9 +510,7 @@ public void createMailSession_ReplyToMessage()
 	public void createMailSession_ReplyToMessage_NotAll_AndCustomReferences()
 			throws MessagingException, ExecutionException, InterruptedException {
 		// send initial mail
-		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg")
-				.ignoringDefaults(false)
-				.buildEmail());
+		mailer.sendMail(readOutlookMessage("test-messages/HTML mail with replyto and attachment and embedded image.msg").buildEmail());
 		MimeMessageAndEnvelope receivedMimeMessage = smtpServerRule.getOnlyMessage();
 		EmailPopulatingBuilder receivedEmailPopulatingBuilder = mimeMessageToEmailBuilder(receivedMimeMessage.getMimeMessage());