pagination param fix

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>
opensearch-project · Feb 24, 2025 · 9929827 · 9929827
1 parent de6816e
commit 9929827
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.../java/org/opensearch/dataprepper/plugins/source/confluence/rest/ConfluenceRestClient.java b/.../java/org/opensearch/dataprepper/plugins/source/confluence/rest/ConfluenceRestClient.java
@@ -38,6 +38,7 @@ public class ConfluenceRestClient extends AtlassianRestClient {
     public static final String REST_API_FETCH_CONTENT = "wiki/rest/api/content/";
     public static final String REST_API_CONTENT_EXPAND_PARAM = "?expand=body.view";
     //public static final String REST_API_SPACES = "/rest/api/api/spaces";
+    public static final String WIKI_PARAM = "wiki";
     public static final String FIFTY = "50";
     public static final String START_AT = "startAt";
     public static final String LIMIT_PARAM = "limit";
@@ -78,7 +79,7 @@ public ConfluenceSearchResults getAllContent(StringBuilder cql, int startAt,
         URI uri;
         if (null != paginationLinks && null != paginationLinks.getNext()) {
             try {
-                uri = new URI(authConfig.getUrl() + paginationLinks.getNext());
+                uri = new URI(authConfig.getUrl() + WIKI_PARAM + paginationLinks.getNext());
             } catch (URISyntaxException e) {
                 throw new RuntimeException("Failed to construct pagination url.", e);
             }

diff --git a/...a/org/opensearch/dataprepper/plugins/source/confluence/rest/ConfluenceRestClientTest.java b/...a/org/opensearch/dataprepper/plugins/source/confluence/rest/ConfluenceRestClientTest.java
@@ -138,7 +138,7 @@ public void testGetAllContentOauth2Pagination() throws URISyntaxException {
         doReturn(oauthUrlHost).when(authConfig).getUrl();
         doReturn(new ResponseEntity<>(mockConfluenceSearchResults, HttpStatus.OK))
                 .when(restTemplate)
-                .getForEntity(new URI(oauthUrlHost + paginationNextLink), ConfluenceSearchResults.class);
+                .getForEntity(new URI(oauthUrlHost + ConfluenceRestClient.WIKI_PARAM + paginationNextLink), ConfluenceSearchResults.class);
         ConfluenceSearchResults results = confluenceRestClient.getAllContent(jql, 0, paginationLinks);
         assertNotNull(results);
     }