Merge pull request #43 from kalnik-a-a/master

RecipientList List and Retrieve responses. RecipientList asStoredRericipientList method

Author: yepher

libs/sparkpost-lib/src/main/java/com/sparkpost/model/RecipientList.java

@@ -66,4 +66,14 @@ public class RecipientList extends Base {
     @SerializedName("total_rejected_recipients")
     private int totalRejectedRecipients;
 
+    /**
+     * Returns object that can be used to create transmission.
+     * @return StoredRecipientList object
+     */
+    public StoredRecipientList asStoredRecipientList() {
+
+        StoredRecipientList storedRecipientList = new StoredRecipientList();
+        storedRecipientList.setListId(this.getId());
+        return storedRecipientList;
+    }
 }

libs/sparkpost-lib/src/main/java/com/sparkpost/model/responses/RecipientListRetrieveResponse.java

@@ -0,0 +1,15 @@
+package com.sparkpost.model.responses;
+
+import com.sparkpost.model.RecipientList;
+
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RecipientListRetrieveResponse extends Response {
+
+    @Description(value = "", sample = {""})
+    private RecipientList results;
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/model/responses/RecipientListsListAllResponse.java

@@ -0,0 +1,17 @@
+package com.sparkpost.model.responses;
+
+import com.sparkpost.model.RecipientList;
+
+import com.yepher.jsondoc.annotations.Description;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RecipientListsListAllResponse extends Response {
+
+    @Description(value = "List of RecipientList", sample = {""})
+    private List<RecipientList> results;
+}

libs/sparkpost-lib/src/main/java/com/sparkpost/resources/ResourceRecipientLists.java

@@ -3,6 +3,8 @@
 
 import com.sparkpost.exception.SparkPostException;
 import com.sparkpost.model.RecipientList;
+import com.sparkpost.model.responses.RecipientListRetrieveResponse;
+import com.sparkpost.model.responses.RecipientListsListAllResponse;
 import com.sparkpost.model.responses.Response;
 import com.sparkpost.transport.RestConnection;
 
@@ -26,16 +28,19 @@ public static Response create(RestConnection conn, Integer maxNumberOfRecipientE
         return response;
     }
 
-    public static Response retrieve(RestConnection conn, String recipientListId, Boolean showRecipients) throws SparkPostException {
+    public static RecipientListRetrieveResponse retrieve(RestConnection conn, String recipientListId, Boolean showRecipients) throws SparkPostException {
         Endpoint ep = new Endpoint("recipient-lists/" + recipientListId);
         ep.addParam("show_recipients", showRecipients);
         Response response = conn.get(ep.toString());
-        return response;
+
+        RecipientListRetrieveResponse retrieveResponse = RecipientListRetrieveResponse.decode(response, RecipientListRetrieveResponse.class);
+        return retrieveResponse;
     }
 
-    public static Response listAll(RestConnection conn) throws SparkPostException {
+    public static RecipientListsListAllResponse listAll(RestConnection conn) throws SparkPostException {
         Response response = conn.get("recipient-lists");
-        return response;
+        RecipientListsListAllResponse listResponse = RecipientListsListAllResponse.decode(response, RecipientListsListAllResponse.class);
+        return listResponse;
     }
 
     public static Response delete(RestConnection conn, String recipientListId) throws SparkPostException {

libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java

@@ -143,4 +143,16 @@ public void testRecipientAttributesRoundtrip() {
         // Internal decoding of this data is tested in it's own tests
         Assert.assertNotNull(recipients);
     }
+
+    /**
+     *
+     */
+    @Test
+    public void testRecipientsListToStoredRecipientsListConvertation() {
+
+        Gson gson = new Gson();
+        RecipientList recipientList = gson.fromJson(this.RECIPIENT_LIST_JSON, RecipientList.class);
+        StoredRecipientList storedRecipientsList = recipientList.asStoredRecipientList();
+        Assert.assertEquals(storedRecipientsList.getListId(), "unique_id_4_graduate_students_list");
+    }
 }