etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Co-authored-by: dahn <daan.hoogland@gmail.com>
This commit is contained in:
dahn 2026-03-12 14:17:49 +01:00 committed by Daan Hoogland
parent d93b722559
commit 4252f184f3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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;