Merge pull request cloudbees-oss#14 from benashby/organizationfields

Organizationfields

Author: stephenc

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

@@ -23,6 +23,7 @@
 import org.zendesk.client.v2.model.Group;
 import org.zendesk.client.v2.model.Identity;
 import org.zendesk.client.v2.model.Organization;
+import org.zendesk.client.v2.model.OrganizationField;
 import org.zendesk.client.v2.model.SearchResultEntity;
 import org.zendesk.client.v2.model.Ticket;
 import org.zendesk.client.v2.model.User;
@@ -41,6 +42,7 @@
 import java.util.concurrent.ExecutionException;
 import org.zendesk.client.v2.model.Status;
 
+
 /**
  * @author stephenc
  * @since 04/04/2013 13:08
@@ -595,6 +597,12 @@ public Iterable<Organization> getOrganizations() {
                 handleList(Organization.class, "organizations"));
     }
 
+    public Iterable<OrganizationField> getOrganizationFields() {
+        //The organization_fields api doesn't seem to support paging
+        return complete(submit(req("GET", cnst("/organization_fields.json")),
+                handleList(OrganizationField.class, "organization_fields")));
+    }
+
     public Iterable<Organization> getAutoCompleteOrganizations(String name) {
         if (name == null || name.length() < 2) {
             throw new IllegalArgumentException("Name must be at least 2 characters long");

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

@@ -4,6 +4,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author stephenc
@@ -22,6 +23,7 @@ public class Organization implements SearchResultEntity {
     private Boolean sharedTickets;
     private Boolean sharedComments;
     private List<String> tags;
+    private Map<String,Object> organizationFields;
 
     public Organization() {
     }
@@ -129,6 +131,15 @@ public void setUpdatedAt(Date updatedAt) {
         this.updatedAt = updatedAt;
     }
 
+    @JsonProperty("organization_fields")
+    public Map<String, Object> getOrganizationFields() {
+        return organizationFields;
+    }
+
+    public void setOrganizationFields(Map<String, Object> organizationFields) {
+        this.organizationFields = organizationFields;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("Organization{");

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

@@ -0,0 +1,119 @@
+package org.zendesk.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+
+/**
+ * Created by benashby on 8/27/2014.
+ */
+public class OrganizationField implements SearchResultEntity {
+
+    private Long id;
+    private String url;
+    private String type;
+    private String key;
+    private String title;
+    private String description;
+    private Long position;
+    private Boolean active;
+    private Date createdAt;
+    private Date updatedAt;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getPosition() {
+        return position;
+    }
+
+    public void setPosition(Long position) {
+        this.position = position;
+    }
+
+    public Boolean getActive() {
+        return active;
+    }
+
+    public void setActive(Boolean active) {
+        this.active = active;
+    }
+
+    @JsonProperty("created_at")
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    @JsonProperty("updated_at")
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    @Override
+    public String toString() {
+        return "OrganizationField{" +
+                "id=" + id +
+                ", type='" + type + '\'' +
+                ", key='" + key + '\'' +
+                ", title='" + title + '\'' +
+                ", description='" + description + '\'' +
+                ", position=" + position +
+                ", active=" + active +
+                ", createdAt=" + createdAt +
+                ", updatedAt=" + updatedAt +
+                '}';
+    }
+}