Idan Shaby has uploaded a new change for review. Change subject: core: Renamed StorageDomainDAO.getStorageDomainByTypeAndPool ......................................................................
core: Renamed StorageDomainDAO.getStorageDomainByTypeAndPool The method's parameters types are clear enough, so there's no need to include them also in the method's name. Change-Id: Iffc63c3a22488e459be3c9beac9dd5d0163f0d12 Related-To: https://bugzilla.redhat.com/1085398 Signed-off-by: Idan Shaby <ish...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java 4 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/34864/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index f6aa057..a22d342 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -243,7 +243,7 @@ private EventResult runConnectHostToPoolEvent(final Guid storagePoolId, final VDS vds) { EventResult result = new EventResult(true, EventType.VDSCONNECTTOPOOL); StoragePool storagePool = getStoragePoolDAO().get(storagePoolId); - StorageDomain masterDomain = getStorageDomainDAO().getStorageDomainByTypeAndPool(storagePoolId, StorageDomainType.Master); + StorageDomain masterDomain = getStorageDomainDAO().getStorageDomain(storagePoolId, StorageDomainType.Master); List<StoragePoolIsoMap> storagePoolIsoMap = getStoragePoolIsoMapDAO().getAllForStoragePool(storagePoolId); boolean masterDomainInactiveOrUnknown = masterDomain.getStatus() == StorageDomainStatus.Inactive || masterDomain.getStatus() == StorageDomainStatus.Unknown; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java index 8058674..60d97bf 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAO.java @@ -25,13 +25,13 @@ /** * Retrieves storage domain for the specified pool by type. * - * @param pool + * @param poolId * the storage pool * @param type * the storage domain type * @return the master storage domain */ - StorageDomain getStorageDomainByTypeAndPool(Guid pool, StorageDomainType type); + StorageDomain getStorageDomain(Guid poolId, StorageDomainType type); /** * Retrieves the master storage domain for the specified pool. diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java index 80fbe89..3e48433 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java @@ -27,11 +27,11 @@ } @Override - public StorageDomain getStorageDomainByTypeAndPool(Guid pool, StorageDomainType type) { + public StorageDomain getStorageDomain(Guid poolId, StorageDomainType type) { return getCallsHandler().executeRead("Getstorage_domain_by_type_and_storagePoolId", StorageDomainRowMapper.instance, getCustomMapSqlParameterSource() - .addValue("storage_pool_id", pool) + .addValue("storage_pool_id", poolId) .addValue("storage_domain_type", type.getValue())); } @@ -221,7 +221,7 @@ */ private Guid getStorageDomainIdForPoolByType(Guid pool, StorageDomainType type) { Guid returnValue = Guid.Empty; - StorageDomain domain = getStorageDomainByTypeAndPool(pool, type); + StorageDomain domain = getStorageDomain(pool, type); if (domain != null) { returnValue = domain.getId(); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java index 70f6696..be04987 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageDomainDAOTest.java @@ -56,7 +56,8 @@ @Test public void testGetstorage_domain_by_type_for_storagePoolId() { - StorageDomain result = dao.getStorageDomainByTypeAndPool(new Guid("6d849ebf-755f-4552-ad09-9a090cda105d"), StorageDomainType.Master); + StorageDomain result = dao.getStorageDomain(new Guid("6d849ebf-755f-4552-ad09-9a090cda105d"), + StorageDomainType.Master); assertNotNull(result); assertGetResult(result); -- To view, visit http://gerrit.ovirt.org/34864 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffc63c3a22488e459be3c9beac9dd5d0163f0d12 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Idan Shaby <ish...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
