#89 fixed API for sending to delimited addresses under the same name

Author: bbottema

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

@@ -231,20 +231,6 @@ public EmailBuilder textHTML(@Nullable final String textHTML) {
 		return this;
 	}
 
-	/**
-	 * Adds a new {@link Recipient} to the list on account of name, address with recipient type {@link Message.RecipientType#TO}.
-	 *
-	 * @param name    The name of the recipient.
-	 * @param address The emailaddress of the recipient.
-	 * @see #recipients
-	 * @see Recipient
-	 */
-	public EmailBuilder to(@Nullable final String name, @Nonnull final String address) {
-		checkNonEmptyArgument(address, "address");
-		recipients.add(new Recipient(name, address, Message.RecipientType.TO));
-		return this;
-	}
-
 	/**
 	 * Adds new {@link Recipient} instances to the list on account of name, address with recipient type {@link Message.RecipientType#TO}.
 	 *
@@ -260,23 +246,31 @@ public EmailBuilder to(@Nonnull final Recipient... recipientsToAdd) {
 	}
 
 	/**
-	 * Adds anew {@link Recipient} instances to the list on account of empty name, address with recipient type {@link Message.RecipientType#TO}. List can be
-	 * comma ',' or semicolon ';' separated.
+	 * Delegates to {@link #to(String, String)} while omitting the name used for the recipient(s).
+	 */
+	public EmailBuilder to(@Nonnull final String emailAddressList) {
+		return to(null, emailAddressList);
+	}
+	
+	/**
+	 * Adds anew {@link Recipient} instances to the list on account of given name, address with recipient type {@link Message.RecipientType#TO}.
+	 * List can be comma ',' or semicolon ';' separated.
 	 *
-	 * @param emailAddressList The recipients whose address to use for both name and address
+	 * @param name    		   The name of the recipient(s).
+	 * @param emailAddressList The emailaddresses of the recipients (will be singular in most use cases).
 	 * @see #recipients
 	 * @see Recipient
 	 */
