Merge branch 'master' into feat/user-profiles

Author: arkadiusz-dankiewicz

.github/workflows/release-drafter.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v6.0.0
+      - uses: release-drafter/release-drafter@v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pom.xml

@@ -25,7 +25,7 @@
 
   <groupId>com.cloudbees.thirdparty</groupId>
   <artifactId>zendesk-java-client</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
 
   <name>zendesk-java-client</name>
   <description>Java client for the Zendesk API</description>
@@ -91,22 +91,22 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <spotless.version>2.43.0</spotless.version>
+    <spotless.version>2.44.3</spotless.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.17.2</version>
+        <version>2.18.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
-        <version>4.1.112.Final</version>
+        <version>4.1.119.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client</artifactId>
-      <version>2.12.3</version>
+      <version>3.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.13</version>
+      <version>2.0.17</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -165,19 +165,19 @@
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <!-- use 2.9.0 for Java 7 projects -->
-      <version>3.26.3</version>
+      <version>3.27.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.2.1</version>
+      <version>4.3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -213,7 +213,7 @@
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
           </dependency>
         </dependencies>
         <executions>
@@ -243,7 +243,7 @@
             <configuration>
               <rules>
                 <enforceBytecodeVersion>
-                  <maxJdkVersion>1.8</maxJdkVersion>
+                  <maxJdkVersion>11</maxJdkVersion>
                 </enforceBytecodeVersion>
               </rules>
             </configuration>

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

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.util.StdDateFormat;
 import java.io.Closeable;
@@ -104,6 +105,8 @@
 import org.zendesk.client.v2.model.targets.Target;
 import org.zendesk.client.v2.model.targets.TwitterTarget;
 import org.zendesk.client.v2.model.targets.UrlTarget;
