Change listBy to findOneBy

Nicole Schmidt · Nicole Schmidt · commit 073a9c03fb7c · 2025-02-25T12:32:10.000-03:00
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairDaoImpl.java
@@ -72,11 +72,7 @@ public ApiKeyPairVO getLastApiKeyCreatedByUser(Long userId) {
             sc.setParameters("userId", String.valueOf(userId));
         }
         final Filter searchBySorted = new Filter(ApiKeyPairVO.class, "id", false, null, null);
-        final List<ApiKeyPairVO> apiKeyPairVOList = listBy(sc, searchBySorted);
-        if (CollectionUtils.isEmpty(apiKeyPairVOList)) {
-            return null;
-        }
-        return apiKeyPairVOList.get(0);
+        return findOneBy(sc, searchBySorted);
     }
 
     public Pair<List<ApiKeyPairVO>, Integer> listByUserIdsPaginated(List<Long> userIds, ListUserKeysCmd cmd) {

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,7 @@ public ApiKeyPairVO getLastApiKeyCreatedByUser(Long userId) {`
`72`	`72`	`sc.setParameters("userId", String.valueOf(userId));`
`73`	`73`	`}`
`74`	`74`	`final Filter searchBySorted = new Filter(ApiKeyPairVO.class, "id", false, null, null);`
`75`		`- final List<ApiKeyPairVO> apiKeyPairVOList = listBy(sc, searchBySorted);`
`76`		`- if (CollectionUtils.isEmpty(apiKeyPairVOList)) {`
`77`		`- return null;`
`78`		`- }`
`79`		`- return apiKeyPairVOList.get(0);`
	`75`	`+ return findOneBy(sc, searchBySorted);`
`80`	`76`	`}`
`81`	`77`
`82`	`78`	`public Pair<List<ApiKeyPairVO>, Integer> listByUserIdsPaginated(List<Long> userIds, ListUserKeysCmd cmd) {`