Added bcc and cc to basic message. Added replyTo to generateBaseMessage method

Author: rbrazuk

injectionApi/src/main/java/com/socketLabs/injectionApi/Main.java

@@ -32,7 +32,7 @@ public static void main(String[] args) throws Exception {
         // =========================
         // Add Email Addresses using an Array
         List<EmailAddress> toRecipients = new ArrayList<>();
-        toRecipients.add(new EmailAddress("recipient1@example.com"));
+        toRecipients.add(new EmailAddress("ross.brazuk@socketlabs.com"));
         toRecipients.add(new EmailAddress("[email protected]", "Recipient #2"));
         message.setTo(toRecipients);
 

injectionApi/src/main/java/com/socketLabs/injectionApi/core/serialization/InjectionRequestFactory.java

@@ -105,10 +105,14 @@ public String GenerateRequest(BasicMessage basicMessage) throws IOException {
 
         MessageJson messageJson = generateBaseMessage(basicMessage);
 
-        messageJson.setTo(populateTo(basicMessage.getTo()));
+        messageJson.setTo(populateEmailList(basicMessage.getTo()));
 
         messageJsonList.add(messageJson);
 
+        messageJson.setCc(populateEmailList(basicMessage.getCc()));
+
+        messageJson.setBcc(populateEmailList(basicMessage.getBcc()));
+
         return GetAsJson(new InjectionRequest(this.serverId, this.apiKey, messageJsonList));
     }
 
@@ -133,23 +137,18 @@ private MessageJson generateBaseMessage(MessageBase messageBase) {
         messageJson.setSubject(messageBase.getSubject());
         messageJson.setPlainTextBody(messageBase.getPlainTextBody());
         messageJson.setHtmlBody(messageBase.getHtmlBody());
+        messageJson.setReplyTo(new AddressJson(messageBase.getReplyTo().getEmailAddress(), messageBase.getReplyTo().getFriendlyName()));
         messageJson.setMailingId(messageBase.getMailingId());
         messageJson.setMessageId(messageBase.getMessageId());
         messageJson.setCharSet(messageBase.getCharSet());
         messageJson.setFrom(new AddressJson(messageBase.getFrom().getEmailAddress(), messageBase.getFrom().getFriendlyName()));
-        // todo: set cc and bcc here
         messageJson.setCustomHeaders(populateCustomHeaders(messageBase.getCustomHeaders()));
         messageJson.setAttachments(populateAttachments(messageBase.getAttachments()));
 
         if (messageBase.getApiTemplate() != null) {
             messageJson.setApiTemplate(String.valueOf(messageBase.getApiTemplate()));
         }
 
-        try {
-            System.out.println(mapper.writeValueAsString(messageJson));
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
         return messageJson;
     }
 
@@ -199,7 +198,7 @@ private List<AttachmentJson> populateAttachments(List<Attachment> baseAttachment
      * @param baseTo List of EmailAddress objects
      * @return List<AddressJson>
      */
-    private List<AddressJson> populateTo(List<EmailAddress> baseTo) {
+    private List<AddressJson> populateEmailList(List<EmailAddress> baseTo) {
         if (baseTo == null) {
             return null;
         }

injectionApi/src/main/java/com/socketLabs/injectionApi/message/MessageBase.java

@@ -85,30 +85,6 @@ public interface MessageBase {
      */
     void setFrom(EmailAddress value);
 
-    /**
-     * Get the list of CC addresses.
-     * @return {@code List<EmailAddress>}
-     */
-    List<EmailAddress> getCc();
-
-    /**
-     * Set the list of CC addresses.
-     * @param value {@code List<EmailAddress>}
-     */
-    void setCc(List<EmailAddress> value);
-
-    /**
-     * Get the list of BCC addresses.
-     * @return {@code List<EmailAddress>}
-     */
-    List<EmailAddress> getBcc();
-
-    /**
-     * Set the list of BCC addresses.
-     * @param value {@code List<EmailAddress>}
-     */
-    void setBcc(List<EmailAddress> value);
-
     /**
      * Get the optional ReplyTo address for the message.
      * @return EmailAddress