Merge branch 'master' into pbeitz/gh-691

Author: PierreBtz

pom.xml

@@ -253,7 +253,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifest>

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

@@ -2904,13 +2904,31 @@ public Iterable<Article> getArticles(Category category) {
         handleList(Article.class, "articles"));
   }
 
+  public Iterable<Article> getArticles(Category category, String locale) {
+    checkHasId(category);
+    return new PagedIterable<>(
+        tmpl("/help_center/{locale}/categories/{id}/articles.json")
+            .set("id", category.getId())
+            .set("locale", locale),
+        handleList(Article.class, "articles"));
+  }
+
   public Iterable<Article> getArticles(Section section) {
     checkHasId(section);
     return new PagedIterable<>(
         tmpl("/help_center/sections/{id}/articles.json").set("id", section.getId()),
         handleList(Article.class, "articles"));
   }
 
+  public Iterable<Article> getArticles(Section section, String locale) {
+    checkHasId(section);
+    return new PagedIterable<>(
+        tmpl("/help_center/{locale}/sections/{id}/articles.json")
+            .set("id", section.getId())
+            .set("locale", locale),
+        handleList(Article.class, "articles"));
+  }
+
   public Iterable<Article> getArticlesIncrementally(Date startTime) {
     return new PagedIterable<>(
         tmpl("/help_center/incremental/articles.json{?start_time}")

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

@@ -1,15 +1,26 @@
 package org.zendesk.client.v2.model;
 
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXTERNAL_PROPERTY;
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import org.zendesk.client.v2.model.comments.VoiceComment;
 
 /**
  * @author stephenc
  * @since 09/04/2013 15:09
  */
+@JsonTypeInfo(use = NAME, include = EXTERNAL_PROPERTY, property = "type", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Comment.class, name = "Comment"),
+  @JsonSubTypes.Type(value = VoiceComment.class, name = "VoiceComment")
+})
 public class Comment implements Serializable {
 
   private static final long serialVersionUID = 1L;

src/main/java/org/zendesk/client/v2/model/comments/VoiceComment.java

@@ -0,0 +1,14 @@
+package org.zendesk.client.v2.model.comments;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.zendesk.client.v2.model.Comment;
+
+public class VoiceComment extends Comment {
+
+  private VoiceCommentData data;
+
+  @JsonProperty("data")
+  public VoiceCommentData getData() {
+    return data;
+  }
+}

src/main/java/org/zendesk/client/v2/model/comments/VoiceCommentData.java

@@ -0,0 +1,17 @@
+package org.zendesk.client.v2.model.comments;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author besbes
+ * @since 05/03/2024 13:51
+ */
+public class VoiceCommentData {
+
+  private Long callDuration;
+
+  @JsonProperty("call_duration")
+  public Long getCallDuration() {
+    return callDuration;
+  }
+}