Idan Shaby has uploaded a new change for review. Change subject: core: Renamed the getStorageDomainId Method ......................................................................
core: Renamed the getStorageDomainId Method The method's name implies that it's a simple getter, even though it does not always return the expected storage domain even if it exists (permissions issues for example). Thus, renamed to getStorageDomainIdForQuery. Change-Id: I93e7fdda6ffacb0fc1fd740fe69390864100ab7b Signed-off-by: Idan Shaby <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQueryBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/34028/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQuery.java index 8af4c20..8997568 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQuery.java @@ -19,7 +19,7 @@ * @return The storage domain to get the images from */ @Override - protected Guid getStorageDomainId() { + protected Guid getStorageDomainIdForQuery() { if (doesUserHavePermissionsOnStoragePool()) { return getDbFacade().getStorageDomainDao().getIsoStorageDomainIdForPool(getStoragePoolId()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java index 4b0af46..542e6f3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQuery.java @@ -14,7 +14,7 @@ * @return The storage domain to get the images from */ @Override - protected Guid getStorageDomainId() { + protected Guid getStorageDomainIdForQuery() { return getParameters().getStorageDomainId(); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQueryBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQueryBase.java index 1f9a122..caf9a62 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQueryBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImagesListQueryBase.java @@ -22,10 +22,10 @@ /** * @return The storage domain to get the images from */ - protected abstract Guid getStorageDomainId(); + protected abstract Guid getStorageDomainIdForQuery(); protected List<RepoImage> getUserRequestForStorageDomainRepoFileList() { return IsoDomainListSyncronizer.getInstance().getUserRequestForStorageDomainRepoFileList - (getStorageDomainId(), getParameters().getImageType(), getParameters().getForceRefresh()); + (getStorageDomainIdForQuery(), getParameters().getImageType(), getParameters().getForceRefresh()); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java index 0fe95e2..512c2e3 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java @@ -78,7 +78,7 @@ when(storageDomainDAOMock.getIsoStorageDomainIdForPool(getQueryParameters().getStoragePoolId())).thenReturn(storageDomainId); when(getQuery().getDbFacade().getStorageDomainDao()).thenReturn(storageDomainDAOMock); - assertEquals("wrong storage domain id", storageDomainId, getQuery().getStorageDomainId()); + assertEquals("wrong storage domain id", storageDomainId, getQuery().getStorageDomainIdForQuery()); } @Test @@ -86,7 +86,7 @@ mockStoragePoolDAO(null); verifyNoMoreInteractions(getQuery().getDbFacade()); - assertNull("No storage domains should have been returned", getQuery().getStorageDomainId()); + assertNull("No storage domains should have been returned", getQuery().getStorageDomainIdForQuery()); } /** -- To view, visit http://gerrit.ovirt.org/34028 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93e7fdda6ffacb0fc1fd740fe69390864100ab7b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
