Add support for mail subject and body (#25)

* Add support for mail subject and body

Author: Christoffer-Cortes

src/main/java/com/ericsson/eiffelcommons/subscriptionobject/MailSubscriptionObject.java

@@ -4,6 +4,8 @@
 
 public class MailSubscriptionObject extends SubscriptionObject<MailSubscriptionObject> {
 
+    private final String EMAIL_SUBJECT = "emailSubject";
+
     /**
      * Creates a subscriptionObject with MAIL capabilities.
      * @param subscriptionName
@@ -14,4 +16,14 @@ public MailSubscriptionObject(String subscriptionName) throws IOException {
 
         subscriptionJson.put("notificationType", "MAIL");
     }
+
+    /**
+     * Sets the field emailSubject to given value
+     * @param emailSubject
+     * @return MailSubscriptionObject
+     */
+    public MailSubscriptionObject setEmailSubject(final String emailSubject) {
+        subscriptionJson.put(EMAIL_SUBJECT, emailSubject);
+        return this;
+    }
 }

src/main/java/com/ericsson/eiffelcommons/subscriptionobject/SubscriptionObject.java

@@ -30,12 +30,22 @@ public SubscriptionObject(final Class<T> selfClass, String subscriptionName) thr
         this.self = selfClass.cast(this);
     }
 
+    /**
+     * Adds a notification body to the subscriptionObject.
+     *
+     * @param notificationBody
+     * @return SubscriptionObject<T>
+     */
+    public T addNotificationBody(final String notificationBody) {
+        return addNotificationMessageKeyValue("", notificationBody);
+    }
+
     /**
      * Adds a notification message to the subscriptionObject as key value.
      *
      * @param notificationKey
      * @param notificationValue
-     * @return
+     * @return SubscriptionObject<T>
      */
     public T addNotificationMessageKeyValue(String notificationKey, String notificationValue) {
         JSONObject keyValue = new JSONObject();
@@ -54,7 +64,7 @@ public T addNotificationMessageKeyValue(String notificationKey, String notificat
      *
      * @param requirementIndex
      * @param condition
-     * @return
+     * @return SubscriptionObject<T>
      */
     public T addConditionToRequirement(int requirementIndex, JSONObject condition) {
         JSONArray requirements = subscriptionJson.getJSONArray("requirements");
@@ -68,7 +78,7 @@ public T addConditionToRequirement(int requirementIndex, JSONObject condition) {
      * Sets the field notificationMeta to the wanted value
      *
      * @param notificationMeta
-     * @return
+     * @return SubscriptionObject<T>
      */
     public T setNotificationMeta(String notificationMeta) {
         subscriptionJson.put("notificationMeta", notificationMeta);
@@ -79,8 +89,8 @@ public T setNotificationMeta(String notificationMeta) {
      * Set the restPostBodyMediaType field in the subscriptions to wanted value for example
      * "application/x-www-form-urlencoded"
      *
-     * @param value
-     * @return
+     * @param restPostBodyMediaType
+     * @return SubscriptionObject<T>
      */
     public T setRestPostBodyMediaType(String restPostBodyMediaType) {
         subscriptionJson.put("restPostBodyMediaType", restPostBodyMediaType);

src/test/java/com/ericsson/eiffelcommons/subscriptionobjecttest/SubscriptionObjectTest.java

@@ -1,6 +1,7 @@
 package com.ericsson.eiffelcommons.subscriptionobjecttest;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
@@ -10,15 +11,18 @@
 import org.junit.Test;
 
 import com.ericsson.eiffelcommons.helpers.MediaType;
+import com.ericsson.eiffelcommons.subscriptionobject.MailSubscriptionObject;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 
 public class SubscriptionObjectTest {
 
     RestPostSubscriptionObject restPostSubscription;
+    MailSubscriptionObject mailSubscription;
 
     @Before
     public void setup() throws IOException {
         restPostSubscription = new RestPostSubscriptionObject("mySubscription");
+        mailSubscription = new MailSubscriptionObject("myMailSubscription");
     }
 
     @Test
@@ -50,8 +54,7 @@ public void testSetNotificationMeta() {
         restPostSubscription.setNotificationMeta("http://localhost:8080");
 
         String actualNotificationMeta = restPostSubscription.getSubscriptionJson()
-                                                            .get("notificationMeta")
-                                                            .toString();
+                                                            .getString("notificationMeta");
         assertEquals("http://localhost:8080", actualNotificationMeta);
     }
 
@@ -60,14 +63,11 @@ public void testSetBasicAuth() {
         restPostSubscription.setBasicAuth("admin", "admin");
 
         String actualUsername = restPostSubscription.getSubscriptionJson()
-                                                    .get("userName")
-                                                    .toString();
+                                                    .getString("userName");
         String actualPassword = restPostSubscription.getSubscriptionJson()
-                                                    .get("password")
-                                                    .toString();
+                                                    .getString("password");
         String actualAuthenticationType = restPostSubscription.getSubscriptionJson()
-                                                              .get("authenticationType")
-                                                              .toString();
+                                                              .getString("authenticationType");
 
         assertEquals("admin", actualUsername);
         assertEquals("admin", actualPassword);
@@ -79,11 +79,31 @@ public void testSetRestPostBodyMediaType() {
         restPostSubscription.setRestPostBodyMediaType(MediaType.APPLICATION_FORM_URLENCODED);
 
         String actualRestPostBodyMediaType = restPostSubscription.getSubscriptionJson()
-                                                                 .get("restPostBodyMediaType")
-                                                                 .toString();
+                                                                 .getString("restPostBodyMediaType");
         assertEquals("application/x-www-form-urlencoded", actualRestPostBodyMediaType);
     }
 
+    @Test
+    public void testSetNotificationBody() {
+        String body = "Body";
+        mailSubscription.addNotificationBody(body);
+
+        String actualNotificationBody = mailSubscription.getSubscriptionJson()
+                                                        .get("notificationMessageKeyValues")
+                                                        .toString();
+        assertTrue(actualNotificationBody.contains(body));
+    }
+
+    @Test
+    public void testSetEmailSubject() {
+        String subject = "MySubject";
+        mailSubscription.setEmailSubject(subject);
+
+        String actualEmailSubject = mailSubscription.getSubscriptionJson()
+                                                    .getString("emailSubject");
+        assertEquals(subject, actualEmailSubject);
+    }
+
     @Test
     public void testChaining() {
         restPostSubscription.addNotificationMessageKeyValue("Key", "value")