refactor: logic for subList method when retrieving all data

halo-dev · Jan 23, 2024 · 5068f6c · 5068f6c
1 parent 9d9b152
commit 5068f6c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/api/src/main/java/run/halo/app/extension/ListResult.java b/api/src/main/java/run/halo/app/extension/ListResult.java
@@ -129,6 +129,9 @@ public static <T> ListResult<T> emptyResult() {
      */
     public static <T> List<T> subList(List<T> list, int page, int size) {
         if (page < 1) {
+            page = 1;
+        }
+        if (size < 1) {
             return list;
         }
         List<T> listSort = new ArrayList<>();

diff --git a/application/src/test/java/run/halo/app/extension/ListResultTest.java b/application/src/test/java/run/halo/app/extension/ListResultTest.java
@@ -43,4 +43,27 @@ void totalPages() {
         listResult = new ListResult<>(1, 0, 100, List.of());
         assertEquals(1, listResult.getTotalPages());
     }
+
+    @Test
+    void subListWhenSizeIsZero() {
+        var list = List.of(1, 2, 3, 4, 5);
+        assertSubList(list);
+
+        list = List.of(1);
+        assertSubList(list);
+    }
+
+    private void assertSubList(List<Integer> list) {
+        var result = ListResult.subList(list, 0, 0);
+        assertEquals(list, result);
+
+        result = ListResult.subList(list, 0, 1);
+        assertEquals(list.subList(0, 1), result);
+
+        result = ListResult.subList(list, 0, 0);
+        assertEquals(list, result);
+
+        result = ListResult.subList(list, 1, 0);
+        assertEquals(list, result);
+    }
 }