Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods to lowercase in storage commands. ......................................................................
core: rename methods to lowercase in storage commands. Change-Id: I42e8d7c402e0655d72bd59f32f4494f9d4cf438a Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainManagementCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolStatusHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java 8 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/20852/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java index 8ffcc8e..693c40e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java @@ -54,8 +54,8 @@ @Override protected boolean canDoAction() { boolean returnValue = checkStoragePool() - && CheckStoragePoolStatusNotEqual(StoragePoolStatus.Uninitialized, - VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_STATUS_ILLEGAL) + && checkStoragePoolStatusNotEqual(StoragePoolStatus.Uninitialized, + VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_STATUS_ILLEGAL) && checkStorageDomain() && storageDomainStatusIsValid() && (getStorageDomain().getStorageDomainType() == StorageDomainType.Master || checkMasterDomainIsUp()) 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 bda7bcd..20f206e 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 @@ -149,7 +149,7 @@ protected boolean canDoAction() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); boolean returnValue = super.canDoAction() && initializeVds() && checkStorageDomainNameLengthValid(); - if (returnValue && IsStorageWithSameNameExists()) { + if (returnValue && isStorageWithSameNameExists()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST); returnValue = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java index 79b789f..8f253be 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStoragePoolWithStoragesCommand.java @@ -286,7 +286,7 @@ @Override protected boolean canDoAction() { boolean returnValue = super.canDoAction() && checkStoragePool() - && CheckStoragePoolStatus(StoragePoolStatus.Uninitialized) && initializeVds() + && checkStoragePoolStatus(StoragePoolStatus.Uninitialized) && initializeVds() && checkStorageDomainsInPool(); return returnValue; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java index a48861d..2327d76 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java @@ -303,7 +303,7 @@ protected boolean canDoAction() { if (!super.canDoAction() || !checkStoragePool() || - !CheckStoragePoolStatusNotEqual(StoragePoolStatus.Up, + !checkStoragePoolStatusNotEqual(StoragePoolStatus.Up, VdcBllMessages.ERROR_CANNOT_REMOVE_ACTIVE_STORAGE_POOL)) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainManagementCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainManagementCommandBase.java index 00babe0..8bef8b1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainManagementCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainManagementCommandBase.java @@ -30,7 +30,7 @@ return super.getStorageDomain(); } - protected boolean IsStorageWithSameNameExists() { + protected boolean isStorageWithSameNameExists() { return DbFacade.getInstance().getStorageDomainStaticDao().getByName(getStorageDomain().getStorageName()) != null; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index 427e115..2fdd92e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -66,7 +66,7 @@ super(commandId); } - public static List<VDS> GetAllRunningVdssInPool(StoragePool pool) { + public static List<VDS> getAllRunningVdssInPool(StoragePool pool) { return DbFacade.getInstance().getVdsDao().getAllForStoragePoolAndStatus(pool.getId(), VDSStatus.Up); } @@ -128,7 +128,7 @@ return true; } - protected boolean CheckStoragePoolStatus(StoragePoolStatus status) { + protected boolean checkStoragePoolStatus(StoragePoolStatus status) { boolean returnValue = false; StoragePool storagePool = getStoragePool(); if (storagePool != null) { @@ -142,7 +142,7 @@ return returnValue; } - protected boolean CheckStoragePoolStatusNotEqual(StoragePoolStatus status, VdcBllMessages onFailMessage) { + protected boolean checkStoragePoolStatusNotEqual(StoragePoolStatus status, VdcBllMessages onFailMessage) { boolean returnValue = false; StoragePool storagePool = getStoragePool(); if (storagePool != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolStatusHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolStatusHandler.java index ee9840c..ce9104f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolStatusHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolStatusHandler.java @@ -86,7 +86,7 @@ private static void nonOperationalPoolTreatment(StoragePool pool) { boolean changeStatus = false; - if (StorageHandlingCommandBase.GetAllRunningVdssInPool(pool).size() > 0) { + if (StorageHandlingCommandBase.getAllRunningVdssInPool(pool).size() > 0) { changeStatus = true; } if (changeStatus) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java index f346203..8ef3ecf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java @@ -63,7 +63,7 @@ && !validate(new StoragePoolValidator(getStoragePool()).isUp())) { returnValue = false; } - if (returnValue && _storageDomainNameChanged && IsStorageWithSameNameExists()) { + if (returnValue && _storageDomainNameChanged && isStorageWithSameNameExists()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_NAME_ALREADY_EXIST); returnValue = false; } -- To view, visit http://gerrit.ovirt.org/20852 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42e8d7c402e0655d72bd59f32f4494f9d4cf438a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
