Added getAllApplications

Vonage · Jul 18, 2023 · 112fc80 · 112fc80
1 parent 8d86385
commit 112fc80
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/src/main/java/com/vonage/client/application/ApplicationClient.java b/src/main/java/com/vonage/client/application/ApplicationClient.java
@@ -18,6 +18,7 @@
 import com.vonage.client.*;
 import com.vonage.client.auth.TokenAuthMethod;
 import com.vonage.client.common.HttpMethod;
+import java.util.List;
 import java.util.function.Function;
 
 /**
@@ -113,23 +114,34 @@ public void deleteApplication(String id) throws VonageResponseParseException, Vo
     }
 
     /**
-     * List the first 1000 available applications.
+     * Lists the first 1000 available applications.
      *
      * @return The list of available applications.
      *
+     * @since 7.7.0
+     */
+    public List<Application> listAllApplications() {
+        return listApplications(ListApplicationRequest.builder().pageSize(1000).build()).getApplications();
+    }
+
+    /**
+     * Lists the first page of available applications.
+     *
+     * @return The ApplicationList HAL response.
+     *
      * @throws VonageResponseParseException if the response from the API could not be parsed.
      * @throws VonageClientException        if there was a problem with the Vonage request.
      */
     public ApplicationList listApplications() throws VonageResponseParseException, VonageClientException {
-        return listApplications(ListApplicationRequest.builder().pageSize(1000).build());
+        return listApplications(ListApplicationRequest.builder().build());
     }
 
     /**
      * List the available applications.
      *
      * @param listApplicationRequest The page and number of applications per page to list.
      *
-     * @return The list of available applications.
+     * @return The ApplicationList HAL response.
      *
      * @throws VonageResponseParseException if the response from the API could not be parsed.
      * @throws VonageClientException        if there was a problem with the Vonage request.

diff --git a/src/test/java/com/vonage/client/application/ApplicationClientTest.java b/src/test/java/com/vonage/client/application/ApplicationClientTest.java
@@ -340,7 +340,7 @@ public void testListApplicationWithOneResult() throws Exception {
 
     @Test
     public void testListApplicationWithMultipleResults() throws Exception {
-        stubResponse("{\n" +
+        String json = "{\n" +
                 "  \"page_size\": 10,\n" +
                 "  \"page\": 1,\n" +
                 "  \"total_items\": 12,\n" +
@@ -385,10 +385,9 @@ public void testListApplicationWithMultipleResults() throws Exception {
                 "      }\n" +
                 "    ]\n" +
                 "  }\n" +
-                "}"
-        );
+                "}";
 
-        ApplicationList response = client.listApplications();
+        ApplicationList response = stubResponseAndGet(json, client::listApplications);
 
         assertEquals((Object) 10, response.getPageSize());
         assertEquals((Object) 1, response.getPage());
@@ -401,6 +400,20 @@ public void testListApplicationWithMultipleResults() throws Exception {
 
         assertEquals("My Application", applications.get(0).getName());
         assertEquals("My Second Application", applications.get(1).getName());
+
+        applications = stubResponseAndGet(json, client::listAllApplications);
+        assertEquals(2, applications.size());
+    }
+
+    @Test
+    public void testListApplicationWithNoResults() throws Exception {
+        String json = "{\"page\":1,\"_embedded\":{\"applications\":[]}}";
+        ApplicationList hal = stubResponseAndGet(json, () ->
+                client.listApplications(ListApplicationRequest.builder().page(1).build())
+        );
+        assertEquals(0, hal.getApplications().size());
+        assertEquals(1, hal.getPage().intValue());
+        assertEquals(0, stubResponseAndGet(json, client::listAllApplications).size());
     }
 
     static abstract class ApplicationEndpointTestSpec<T, R> extends DynamicEndpointTestSpec<T, R> {