Apply suggestions from code review

Co-authored-by: Fabricio Duarte <[email protected]>

Author: 2 people

engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairDaoImpl.java

@@ -58,19 +58,15 @@ public ApiKeyPairVO findBySecretKey(String secretKey) {
 
     public Pair<List<ApiKeyPairVO>, Integer> listApiKeysByUserOrApiKeyId(Long userId, Long apiKeyId) {
         SearchCriteria<ApiKeyPairVO> sc = keyPairSearch.create();
-        if (userId != null) {
-            sc.setParametersIfNotNull("userId", String.valueOf(userId));
-        }
+        sc.setParametersIfNotNull("userId", userId);
         sc.setParametersIfNotNull("id", apiKeyId);
         final Filter searchFilter = new Filter(100);
         return searchAndCount(sc, searchFilter);
     }
 
     public ApiKeyPairVO getLastApiKeyCreatedByUser(Long userId) {
         final SearchCriteria<ApiKeyPairVO> sc = keyPairSearch.create();
-        if (userId != null) {
-            sc.setParameters("userId", String.valueOf(userId));
-        }
+        sc.setParametersIfNotNull("userId", userId);
         final Filter searchBySorted = new Filter(ApiKeyPairVO.class, "id", false, null, null);
         return findOneBy(sc, searchBySorted);
     }

engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairPermissionsDaoImpl.java

@@ -49,7 +49,7 @@ public List<ApiKeyPairPermissionVO> findAllByApiKeyPairId(Long apiKeyPairId) {
     public ApiKeyPairPermissionVO persist(final ApiKeyPairPermissionVO item) {
         item.setSortOrder(0);
         final List<ApiKeyPairPermissionVO> permissionsList = findAllByKeyPairIdSorted(item.getApiKeyPairId());
-        if (permissionsList != null && !permissionsList.isEmpty()) {
+        if (!CollectionUtils.isEmpty(permissionsList)) {
             ApiKeyPairPermissionVO lastPermission = permissionsList.get(permissionsList.size() - 1);
             item.setSortOrder(lastPermission.getSortOrder() + 1);
         }

server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java

@@ -555,7 +555,7 @@ private boolean verifyRequest(Map<String, Object[]> requestParameters) {
             }
 
             if (keyPair == null) {
-                LOGGER.debug("User does not have a keypair associated with the account -- ignoring request, username: " + user.getUsername());
+                LOGGER.debug("User does not have a keypair associated with the account -- ignoring request, username: {}", user.getUsername());
                 return false;
             }