-	public EmailBuilder to(@Nonnull final String emailAddressList) {
+	public EmailBuilder to(@Nullable final String name, @Nonnull final String emailAddressList) {
 		checkNonEmptyArgument(emailAddressList, "emailAddressList");
-		return addCommaOrSemicolonSeparatedEmailAddresses(emailAddressList, Message.RecipientType.TO);
+		return addCommaOrSemicolonSeparatedEmailAddresses(name, emailAddressList, Message.RecipientType.TO);
 	}
 
 	@Nonnull
-	private EmailBuilder addCommaOrSemicolonSeparatedEmailAddresses(@Nonnull final String emailAddressList, @Nonnull final Message.RecipientType type) {
+	private EmailBuilder addCommaOrSemicolonSeparatedEmailAddresses(@Nullable final String name, @Nonnull final String emailAddressList, @Nonnull final Message.RecipientType type) {
 		checkNonEmptyArgument(type, "type");
 		for (final String emailAddress : extractEmailAddresses(checkNonEmptyArgument(emailAddressList, "emailAddressList"))) {
-			recipients.add(new Recipient(null, emailAddress, type));
+			recipients.add(new Recipient(name, emailAddress, type));
 		}
 		return this;
 	}
@@ -295,21 +289,6 @@ public EmailBuilder to(@Nonnull final String... emailAddresses) {
 		return this;
 	}
 
-	/**
-	 * Adds a new {@link Recipient} to the list on account of name, address with recipient type {@link Message.RecipientType#CC}.
-	 *
-	 * @param name    The name of the recipient.
-	 * @param address The emailaddress of the recipient.
-	 * @see #recipients
-	 * @see Recipient
-	 */
-	@SuppressWarnings({ "WeakerAccess", "QuestionableName" })
-	public EmailBuilder cc(@Nullable final String name, @Nonnull final String address) {
-		checkNonEmptyArgument(address, "address");
-		recipients.add(new Recipient(name, address, Message.RecipientType.CC));
-		return this;
-	}
-
 	/**
 	 * Adds new {@link Recipient} instances to the list on account of empty name, address with recipient type {@link Message.RecipientType#CC}.
 	 *
@@ -324,19 +303,29 @@ public EmailBuilder cc(@Nonnull final String... emailAddresses) {
 		}
 		return this;
 	}
+	
+	
+	/**
+	 * Delegates to {@link #cc(String, String)} while omitting the name for the CC recipient(s).
+	 */
+	@SuppressWarnings("QuestionableName")
+	public EmailBuilder cc(@Nonnull final String emailAddressList) {
+		return cc(null, emailAddressList);
+	}
 
 	/**
 	 * Adds anew {@link Recipient} instances to the list on account of empty name, address with recipient type {@link Message.RecipientType#CC}. List can be
 	 * comma ',' or semicolon ';' separated.
 	 *
+	 * @param name    		   The name of the recipient(s).
 	 * @param emailAddressList The recipients whose address to use for both name and address
 	 * @see #recipients
 	 * @see Recipient
 	 */
 	@SuppressWarnings("QuestionableName")
-	public EmailBuilder cc(@Nonnull final String emailAddressList) {
+	public EmailBuilder cc(@Nullable String name, @Nonnull final String emailAddressList) {
 		checkNonEmptyArgument(emailAddressList, "emailAddressList");
-		return addCommaOrSemicolonSeparatedEmailAddresses(emailAddressList, Message.RecipientType.CC);
+		return addCommaOrSemicolonSeparatedEmailAddresses(name, emailAddressList, Message.RecipientType.CC);
 	}
 
 	/**
@@ -354,21 +343,6 @@ public EmailBuilder cc(@Nonnull final Recipient... recipientsToAdd) {
 		return this;
 	}
 
-	/**
-	 * Adds a new {@link Recipient} to the list on account of name, address with recipient type {@link Message.RecipientType#BCC}.
-	 *
-	 * @param name    The name of the recipient.
-	 * @param address The emailaddress of the recipient.
-	 * @see #recipients
-	 * @see Recipient
-	 */
-	@SuppressWarnings("WeakerAccess")
-	public EmailBuilder bcc(@Nullable final String name, @Nonnull final String address) {
-		checkNonEmptyArgument(address, "address");
-		recipients.add(new Recipient(name, address, Message.RecipientType.BCC));
-		return this;
-	}
-
 	/**
 	 * Adds new {@link Recipient} instances to the list on account of empty name, address with recipient type {@link Message.RecipientType#BCC}.
 	 *
@@ -382,18 +356,26 @@ public EmailBuilder bcc(@Nonnull final String... emailAddresses) {
 		}
 		return this;
 	}
+	
+	/**
+	 * Delegates to {@link #bcc(String, String)} while omitting the name for the BCC recipient(s).
+	 */
+	public EmailBuilder bcc(@Nonnull final String emailAddressList) {
+		return bcc(null, emailAddressList);
+	}
 
 	/**
 	 * Adds anew {@link Recipient} instances to the list on account of empty name, address with recipient type {@link Message.RecipientType#BCC}. List can be
 	 * comma ',' or semicolon ';' separated.
 	 *
+	 * @param name    		   The name of the recipient(s).
 	 * @param emailAddressList The recipients whose address to use for both name and address
 	 * @see #recipients
 	 * @see Recipient
 	 */
-	public EmailBuilder bcc(@Nonnull final String emailAddressList) {
+	public EmailBuilder bcc(@Nullable String name, @Nonnull final String emailAddressList) {
 		checkNonEmptyArgument(emailAddressList, "emailAddressList");
-		return addCommaOrSemicolonSeparatedEmailAddresses(emailAddressList, Message.RecipientType.BCC);
+		return addCommaOrSemicolonSeparatedEmailAddresses(name, emailAddressList, Message.RecipientType.BCC);
 	}
 
 	/**

src/test/java/org/simplejavamail/email/EmailBuilderTest.java

@@ -80,6 +80,8 @@ public void testBuilderToAddresses() {
 				.to("[email protected];[email protected]")
 				.to("[email protected];[email protected],[email protected]")
 				.to(new Recipient("13", "[email protected]", null), new Recipient("14", "[email protected]", null))
+				.to("15", "[email protected],[email protected]")
+				.to("16", "[email protected];[email protected]")
 				.build();
 
 		assertThat(email.getRecipients()).containsExactlyInAnyOrder(
@@ -96,7 +98,11 @@ public void testBuilderToAddresses() {
 				createRecipient(null, "[email protected]", Message.RecipientType.TO),
 				createRecipient(null, "[email protected]", Message.RecipientType.TO),
 				createRecipient("13", "[email protected]", Message.RecipientType.TO),
-				createRecipient("14", "[email protected]", Message.RecipientType.TO)
+				createRecipient("14", "[email protected]", Message.RecipientType.TO),
+				createRecipient("15", "[email protected]", Message.RecipientType.TO),
+				createRecipient("15", "[email protected]", Message.RecipientType.TO),
+				createRecipient("16", "[email protected]", Message.RecipientType.TO),
+				createRecipient("16", "[email protected]", Message.RecipientType.TO)
 		);
 	}
 
@@ -112,6 +118,8 @@ public void testBuilderCCAddresses() {
 				.cc("[email protected];[email protected]")
 				.cc("[email protected];[email protected],[email protected]")
 				.cc(new Recipient("13", "[email protected]", null), new Recipient("14", "[email protected]", null))
+				.cc("15", "[email protected],[email protected]")
+				.cc("16", "[email protected];[email protected]")
 				.build();
 
 		assertThat(email.getRecipients()).containsExactlyInAnyOrder(
@@ -128,7 +136,11 @@ public void testBuilderCCAddresses() {
 				createRecipient(null, "[email protected]", Message.RecipientType.CC),
 				createRecipient(null, "[email protected]", Message.RecipientType.CC),
 				createRecipient("13", "[email protected]", Message.RecipientType.CC),
-				createRecipient("14", "[email protected]", Message.RecipientType.CC)
+				createRecipient("14", "[email protected]", Message.RecipientType.CC),
+				createRecipient("15", "[email protected]", Message.RecipientType.CC),
+				createRecipient("15", "[email protected]", Message.RecipientType.CC),
+				createRecipient("16", "[email protected]", Message.RecipientType.CC),
+				createRecipient("16", "[email protected]", Message.RecipientType.CC)
 		);
 	}
 
@@ -144,6 +156,8 @@ public void testBuilderBCCAddresses() {
 				.bcc("[email protected];[email protected]")
 				.bcc("[email protected];[email protected],[email protected]")
 				.bcc(new Recipient("13", "[email protected]", null), new Recipient("14", "[email protected]", null))
+				.bcc("15", "[email protected],[email protected]")
+				.bcc("16", "[email protected];[email protected]")
 				.build();
 
 		assertThat(email.getRecipients()).containsExactlyInAnyOrder(
@@ -160,7 +174,11 @@ public void testBuilderBCCAddresses() {
 				createRecipient(null, "[email protected]", Message.RecipientType.BCC),
 				createRecipient(null, "[email protected]", Message.RecipientType.BCC),
 				createRecipient("13", "[email protected]", Message.RecipientType.BCC),
-				createRecipient("14", "[email protected]", Message.RecipientType.BCC)
+				createRecipient("14", "[email protected]", Message.RecipientType.BCC),
+				createRecipient("15", "[email protected]", Message.RecipientType.BCC),
+				createRecipient("15", "[email protected]", Message.RecipientType.BCC),
+				createRecipient("16", "[email protected]", Message.RecipientType.BCC),
+				createRecipient("16", "[email protected]", Message.RecipientType.BCC)
 		);
 	}