Fix IndexOutOfBoundsException when using an iterator (#405)

KatsuteDev · Oct 14, 2023 · e286f32 · e286f32
1 parent 4d7293b
commit e286f32
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dev.katsute</groupId>
     <artifactId>mal4j</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
 
     <profiles>
         <profile>

diff --git a/src/main/java/dev/katsute/mal4j/Logging.java b/src/main/java/dev/katsute/mal4j/Logging.java
@@ -54,7 +54,7 @@ public static Logger getLogger(){
 
     // debug
 
-    private static boolean debug = false;
+    private static boolean debug = false; // do not edit this flag for tests, change in TestProvider
 
     static void setDebug(final boolean debug){
         Logging.debug = debug;

diff --git a/src/main/java/dev/katsute/mal4j/MyAnimeListImpl.java b/src/main/java/dev/katsute/mal4j/MyAnimeListImpl.java
@@ -969,6 +969,8 @@ private static class PagedIterator<T> extends PaginatedIterator<T> {
 
         private final AtomicReference<Integer> nextOffset = new AtomicReference<>();
 
+        private JsonObject nextPage = null; // pre-fetch next page #404
+
         PagedIterator(
             final Integer offset,
             final Function<Integer,Response<JsonObject>> fullPageSupplier,
@@ -991,13 +993,15 @@ final boolean hasNextPage(){
         @SuppressWarnings("DataFlowIssue")
         @Override
         synchronized final List<T> getNextPage(){
-            final JsonObject response = handleResponse(() -> fullPageSupplier.apply(nextOffset.get()));
+            // use pre-fetched next page or fetch the first page
+            final JsonObject response = nextPage != null ? nextPage : handleResponse(() -> fullPageSupplier.apply(nextOffset.get()));
 
             if(response == null){
                 nextOffset.set(-1);
                 return null;
             }
 
+            // convert response to list
             final List<T> list = new ArrayList<>();
             for(final JsonObject data :
                 response.get("data") instanceof JsonObject && response.getJsonObject("data").containsKey("posts") // post iterator support
@@ -1006,11 +1010,25 @@ synchronized final List<T> getNextPage(){
             )
                 list.add(listAdapter.apply(data));
 
+            // handle next offset
             if(response.getJsonObject("paging").containsKey("next")){
                 final Integer b4 = nextOffset.get();
                 nextOffset.set((b4 == null ? 0 : b4) + list.size());
-                return list;
+
+                // peek into next page #404
+                nextPage = handleResponse(() -> fullPageSupplier.apply(nextOffset.get()));
+
+                if( // check if next page actually has any content
+                    (nextPage.get("data") instanceof JsonObject && nextPage.getJsonObject("data").containsKey("posts") // post iterator support
+                    ? nextPage.getJsonObject("data").getJsonArray("posts")
+                    : nextPage.getJsonArray("data"))
+                    .length > 0
+                )
+                    return list;
             }
+
+            // last page
+            nextPage = null;
             nextOffset.set(-1);
 
             return list;

diff --git a/src/test/java/dev/katsute/mal4j/AnimeTests/TestUserAnimeListing.java b/src/test/java/dev/katsute/mal4j/AnimeTests/TestUserAnimeListing.java
@@ -27,11 +27,11 @@ static void beforeAll(){
     final void testStatus(){
         final List<AnimeListStatus> list =
             mal.getUserAnimeListing()
-                .withStatus(AnimeStatus.Dropped)
+                .withStatus(AnimeStatus.Completed)
                 .withFields(Fields.Anime.list_status)
                 .withLimit(1)
                 .search();
-        assertEquals(AnimeStatus.Dropped, list.get(0).getStatus());
+        assertEquals(AnimeStatus.Completed, list.get(0).getStatus());
     }
 
     @Test

diff --git a/src/test/java/dev/katsute/mal4j/MangaTests/TestUserMangaListing.java b/src/test/java/dev/katsute/mal4j/MangaTests/TestUserMangaListing.java
@@ -27,11 +27,11 @@ static void beforeAll(){
     final void testStatus(){
         final List<MangaListStatus> list =
             mal.getUserMangaListing()
-                .withStatus(MangaStatus.PlanToRead)
+                .withStatus(MangaStatus.Completed)
                 .withLimit(1)
                 .withFields(Fields.Manga.list_status)
                 .search();
-        assertEquals(MangaStatus.PlanToRead, list.get(0).getStatus());
+        assertEquals(MangaStatus.Completed, list.get(0).getStatus());
     }
 
     @Test