if total page headers missing, fallback to get until no more to get

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/models/PagedResults.java

@@ -26,29 +26,51 @@
 @AllArgsConstructor
 public class PagedResults<T> {
     public static final Logger LOGGER = LoggerFactory.getLogger(PagedResults.class);
-            
+    
+    private static final int UNDEFINED_PAGE_COUNT = 10000;
+    private int pageSize;
     @Builder.Default private int number = 1;
     @Builder.Default private int total = 1;
     @Builder.Default private List<T> results = new ArrayList<>();
 
+    public PagedResults(int pageSize) {
+        this();
+        this.pageSize = pageSize;
+    }
+    
 
     public boolean hasMore() {
         return total >= number;
     }
 
     public void update(Response response, GenericType<List<T>> type) {
+        LOGGER.debug("update");
 
         if(number == 1) {
             String totalPageString = response.getHeaderString("X-Total-Pages");
-            total = Integer.valueOf(totalPageString);
+            
+            if(totalPageString == null) {
+                total = UNDEFINED_PAGE_COUNT; //Should not be able to get this high
+                LOGGER.debug("X-Total-Pages header is missing");
+            } else {
+                total = Integer.valueOf(totalPageString);
+            }
+            
             LOGGER.trace("TOTAL PAGES {}", total);
         }
-        List<T> p = response.readEntity(type);
-        results.addAll(p);
+        List<T> responseSet = response.readEntity(type);
+        
+        //There were no results so don't get any more.
+        if(responseSet.size() < pageSize && total == UNDEFINED_PAGE_COUNT) {
+            total = 1;
+        }
+        
+        results.addAll(responseSet);
         number++;
     }
 
     public int size() {
         return results.size();
     }
+  
 }

src/main/java/com/redhat/labs/lodestar/service/ProjectService.java

@@ -151,7 +151,7 @@ public void enableDeploymentKeyOnProject(Integer projectId, Integer deployKey) {
     }
 
     public List<Commit> getCommitLog(String projectId) {
-        PagedResults<Commit> page = new PagedResults<>();
+        PagedResults<Commit> page = new PagedResults<>(commitPageSize);
 
         while(page.hasMore()) {
             Response response = gitLabService.getCommitLog(projectId, commitPageSize, page.getNumber());

src/test/java/com/redhat/labs/lodestar/mocks/MockGitLabService.java

@@ -321,6 +321,10 @@ public Response getCommitLog(String projectId, int perPage, int pageNumber) {
         if("multi/page/iac".equals(projectId)) {
             return Response.ok(commitList).header("X-Total-Pages", 2).build();
         }
+
+        if("multi/page/missingheader".equals(projectId)) {
+            return Response.ok(commitList).build();
+        }
 
         return Response.ok(new ArrayList<Commit>()).header("X-Total-Pages", 0).build();
     }

src/test/java/com/redhat/labs/lodestar/service/EngagementServiceTest.java

@@ -16,6 +16,7 @@
 import javax.ws.rs.core.Response;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -41,6 +42,15 @@ public class EngagementServiceTest {
     @RestClient
     GitLabService gitLabService;
 
+   @BeforeEach
+    void setup() {
+
+        // set the engagement path prefix
+        Group g = Group.builder().fullPath("top/dog").build();
+        MockUtils.setGetGroupByIdOrPathMock(gitLabService, 2, g);
+
+    }
+
     @Test void testCreateEngagementNewProject() {
 
         // given

src/test/java/com/redhat/labs/lodestar/service/ProjectServiceTest.java

@@ -104,4 +104,11 @@ class ProjectServiceTest {
         assertEquals(6, commits.size());
 
     }
+
+    //Will only get first page since the page size will be larger
+    @Test void getCommitsMultiPageMissingHeader() {
+        List<Commit> commits = projectService.getCommitLog("multi/page/missingheader");
+        assertNotNull(commits);
+        assertEquals(3, commits.size());
+    }
 }