Allon Mureinik has uploaded a new change for review. Change subject: core: Early return AddStorageDomainCommand's CDA ......................................................................
core: Early return AddStorageDomainCommand's CDA Used early return to improve readability. Change-Id: Ibed33518e5becb96b0de331376d158df29f06dca Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java 1 file changed, 14 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/30951/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index 549d668..d5d1d76 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -137,35 +137,30 @@ @Override protected boolean canDoAction() { - boolean returnValue = super.canDoAction() && initializeVds() && checkStorageDomainNameLengthValid(); - if (returnValue && isStorageWithSameNameExists()) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST); - returnValue = false; + if (!super.canDoAction() || !initializeVds() || !checkStorageDomainNameLengthValid()) { + return false; } - if (returnValue && getStorageDomain().getStorageDomainType() == StorageDomainType.ISO + if (isStorageWithSameNameExists()) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST); + } + if (getStorageDomain().getStorageDomainType() == StorageDomainType.ISO && !getStorageDomain().getStorageType().isFileDomain()) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); - returnValue = false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); } - if (returnValue && getStorageDomain().getStorageDomainType() == StorageDomainType.ImportExport + if (getStorageDomain().getStorageDomainType() == StorageDomainType.ImportExport && getStorageDomain().getStorageType() == StorageType.LOCALFS) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); - returnValue = false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); } - if (returnValue && getStorageDomain().getStorageDomainType() == StorageDomainType.Master) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); - returnValue = false; + if (getStorageDomain().getStorageDomainType() == StorageDomainType.Master) { + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); } - - boolean isSupportedStorageFormat = - isStorageFormatSupportedByStoragePool() && isStorageFormatCompatibleWithDomain(); - if (returnValue && !isSupportedStorageFormat) { + if (!isStorageFormatSupportedByStoragePool() || !isStorageFormatCompatibleWithDomain()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_FORMAT_ILLEGAL_HOST); getReturnValue().getCanDoActionMessages().add( String.format("$storageFormat %1$s", getStorageDomain().getStorageFormat().toString())); - returnValue = false; + return false; } - return returnValue && canAddDomain(); + return canAddDomain(); } private boolean isStorageFormatSupportedByStoragePool() { -- To view, visit http://gerrit.ovirt.org/30951 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibed33518e5becb96b0de331376d158df29f06dca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
