From 4252f184f35bc89964cee0611510e8c9064ed6bf Mon Sep 17 00:00:00 2001
From: dahn <daan@onecht.net>
Date: Thu, 12 Mar 2026 14:17:49 +0100
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Co-authored-by: dahn <daan.hoogland@gmail.com>
---
 .../java/com/cloud/vm/UserVmManagerImpl.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 200436524ef..9ed21269130 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -882,7 +882,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     private boolean resetVMPasswordInternal(Long vmId, String password) throws ResourceUnavailableException, InsufficientCapacityException {
         VMInstanceVO vmInstance = _vmDao.findById(vmId);
 
-        if (password == null || password.isEmpty()) {
+        if (StringUtils.isBlank(password)) {
             return false;
         }
 
@@ -3806,7 +3806,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     }
 
     private boolean validPassword(String password) {
-        if (password == null || password.isEmpty()) {
+       if (StringUtils.isBlank(password)) {
             return false;
         }
         for (int i = 0; i < password.length(); i++) {
@@ -4642,7 +4642,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     }
 
     private long verifyAndGetDiskSize(DiskOffering diskOffering, Long diskSize) {
-        long size = 0L;
+        long size;
         if (diskOffering == null) {
             throw new InvalidParameterValueException("Specified disk offering cannot be found");
         }
@@ -5183,7 +5183,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                             sc_nic.addAnd("macAddress", SearchCriteria.Op.EQ, vmNetworkStat.getMacAddress());
                             NicVO nic = _nicDao.search(sc_nic, null).get(0);
                             List<VlanVO> vlan = _vlanDao.listVlansByNetworkId(nic.getNetworkId());
-                            if (vlan == null || vlan.isEmpty() || vlan.get(0).getVlanType() != VlanType.DirectAttached)
+                            if (CollectionUtils.isEmpty(vlan) || vlan.get(0).getVlanType() != VlanType.DirectAttached)
                             {
                                 break; // only get network statistics for DirectAttached network (shared networks in Basic zone and Advanced zone with/without SG)
                             }
@@ -5363,7 +5363,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
         if (dc.getDns2() != null) {
             buf.append(" dns2=").append(dc.getDns2());
         }
-        logger.info("cmdline details: "+ buf);
+        logger.info("cmdline details: {}”, buf);
     }
 
     @Override
@@ -5784,7 +5784,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                 throw new InvalidParameterValueException(ApiConstants.BOOT_INTO_SETUP + " makes no sense for " + vm.getHypervisorType());
             }
             Object paramValue = additionalParams.get(VirtualMachineProfile.Param.BootIntoSetup);
-            logger.trace("It was specified whether to enter setup mode: {}", paramValue.toString());
+            logger.trace("It was specified whether to enter setup mode: {}", paramValue);
             params = createParameterInParameterMap(params, additionalParams, VirtualMachineProfile.Param.BootIntoSetup, paramValue);
         }
 
@@ -6086,7 +6086,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
                             SearchCriteria<VolumeVO> sc_volume = _volsDao.createSearchCriteria();
                             sc_volume.addAnd("path", SearchCriteria.Op.LIKE, vmDiskStat.getPath() + "%");
                             List<VolumeVO> volumes = _volsDao.search(sc_volume, null);
-                            if ((volumes == null) || (volumes.isEmpty())) {
+                            if (CollectionUtils.isEmpty(volumes)) {
                                 break;
                             }
                             VolumeVO volume = volumes.get(0);
@@ -9331,7 +9331,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
     private void encryptAndStorePassword(UserVmVO vm, String password) {
         String sshPublicKeys = vm.getDetail(VmDetailConstants.SSH_PUBLIC_KEY);
-        if (sshPublicKeys != null && !sshPublicKeys.isEmpty() && password != null && !password.equals("saved_password")) {
+        if (!StringUtils.isEmpty(sshPublicKeys) && password != null && !password.equals("saved_password")) {
             if (!sshPublicKeys.startsWith("ssh-rsa")) {
                 logger.warn("Only RSA public keys can be used to encrypt a vm password.");
                 return;