Merge pull request cloudbees-oss#77 from depop/master

Update Zendesk services with 2 new macros methods

Author: stephenc

src/main/java/org/zendesk/client/v2/Zendesk.java

@@ -34,6 +34,7 @@
 import org.zendesk.client.v2.model.SearchResultEntity;
 import org.zendesk.client.v2.model.Status;
 import org.zendesk.client.v2.model.Ticket;
+import org.zendesk.client.v2.model.TicketResult;
 import org.zendesk.client.v2.model.TicketForm;
 import org.zendesk.client.v2.model.Topic;
 import org.zendesk.client.v2.model.Trigger;
@@ -878,7 +879,7 @@ public Ticket createTicketFromTweet(long tweetId, long monitorId) {
        map.put("monitored_twitter_handle_id", monitorId);
 
        return complete(submit(req("POST", cnst("/channels/twitter/tickets.json"), JSON,              
-             json(Collections.singletonMap("ticket", map ))),
+             json(Collections.singletonMap("ticket", map))),
              handle(Ticket.class, "ticket")));
     }
 
@@ -1016,6 +1017,18 @@ public Macro updateMacro(Long macroId, Macro macro) {
   }
 
 
+    public Ticket macrosShowChangesToTicket(long macroId) {
+        return complete(submit(req("GET", tmpl("/macros/{id}/apply.json").set("id", macroId)),
+                handle(TicketResult.class, "result"))).getTicket();
+    }
+
+    public Ticket macrosShowTicketAfterChanges(long ticketId, long macroId) {
+        return complete(submit(req("GET", tmpl("/tickets/{ticket_id}/macros/{id}/apply.json")
+                        .set("ticket_id", ticketId)
+                        .set("id", macroId)),
+                handle(TicketResult.class, "result"))).getTicket();
+    }
+
     public List<String> addTagToTicket(long id, String... tags) {
         return complete(submit(
                 req("PUT", tmpl("/tickets/{id}/tags.json").set("id", id), JSON,

src/main/java/org/zendesk/client/v2/model/TicketResult.java

@@ -0,0 +1,20 @@
+package org.zendesk.client.v2.model;
+
+public class TicketResult {
+    private Ticket ticket;
+
+    public TicketResult() {
+    }
+
+    public TicketResult(Ticket ticket) {
+        this.ticket = ticket;
+    }
+
+    public Ticket getTicket() {
+        return ticket;
+    }
+
+    public void setTicket(Ticket ticket) {
+        this.ticket = ticket;
+    }
+}

src/test/java/org/zendesk/client/v2/model/TicketResultTest.java

@@ -0,0 +1,29 @@
+package org.zendesk.client.v2.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class TicketResultTest {
+
+    private TicketResult parseJson(byte[] json) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.readValue(json, TicketResult.class);
+        } catch (Exception e) {
+            System.out.println(e);
+            return null;
+        }
+    }
+
+    @Test
+    public void testParseTicketResult() {
+        String json = "{ \"ticket\": { \"id\": 21337631753}}";
+        TicketResult ev = parseJson(json.getBytes());
+        assertNotNull(ev);
+        assertEquals(TicketResult.class, ev.getClass());
+    }
+
+}