From 5696077a4a5029fb124f089a420ab9f2566bb074 Mon Sep 17 00:00:00 2001 From: Jalina2007 Date: Mon, 27 Oct 2025 01:45:28 +0530 Subject: [PATCH 1/2] Update pagination links in ServerAPIResourceManagementService to use resource names instead of cursor keys --- .../resource/v1/core/ServerAPIResourceManagementService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java index 58707d2d0e..a83f592ffc 100644 --- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java @@ -177,14 +177,14 @@ public APIResourceListResponse getAPIResources(String before, String after, Stri Collections.reverse(apiResources); } if (!isFirstPage) { - String encodedString = Base64.getEncoder().encodeToString(apiResources.get(0).getCursorKey() + String encodedString = Base64.getEncoder().encodeToString(apiResources.get(0).getName() .toString().getBytes(StandardCharsets.UTF_8)); apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&before=" + encodedString, "previous")); } if (!isLastPage) { String encodedString = Base64.getEncoder().encodeToString(apiResources.get(apiResources.size() - 1) - .getCursorKey().toString().getBytes(StandardCharsets.UTF_8)); + .getName().toString().getBytes(StandardCharsets.UTF_8)); apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&after=" + encodedString, "next")); } } From 034b4068a16c00b9f413599a638dcd7adb2a8a34 Mon Sep 17 00:00:00 2001 From: Jalina2007 Date: Fri, 31 Oct 2025 12:02:00 +0530 Subject: [PATCH 2/2] Removed reduntant .toString() method calls which caused the build to fail --- .../resource/v1/core/ServerAPIResourceManagementService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java index a83f592ffc..108f447ce5 100644 --- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java @@ -178,13 +178,13 @@ public APIResourceListResponse getAPIResources(String before, String after, Stri } if (!isFirstPage) { String encodedString = Base64.getEncoder().encodeToString(apiResources.get(0).getName() - .toString().getBytes(StandardCharsets.UTF_8)); + .getBytes(StandardCharsets.UTF_8)); apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&before=" + encodedString, "previous")); } if (!isLastPage) { String encodedString = Base64.getEncoder().encodeToString(apiResources.get(apiResources.size() - 1) - .getName().toString().getBytes(StandardCharsets.UTF_8)); + .getName().getBytes(StandardCharsets.UTF_8)); apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&after=" + encodedString, "next")); } }