Merge pull request #550 from Walti91/master

Author: PierreBtz

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

@@ -63,6 +63,7 @@
 import org.zendesk.client.v2.model.hc.Article;
 import org.zendesk.client.v2.model.hc.ArticleAttachments;
 import org.zendesk.client.v2.model.hc.Category;
+import org.zendesk.client.v2.model.hc.Locales;
 import org.zendesk.client.v2.model.hc.PermissionGroup;
 import org.zendesk.client.v2.model.hc.Section;
 import org.zendesk.client.v2.model.hc.Subscription;
@@ -2184,10 +2185,18 @@ public void deleteUserSegment(long id) {
                 handleStatus()));
     }
 
-    public List<String> getHelpCenterLocales() {
+    public Locales listHelpCenterLocales() {
         return complete(submit(
-                req("GET", cnst("/help_center/locales.json")),
-                handle(List.class, "locales")));
+            req("GET", cnst("/help_center/locales.json")),
+            handle(Locales.class)));
+    }
+
+    /**
+     * @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead
+     */
+    @Deprecated
+    public List<String> getHelpCenterLocales() {
+        return listHelpCenterLocales().getLocales();
     }
 
     /**

src/main/java/org/zendesk/client/v2/model/hc/Locales.java

@@ -0,0 +1,28 @@
+package org.zendesk.client.v2.model.hc;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+public class Locales {
+
+  @JsonProperty("default_locale")
+  private String defaultLocale;
+
+  private List<String> locales;
+
+  public String getDefaultLocale() {
+    return defaultLocale;
+  }
+
+  public void setDefaultLocale(String defaultLocale) {
+    this.defaultLocale = defaultLocale;
+  }
+
+  public List<String> getLocales() {
+    return locales;
+  }
+
+  public void setLocales(List<String> locales) {
+    this.locales = locales;
+  }
+}

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

@@ -47,6 +47,7 @@
 import org.zendesk.client.v2.model.events.Event;
 import org.zendesk.client.v2.model.hc.Article;
 import org.zendesk.client.v2.model.hc.Category;
+import org.zendesk.client.v2.model.hc.Locales;
 import org.zendesk.client.v2.model.hc.PermissionGroup;
 import org.zendesk.client.v2.model.hc.Section;
 import org.zendesk.client.v2.model.hc.Subscription;
@@ -95,6 +96,7 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assume.assumeThat;
 
 /**
@@ -1592,6 +1594,19 @@ public void getArticleSubscriptions() throws Exception {
         }
     }
 
+    @Test
+    public void listHelpCenterLocales() throws Exception {
+        createClientWithTokenOrPassword();
+
+        Locales locales = instance.listHelpCenterLocales();
+
+        assertNotNull(locales);
+        assertNotNull(locales.getDefaultLocale());
+        assertNotNull(locales.getLocales());
+        assertFalse(locales.getLocales().isEmpty());
+        assertTrue(locales.getLocales().contains(locales.getDefaultLocale()));
+    }
+
     @Test
     public void getArticleTranslations() throws Exception {
         createClientWithTokenOrPassword();
@@ -1617,7 +1632,7 @@ public void getArticleTranslations() throws Exception {
     @Test
     public void showArticleTranslation() throws Exception {
         createClientWithTokenOrPassword();
-        List<String> locales = instance.getHelpCenterLocales();
+        List<String> locales = instance.listHelpCenterLocales().getLocales();
 
         int articleCount = 0;
 
@@ -1671,7 +1686,7 @@ public void getSectionTranslations() throws Exception {
     @Test
     public void showSectionTranslation() throws Exception {
         createClientWithTokenOrPassword();
-        List<String> locales = instance.getHelpCenterLocales();
+        List<String> locales = instance.listHelpCenterLocales().getLocales();
 
         int sectionCount = 0;
 
@@ -1725,7 +1740,7 @@ public void getCategoryTranslations() throws Exception {
     @Test
     public void showCategoryTranslation() throws Exception {
         createClientWithTokenOrPassword();
-        List<String> locales = instance.getHelpCenterLocales();
+        List<String> locales = instance.listHelpCenterLocales().getLocales();
 
         int categoryCount = 0;