bbottema#321: ignore malformed recipient addresses and continue parsing email data

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java

@@ -841,6 +841,11 @@ public interface EmailPopulatingBuilder {
 	@SuppressWarnings("unused")
 	EmailPopulatingBuilder withRecipient(@NotNull String singleAddress, @Nullable Message.RecipientType recipientType);
 
+	/**
+	 * Delegates to {@link #withRecipient(String, boolean, String, Message.RecipientType)} with the name omitted and fixedName = true.
+	 */
+	EmailPopulatingBuilder withRecipient(@Nullable String name, @NotNull String singleAddress, @Nullable Message.RecipientType recipientType);
+	
 	/**
 	 * Adds a new {@link Recipient} instance with the given name, address and {@link Message.RecipientType}.
 	 * <p>
@@ -853,7 +858,7 @@ public interface EmailPopulatingBuilder {
 	 * @param recipientType Optional type of recipient. This is needed for TO, CC and BCC, but not for <em>bounceTo</em>, <em>returnReceiptTo</em>,
 	 *                      <em>replyTo</em>, <em>from</em> etc.
 	 */
-	EmailPopulatingBuilder withRecipient(@Nullable String name, @NotNull String singleAddress, @Nullable Message.RecipientType recipientType);
+	EmailPopulatingBuilder withRecipient(@Nullable String name, boolean fixedName, @NotNull String singleAddress, @Nullable Message.RecipientType recipientType);
 
 	/**
 	 * Adds a new {@link Recipient} instance as copy of the provided recipient (copying name, address and {@link Message.RecipientType}).

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

@@ -1393,7 +1393,7 @@ public EmailPopulatingBuilder withRecipients(@Nullable String name, boolean fixe
 	public EmailPopulatingBuilder withRecipients(@Nullable String name, boolean fixedName, @NotNull Collection<String> oneOrMoreAddressesEach, @Nullable RecipientType recipientType) {
 		for (String oneOrMoreAddresses : oneOrMoreAddressesEach) {
 			for (String emailAddress : extractEmailAddresses(oneOrMoreAddresses)) {
-				withRecipient(MiscUtil.interpretRecipient(name, fixedName, emailAddress, recipientType));
+				withRecipient(name, fixedName, emailAddress, recipientType);
 			}
 		}
 		return this;
@@ -1471,7 +1471,19 @@ public EmailPopulatingBuilder withRecipient(@NotNull final String singleAddress,
 	 */
 	@Override
 	public EmailPopulatingBuilder withRecipient(@Nullable final String name, @NotNull final String singleAddress, @Nullable final RecipientType recipientType) {
-		recipients.add(MiscUtil.interpretRecipient(name, true, singleAddress, recipientType));
+		return withRecipient(name, true, singleAddress, recipientType);
+	}
+	
+	/**
+	 * @see EmailPopulatingBuilder#withRecipient(String, boolean, String, RecipientType)
+	 */
+	@Override
+	public EmailPopulatingBuilder withRecipient(@Nullable final String name, boolean fixedName, @NotNull final String singleAddress, @Nullable final RecipientType recipientType) {
+		try {
+			recipients.add(MiscUtil.interpretRecipient(name, fixedName, singleAddress, recipientType));
+		} catch (Exception e){
+			// assume recipient was malformed and simply ignore it
+		}
 		return this;
 	}
 
@@ -1829,7 +1841,7 @@ public EmailPopulatingBuilder signWithSmime(@NotNull final Pkcs12Config pkcs12Co
 	@SuppressFBWarnings(value = "OBL_UNSATISFIED_OBLIGATION", justification = "Input stream being created should not be closed here")
 	public EmailPopulatingBuilder encryptWithSmime(@NotNull final String pemFile) {
 		try {
-			return encryptWithSmime(new FileInputStream(new File(pemFile)));
+			return encryptWithSmime(new FileInputStream(pemFile));
 		} catch (FileNotFoundException e) {
 			throw new EmailException(format(ERROR_READING_FROM_FILE, pemFile), e);
 		}