add some more variations and renamed addRecipient to addRecipients

Author: bbottema

src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -90,11 +90,11 @@ public static Email outlookMsgToEmail(@Nonnull final InputStream msgInputStream)
 	}
 
 	/**
-	 * Delegates to {@link #emlToMimeMessage(Session, String)} using a dummy {@link Session} instance and passes the result to {@link
+	 * Delegates to {@link #emlToMimeMessage(String, Session)} using a dummy {@link Session} instance and passes the result to {@link
 	 * #mimeMessageToEmail(MimeMessage)};
 	 */
 	public static Email emlToEmail(@Nonnull final String eml) {
-		final MimeMessage mimeMessage = emlToMimeMessage(createDummySession(), checkNonEmptyArgument(eml, "eml"));
+		final MimeMessage mimeMessage = emlToMimeMessage(checkNonEmptyArgument(eml, "eml"), createDummySession());
 		return mimeMessageToEmail(mimeMessage);
 	}
 
@@ -151,18 +151,18 @@ public static MimeMessage emailToMimeMessage(@Nonnull final Email email, @Nonnul
 	}
 
 	/**
-	 * Delegates to {@link #emlToMimeMessage(Session, String)} with an empty {@link Session} instance.
+	 * Delegates to {@link #emlToMimeMessage(String, Session)} with an empty {@link Session} instance.
 	 *
 	 * @see #emailToMimeMessage(Email, Session)
 	 */
 	public static MimeMessage emlToMimeMessage(@Nonnull final String eml) {
-		return emlToMimeMessage(createDummySession(), checkNonEmptyArgument(eml, "eml"));
+		return emlToMimeMessage(checkNonEmptyArgument(eml, "eml"), createDummySession());
 	}
 
 	/**
 	 * Relies on JavaMail's native parser of EML data, {@link MimeMessage#MimeMessage(Session, InputStream)}.
 	 */
-	public static MimeMessage emlToMimeMessage(@Nonnull final Session session, @Nonnull final String eml) {
+	public static MimeMessage emlToMimeMessage(@Nonnull final String eml, @Nonnull final Session session) {
 		checkNonEmptyArgument(session, "session");
 		checkNonEmptyArgument(eml, "eml");
 		try {

src/main/java/org/simplejavamail/email/Email.java

@@ -5,7 +5,6 @@
 import javax.activation.DataSource;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.mail.Message;
 import javax.mail.Message.RecipientType;
 import javax.mail.util.ByteArrayDataSource;
 import java.io.File;
@@ -117,21 +116,21 @@ public Email(final boolean readFromDefaults) {
 				if (hasProperty(DEFAULT_TO_NAME)) {
 					addRecipient((String) getProperty(DEFAULT_TO_NAME), (String) getProperty(DEFAULT_TO_ADDRESS), RecipientType.TO);
 				} else {
-					addRecipient((String) getProperty(DEFAULT_TO_ADDRESS), RecipientType.TO);
+					addRecipients((String) getProperty(DEFAULT_TO_ADDRESS), RecipientType.TO);
 				}
 			}
 			if (hasProperty(DEFAULT_CC_ADDRESS)) {
 				if (hasProperty(DEFAULT_CC_NAME)) {
 					addRecipient((String) getProperty(DEFAULT_CC_NAME), (String) getProperty(DEFAULT_CC_ADDRESS), RecipientType.CC);
 				} else {
-					addRecipient((String) getProperty(DEFAULT_CC_ADDRESS), RecipientType.CC);
+					addRecipients((String) getProperty(DEFAULT_CC_ADDRESS), RecipientType.CC);
 				}
 			}
 			if (hasProperty(DEFAULT_BCC_ADDRESS)) {
 				if (hasProperty(DEFAULT_BCC_NAME)) {
 					addRecipient((String) getProperty(DEFAULT_BCC_NAME), (String) getProperty(DEFAULT_BCC_ADDRESS), RecipientType.BCC);
 				} else {
-					addRecipient((String) getProperty(DEFAULT_BCC_ADDRESS), RecipientType.BCC);
+					addRecipients((String) getProperty(DEFAULT_BCC_ADDRESS), RecipientType.BCC);
 				}
 			}
 			if (hasProperty(DEFAULT_SUBJECT)) {
@@ -240,21 +239,43 @@ public void addRecipient(@Nullable final String name, @Nonnull final String addr
 	 * @see Recipient
 	 * @see RecipientType
 	 */
-	public void addRecipient(@Nonnull final String emailAddressList, @Nonnull final RecipientType type) {
-		addCommaOrSemicolonSeparatedEmailAddresses(
-				checkNonEmptyArgument(emailAddressList, "emailAddressList"),
-				checkNonEmptyArgument(type, "type")
-		);
+	public void addRecipients(@Nonnull final String emailAddressList, @Nonnull final RecipientType type) {
+		checkNonEmptyArgument(type, "type");
+		checkNonEmptyArgument(emailAddressList, "emailAddressList");
+		addRecipients(type, extractEmailAddresses(emailAddressList));
 	}
 
-	@Nonnull
-	private void addCommaOrSemicolonSeparatedEmailAddresses(@Nonnull final String emailAddressList, @Nonnull final Message.RecipientType type) {
+	/**
+	 * Adds all given recipients addresses to the list on account of address and recipient type (eg. {@link RecipientType#CC}).
+	 *
+	 * @param recipientEmailAddressesToAdd List of preconfigured recipients.
+	 * @see #recipients
+	 * @see Recipient
+	 * @see RecipientType
+	 */
+	public void addRecipients(@Nonnull final RecipientType type, @Nonnull final String... recipientEmailAddressesToAdd) {
 		checkNonEmptyArgument(type, "type");
-		for (String emailAddress : extractEmailAddresses(checkNonEmptyArgument(emailAddressList, "emailAddressList"))) {
+		for (String emailAddress : checkNonEmptyArgument(recipientEmailAddressesToAdd, "recipientEmailAddressesToAdd")) {
 			recipients.add(new Recipient(null, emailAddress, type));
 		}
 	}
 
+	/**
+	 * Adds all given {@link Recipient} instances to the list (as copies) on account of name, address and recipient type (eg. {@link RecipientType#CC}).
+	 *
+	 * @param recipientsToAdd List of preconfigured recipients.
+	 * @see #recipients
+	 * @see Recipient
+	 * @see RecipientType
+	 */
+	public void addRecipients(@Nonnull final Recipient... recipientsToAdd) {
+		for (Recipient recipient : checkNonEmptyArgument(recipientsToAdd, "recipientsToAdd")) {
+			final String address = checkNonEmptyArgument(recipient.getAddress(), "recipient.address");
+			final RecipientType type = checkNonEmptyArgument(recipient.getType(), "recipient.type");
+			recipients.add(new Recipient(recipient.getName(), address, type));
+		}
+	}
+
 	/**
 	 * Adds an embedded image (attachment type) to the email message and generates the necessary {@link DataSource} with the given byte data. Then
 	 * delegates to {@link #addEmbeddedImage(String, DataSource)}. At this point the datasource is actually a {@link ByteArrayDataSource}.