Merge pull request #417 from aheritier/TicketForm

Allow to delete TicketForm

Author: PierreBtz

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

@@ -251,6 +251,15 @@ public TicketForm createTicketForm(TicketForm ticketForm) {
                 Collections.singletonMap("ticket_form", ticketForm))), handle(TicketForm.class, "ticket_form")));
     }
 
+    public void deleteTicketForm(TicketForm ticketForm) {
+        checkHasId(ticketForm);
+        deleteTicketForm(ticketForm.getId());
+    }
+
+    public void deleteTicketForm(long id) {
+        complete(submit(req("DELETE", tmpl("/ticket_forms/{id}.json").set("id", id)), handleStatus()));
+    }
+
     public Ticket importTicket(TicketImport ticketImport) {
         return complete(submit(req("POST", cnst("/imports/tickets.json"),
                 JSON, json(Collections.singletonMap("ticket", ticketImport))),
@@ -2757,6 +2766,12 @@ private static void checkHasId(Ticket ticket) {
         }
     }
 
+    private static void checkHasId(TicketForm ticketForm) {
+        if (ticketForm.getId() == null) {
+            throw new IllegalArgumentException("TicketForm requires id");
+        }
+    }
+
     private static void checkHasId(org.zendesk.client.v2.model.Request request) {
         if (request.getId() == null) {
             throw new IllegalArgumentException("Request requires id");

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

@@ -1590,20 +1590,26 @@ public void createOrUpdateUser() throws Exception {
     public void createTicketForm() throws Exception {
         createClientWithTokenOrPassword();
         TicketForm form = new TicketForm();
+        TicketForm createdForm = null;
         form.setActive(true);
         final String givenName = "Test ticket form";
         form.setName(givenName);
         form.setDisplayName(givenName);
         form.setRawName(givenName);
         form.setRawDisplayName(givenName);
-
-        final TicketForm createdForm = instance.createTicketForm(form);
-        assertNotNull(createdForm);
-        assertNotNull(createdForm.getId());
-        assertEquals(givenName, createdForm.getName());
-        assertEquals(givenName, createdForm.getDisplayName());
-        assertEquals(givenName, createdForm.getRawName());
-        assertEquals(givenName, createdForm.getRawDisplayName());
+        try {
+            createdForm = instance.createTicketForm(form);
+            assertNotNull(createdForm);
+            assertNotNull(createdForm.getId());
+            assertEquals(givenName, createdForm.getName());
+            assertEquals(givenName, createdForm.getDisplayName());
+            assertEquals(givenName, createdForm.getRawName());
+            assertEquals(givenName, createdForm.getRawDisplayName());
+        } finally {
+            if (createdForm != null) {
+                instance.deleteTicketForm(createdForm);
+            }
+        }
     }
 
     @Test