+import org.zendesk.client.v2.model.views.ExecutedViewPage;
+import org.zendesk.client.v2.model.views.ViewRow;
 
 /**
  * @author stephenc
@@ -1034,6 +1037,17 @@ public Iterable<Ticket> getView(long id) {
         tmpl("/views/{id}/tickets.json").set("id", id), handleList(Ticket.class, "tickets"));
   }
 
+  @SuppressWarnings("unchecked")
+  public <V extends ViewRow> Optional<ExecutedViewPage<V>> executeView(long id, Class<V> clazz) {
+    var objectReader =
+        mapper.readerFor(
+            mapper.getTypeFactory().constructParametricType(ExecutedViewPage.class, clazz));
+    return Optional.of(
+        complete(
+            submit(
+                req("GET", tmpl("/views/{id}/execute.json").set("id", id)), handle(objectReader))));
+  }
+
   // Automations
   public Iterable<Automation> getAutomations() {
     return new PagedIterable<>(
@@ -2454,6 +2468,17 @@ public void deleteOrganizationMembership(long user_id, long organization_members
             handleStatus()));
   }
 
+  public void unassignOrganizationMembership(long user_id, long organization_id) {
+    complete(
+        submit(
+            req(
+                "DELETE",
+                tmpl("/users/{uid}/organizations/{oid}.json")
+                    .set("uid", user_id)
+                    .set("oid", organization_id)),
+            handleStatus()));
+  }
+
   public List<OrganizationMembership> setOrganizationMembershipAsDefault(
       long user_id, OrganizationMembership organizationMembership) {
     checkHasId(organizationMembership);
@@ -2967,26 +2992,26 @@ public List<String> getHelpCenterLocales() {
    */
   public Iterable<Article> getArticles() {
     return new PagedIterable<>(
-        cnst("/help_center/articles.json"), handleList(Article.class, "articles"));
+        cbp("/help_center/articles.json"), handleList(Article.class, "articles"));
   }
 
   public Iterable<Article> getArticles(String locale) {
     return new PagedIterable<>(
-        tmpl("/help_center/{locale}/articles.json").set("locale", locale),
+        cbp("/help_center/{locale}/articles.json").set("locale", locale),
         handleList(Article.class, "articles"));
   }
 
   public Iterable<Article> getArticles(Category category) {
     checkHasId(category);
     return new PagedIterable<>(
-        tmpl("/help_center/categories/{id}/articles.json").set("id", category.getId()),
+        cbp("/help_center/categories/{id}/articles.json").set("id", category.getId()),
         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")
+        cbp("/help_center/{locale}/categories/{id}/articles.json")
             .set("id", category.getId())
             .set("locale", locale),
         handleList(Article.class, "articles"));
@@ -2995,14 +3020,14 @@ public Iterable<Article> getArticles(Category category, String locale) {
   public Iterable<Article> getArticles(Section section) {
     checkHasId(section);
     return new PagedIterable<>(
-        tmpl("/help_center/sections/{id}/articles.json").set("id", section.getId()),
+        cbp("/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")
+        cbp("/help_center/{locale}/sections/{id}/articles.json")
             .set("id", section.getId())
             .set("locale", locale),
         handleList(Article.class, "articles"));
@@ -3031,7 +3056,7 @@ public Article getArticle(long id) {
 
   public Iterable<Translation> getArticleTranslations(Long articleId) {
     return new PagedIterable<>(
-        tmpl("/help_center/articles/{articleId}/translations.json").set("articleId", articleId),
+        cbp("/help_center/articles/{articleId}/translations.json").set("articleId", articleId),
         handleList(Translation.class, "translations"));
   }
 
@@ -3587,12 +3612,17 @@ public Void onCompleted(Response response) throws Exception {
 
   @SuppressWarnings("unchecked")
   protected <T> ZendeskAsyncCompletionHandler<T> handle(final Class<T> clazz) {
+    return handle(mapper.readerFor(clazz));
+  }
+
+  @SuppressWarnings("unchecked")
+  protected <T> ZendeskAsyncCompletionHandler<T> handle(ObjectReader reader) {
     return new ZendeskAsyncCompletionHandler<T>() {
       @Override
       public T onCompleted(Response response) throws Exception {
         logResponse(response);
         if (isStatus2xx(response)) {
-          return (T) mapper.readerFor(clazz).readValue(response.getResponseBodyAsStream());
+          return reader.readValue(response.getResponseBodyAsStream());
         } else if (isRateLimitResponse(response)) {
           throw new ZendeskResponseRateLimitException(response);
         }

src/main/java/org/zendesk/client/v2/model/views/ExecutedViewPage.java

@@ -0,0 +1,99 @@
+package org.zendesk.client.v2.model.views;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+// this is somewhat similar to a Page but with a single ExecuteView object and not a list
+// hence why we cannot inherite Page<?>
+public class ExecutedViewPage<V extends ViewRow> implements Serializable {
+  private static final long serialVersionUID = -7683989282890282540L;
+
+  private @JsonProperty("next_page") String nextPage;
+  private @JsonProperty("previous_page") String previousPage;
+  private int count;
+
+  private List<ViewColumn> columns;
+  private List<V> rows;
+
+  public List<ViewColumn> getColumns() {
+    return columns;
+  }
+
+  public void setColumns(List<ViewColumn> columns) {
+    this.columns = columns;
+  }
+
+  public List<V> getRows() {
+    return rows;
+  }
+
+  public void setRows(List<V> rows) {
+    this.rows = rows;
+  }
+
+  public String getNextPage() {
+    return nextPage;
+  }
+
+  public void setNextPage(final String nextPage) {
+    this.nextPage = nextPage;
+  }
+
+  public String getPreviousPage() {
+    return previousPage;
+  }
+
+  public void setPreviousPage(final String previousPage) {
+    this.previousPage = previousPage;
+  }
+
+  public int getCount() {
+    return count;
+  }
+
+  public void setCount(final int count) {
+    this.count = count;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+
+    ExecutedViewPage<?> that = (ExecutedViewPage<?>) o;
+    return count == that.count
+        && Objects.equals(nextPage, that.nextPage)
+        && Objects.equals(previousPage, that.previousPage)
+        && Objects.equals(columns, that.columns)
+        && Objects.equals(rows, that.rows);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = Objects.hashCode(nextPage);
+    result = 31 * result + Objects.hashCode(previousPage);
+    result = 31 * result + count;
+    result = 31 * result + Objects.hashCode(columns);
+    result = 31 * result + Objects.hashCode(rows);
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "ExecutedViewPage{"
+        + "nextPage='"
+        + nextPage
+        + '\''
+        + ", previousPage='"
+        + previousPage
+        + '\''
+        + ", count="
+        + count
+        + ", columns="
+        + columns
+        + ", rows="
+        + rows
+        + '}';
+  }
+}