Merge pull request cloudbees-oss#73 from sandeepkaul/develop

Develop

Author: stephenc

README.md

@@ -60,7 +60,7 @@ Here is the status of the various API components:
 * [Activity Stream](http://developer.zendesk.com/documentation/rest_api/activity_stream.html)
 * [Attachments](http://developer.zendesk.com/documentation/rest_api/attachments.html) ✓
 * [Autocompletion](http://developer.zendesk.com/documentation/rest_api/autocomplete.html)
-* [Automations](http://developer.zendesk.com/documentation/rest_api/automations.html)
+* [Automations](http://developer.zendesk.com/documentation/rest_api/automations.html) ✓
 * [Job Statuses](http://developer.zendesk.com/documentation/rest_api/job_statuses.html)
 * [Locales](http://developer.zendesk.com/documentation/rest_api/locales.html)
 * [Macros](http://developer.zendesk.com/documentation/rest_api/macros.html) ✓ *except for restrictions*

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

@@ -19,6 +19,7 @@
 import org.slf4j.LoggerFactory;
 import org.zendesk.client.v2.model.Attachment;
 import org.zendesk.client.v2.model.Audit;
+import org.zendesk.client.v2.model.Automation;
 import org.zendesk.client.v2.model.Comment;
 import org.zendesk.client.v2.model.Field;
 import org.zendesk.client.v2.model.Forum;
@@ -525,12 +526,48 @@ public Trigger createTrigger(Trigger trigger) {
         return complete(submit(req("POST", cnst("/triggers.json"), JSON, json(Collections.singletonMap("trigger", trigger))),
               handle(Trigger.class, "trigger")));
     }
+    
+    public Trigger updateTrigger(Long triggerId, Trigger trigger) {
+      return complete(submit(req("PUT", tmpl("/triggers/{id}.json").set("id", triggerId), JSON, json(Collections.singletonMap("trigger", trigger))),
+            handle(Trigger.class, "trigger")));
+  }
 
     public void deleteTrigger(long triggerId) { 
        complete(submit(req("DELETE", tmpl("/triggers/{id}.json").set("id", triggerId)), handleStatus()));
     }
 
 
+  // Automations
+  public Iterable<Automation> getAutomations() {
+    return new PagedIterable<Automation>(cnst("/automations.json"),
+        handleList(Automation.class, "automations"));
+  }
+
+  public Automation getAutomation(long id) {
+    return complete(submit(req("GET", tmpl("/automations/{id}.json").set("id", id)),
+        handle(Automation.class, "automation")));
+  }
+
+  public Automation createAutomation(Automation automation) {
+    return complete(submit(
+        req("POST", cnst("/automations.json"), JSON,
+            json(Collections.singletonMap("automation", automation))),
+        handle(Automation.class, "automation")));
+  }
+
+  public Automation updateAutomation(Long automationId, Automation automation) {
+    return complete(submit(
+        req("PUT", tmpl("/automations/{id}.json").set("id", automationId), JSON,
+            json(Collections.singletonMap("automation", automation))),
+        handle(Automation.class, "automation")));
+  }
+
+  public void deleteAutomation(long automationId) {
+    complete(submit(req("DELETE", tmpl("/automations/{id}.json").set("id", automationId)),
+        handleStatus()));
+  }
+
+    
     public Iterable<TwitterMonitor> getTwitterMonitors() { 
         return new PagedIterable<TwitterMonitor>(cnst("/channels/twitter/monitored_twitter_handles.json"),  
               handleList(TwitterMonitor.class, "monitored_twitter_handles"));
@@ -961,6 +998,23 @@ public Iterable<Macro> getMacros(){
         return new PagedIterable<Macro>(cnst("/macros.json"),
                 handleList(Macro.class, "macros"));
     }
+    
+    public Macro getMacro(long macroId){
+      
+      return complete(submit(req("GET", tmpl("/macros/{id}.json").set("id", macroId)), handle(Macro.class, "macro")));
+  }
+    
+  public Macro createMacro(Macro macro) {
+    return complete(submit(
+        req("POST", cnst("/macros.json"), JSON, json(Collections.singletonMap("macro", macro))),
+        handle(Macro.class, "macro")));
+  }
+
+  public Macro updateMacro(Long macroId, Macro macro) {
+    return complete(submit(req("PUT", tmpl("/macros/{id}.json").set("id", macroId), JSON,
+        json(Collections.singletonMap("macro", macro))), handle(Macro.class, "macro")));
+  }
+    
 
     public List<String> addTagToTicket(long id, String... tags) {
         return complete(submit(

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

@@ -0,0 +1,84 @@
+/**
+ * 
+ */
+package org.zendesk.client.v2.model;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * https://developer.zendesk.com/rest_api/docs/core/automations
+ * 
+ * @author Sandeep Kaul ([email protected])
+ *
+ */
+public class Automation {
+
+  private Long id;
+  private String title;
+  private Boolean active;
+  private List<Action> actions;
+  private Conditions conditions;
+  private int position;
+  private Date createdAt;
+  private Date updatedAt;
+  
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+  public String getTitle() {
+    return title;
+  }
+  public void setTitle(String title) {
+    this.title = title;
+  }
+  public Boolean getActive() {
+    return active;
+  }
+  public void setActive(Boolean active) {
+    this.active = active;
+  }
+  public List<Action> getActions() {
+    return actions;
+  }
+  public void setActions(List<Action> actions) {
+    this.actions = actions;
+  }
+  public Conditions getConditions() {
+    return conditions;
+  }
+  public void setConditions(Conditions conditions) {
+    this.conditions = conditions;
+  }
+  public Date getCreatedAt() {
+    return createdAt;
+  }
+  public void setCreatedAt(Date createdAt) {
+    this.createdAt = createdAt;
+  }
+  public Date getUpdatedAt() {
+    return updatedAt;
+  }
+  public void setUpdatedAt(Date updatedAt) {
+    this.updatedAt = updatedAt;
+  }
+  public int getPosition() {
+    return position;
+  }
+  public void setPosition(int position) {
+    this.position = position;
+  }
+  @Override
+  public String toString() {
+    return "Automation [id=" + id + ", title=" + title + ", active=" + active + ", actions="
+        + actions + ", conditions=" + conditions + ", position=" + position + ", createdAt="
+        + createdAt + ", updatedAt=" + updatedAt + "]";
+  }
+  
+  
+  
+}

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

@@ -0,0 +1,58 @@
+/**
+ * 
+ */
+package org.zendesk.client.v2.model;
+
+/**
+ * @author Sandeep Kaul ([email protected])
+ *
+ */
+public class Condition {
+  private String field;
+  private String operator;
+  private String value;
+
+  public Condition() {}
+
+  public Condition(String field, String operator, String value) {
+    this.field = field;
+    this.operator = operator;
+    this.value = value;
+  }
+
+  public String getField() {
+    return field;
+  }
+
+  public void setField(String field) {
+    this.field = field;
+  }
+
+  public String getOperator() {
+    return operator;
+  }
+
+  public void setOperator(String operator) {
+    this.operator = operator;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append("Condition");
+    sb.append("{field=").append(field);
+    sb.append(", operator=").append(operator);
+    sb.append(", value=").append(value);
+    sb.append('}');
+    return sb.toString();
+  }
+
+}

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

@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package org.zendesk.client.v2.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author Sandeep Kaul([email protected])
+ *
+ */
+public class Conditions {
+  private List<Condition> all = new ArrayList<Condition>();
+  private List<Condition> any = new ArrayList<Condition>();
+
+  public List<Condition> getAll() {
+    return all;
+  }
+
+  public void setAll(List<Condition> all) {
+    this.all = all;
+  }
+
+  public List<Condition> getAny() {
+    return any;
+  }
+
+  public void setAny(List<Condition> any) {
+    this.any = any;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append("Conditions");
+    sb.append("{all=").append(all);
+    sb.append(", any=").append(any);
+    sb.append('}');
+    return sb.toString();
+  }
+
+}