Merge pull request cloudbees-oss#158 from satamas/master

Add brand to model. Support list brands api request.

Author: stephenc

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

@@ -23,6 +23,7 @@
 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.Brand;
 import org.zendesk.client.v2.model.Comment;
 import org.zendesk.client.v2.model.Field;
 import org.zendesk.client.v2.model.Forum;
@@ -206,6 +207,11 @@ public ListenableFuture<List<JobStatus<HashMap<String, Object>>>> getJobStatuses
         return submit(req("GET", tmpl("/job_statuses/show_many.json{?ids}").set("ids", ids)), handleList(clazz, "job_statuses"));
     }
 
+    public List<Brand> getBrands(){
+        return complete(submit(req("GET", cnst("/brands.json")), handleList(Brand.class,
+                "brands")));
+    }
+
     public TicketForm getTicketForm(long id) {
         return complete(submit(req("GET", tmpl("/ticket_forms/{id}.json").set("id", id)), handle(TicketForm.class,
                 "ticket_form")));

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

@@ -0,0 +1,164 @@
+package org.zendesk.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @since 09/11/2016 13:08
+ * @version FIXME
+ */
+public class Brand {
+
+    private String url;
+    private Long id;
+    private String name;
+    @JsonProperty("brand_url")
+    private String brandUrl;
+    @JsonProperty("has_help_center")
+    private boolean hasHelpCenter;
+    @JsonProperty("help_center_state")
+    private String helpCenterState;
+    @JsonProperty("active")
+    private boolean isActive;
+    @JsonProperty("default")
+    private boolean isDefault;
+    private Attachment logo;
+    @JsonProperty("ticket_form_ids")
+    private List<Long> ticketFormIds;
+    @JsonProperty("created_at")
+    private Date createdAt;
+    @JsonProperty("updated_at")
+    private Date updatedAt;
+    private String subdomain;
+    @JsonProperty("host_mapping")
+    private String hostMapping;
+
+    public Brand() {
+    }
+
+    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 String getSubdomain() {
+        return subdomain;
+    }
+
+    public void setSubdomain(String subdomain) {
+        this.subdomain = subdomain;
+    }
+
+    public String getHostMapping() {
+        return hostMapping;
+    }
+
+    public void setHostMapping(String hostMapping) {
+        this.hostMapping = hostMapping;
+    }
+
+    public String getSignatureTemplate() {
+        return signatureTemplate;
+    }
+
+    public void setSignatureTemplate(String signatureTemplate) {
+        this.signatureTemplate = signatureTemplate;
+    }
+
+    @JsonProperty("signature_template")
+    private String signatureTemplate;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBrandUrl() {
+        return brandUrl;
+    }
+
+    public void setBrandUrl(String brandUrl) {
+        this.brandUrl = brandUrl;
+    }
+
+    public boolean isHasHelpCenter() {
+        return hasHelpCenter;
+    }
+
+    public void setHasHelpCenter(boolean hasHelpCenter) {
+        this.hasHelpCenter = hasHelpCenter;
+    }
+
+    public String getHelpCenterState() {
+        return helpCenterState;
+    }
+
+    public void setHelpCenterState(String helpCenterState) {
+        this.helpCenterState = helpCenterState;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    public void setDefault(boolean aDefault) {
+        isDefault = aDefault;
+    }
+
+    public Attachment getLogo() {
+        return logo;
+    }
+
+    public void setLogo(Attachment logo) {
+        this.logo = logo;
+    }
+
+    public List<Long> getTicketFormIds() {
+        return ticketFormIds;
+    }
+
+    public void setTicketFormIds(List<Long> ticketFormIds) {
+        this.ticketFormIds = ticketFormIds;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

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

@@ -27,6 +27,7 @@
 import org.junit.Test;
 import org.zendesk.client.v2.model.AgentRole;
 import org.zendesk.client.v2.model.Audit;
+import org.zendesk.client.v2.model.Brand;
 import org.zendesk.client.v2.model.Collaborator;
 import org.zendesk.client.v2.model.Comment;
 import org.zendesk.client.v2.model.Field;
@@ -113,6 +114,16 @@ public void createClientWithTokenOrPassword() throws Exception {
         instance = builder.build();
     }
 
+    @Test
+    public void getBrands() throws Exception {
+        createClientWithTokenOrPassword();
+        List<Brand> brands = instance.getBrands();
+        assertTrue(brands.iterator().hasNext());
+        for(Brand brand : brands){
+            assertThat(brand, notNullValue());
+        }
+    }
+
     @Test
     public void getTicket() throws Exception {
         createClientWithTokenOrPassword();