Gilad Chaplik has uploaded a new change for review. Change subject: core: avoid passing userId in GetAllVmPoolsAttachedToUser ......................................................................
core: avoid passing userId in GetAllVmPoolsAttachedToUser Motivation: this query is a user query (used both by adminportal and userportal), a user query can't check other users, that's why there is no need to pass this parameter, rather take it from session. Change-Id: I06bec1770adbc6dce07baae8e5fc7f163b39fc52 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsAndVmPoolsQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParameters.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParametersTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java 6 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/12458/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQuery.java index bd94726..96016f3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQuery.java @@ -12,7 +12,7 @@ @Override protected List<VmPool> getPrivilegedQueryReturnValue() { - List<VmPool> returnValue = getDbFacade().getVmPoolDao().getAllForUser(getParameters().getUserId()); + List<VmPool> returnValue = getDbFacade().getVmPoolDao().getAllForUser(getUserID()); return returnValue; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsAndVmPoolsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsAndVmPoolsQuery.java index 57e0dbe..bfd0ef9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsAndVmPoolsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmsAndVmPoolsQuery.java @@ -28,7 +28,7 @@ if (isSucceeded) { queryResult = Backend.getInstance().runInternalQuery(VdcQueryType.GetAllVmPoolsAttachedToUser, - new GetAllVmPoolsAttachedToUserParameters(getUserID())); + new GetAllVmPoolsAttachedToUserParameters()); if (queryResult != null && queryResult.getSucceeded()) { retValList.addAll((List<VmPool>) queryResult.getReturnValue()); } else { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQueryTest.java index e2b1cf4..7812eb6 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmPoolsAttachedToUserQueryTest.java @@ -23,7 +23,7 @@ @Test public void testAdminQueryWithOtherUserWithDisks() { Guid requestedUser = Guid.NewGuid(); - mockQueryParameters(requestedUser); + mockQueryData(requestedUser); // Mock the result of the DAO final VmPool expectedPool = mockVMPoolsFromDAO(requestedUser); @@ -38,11 +38,10 @@ } /** - * Adds additional parameters to the parameters object * @param requestedUser The user to get the VMs for */ - private void mockQueryParameters(Guid requestedUser) { - when(getQueryParameters().getUserId()).thenReturn(requestedUser); + private void mockQueryData(Guid requestedUser) { + when(getQuery().getUserID()).thenReturn(requestedUser); } /** diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParameters.java index 1e57823..c75db3e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParameters.java @@ -1,14 +1,8 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.compat.Guid; - public class GetAllVmPoolsAttachedToUserParameters extends VdcUserQueryParametersBase { private static final long serialVersionUID = -6835998142489522597L; public GetAllVmPoolsAttachedToUserParameters() { - } - - public GetAllVmPoolsAttachedToUserParameters(Guid userId) { - super(userId); } } diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParametersTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParametersTest.java index 5b0f875..1a37045 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParametersTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetAllVmPoolsAttachedToUserParametersTest.java @@ -2,4 +2,13 @@ public class GetAllVmPoolsAttachedToUserParametersTest extends AbstractVdcUserQueryParametersBaseTestCase<GetAllVmPoolsAttachedToUserParameters> { // Intentionally empty - tests are in superclass + + @Override + public void testParameterizedConstructor() throws Exception { + // no implementation + // GetAllVmPoolsAttachedToUserParametersTest should not have Parameterized Constructor + // this is a user query, so a user can't check another user. so the only possible way + // is to check the sender (this data can be taken from session). + + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java index 0e7aaa5..5c6786c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java @@ -22,7 +22,6 @@ import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; import org.ovirt.engine.core.common.queries.GetVmdataByPoolIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; public class BackendVmPoolsResource @@ -38,7 +37,7 @@ @Override public VmPools list() { if (isFiltered()) { - GetAllVmPoolsAttachedToUserParameters params = new GetAllVmPoolsAttachedToUserParameters(getCurrent().get(VdcUser.class).getUserId()); + GetAllVmPoolsAttachedToUserParameters params = new GetAllVmPoolsAttachedToUserParameters(); return mapCollection(getBackendCollection(VdcQueryType.GetAllVmPoolsAttachedToUser, params)); } else { return mapCollection(getBackendCollection(SearchType.VmPools)); -- To view, visit http://gerrit.ovirt.org/12458 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06bec1770adbc6dce07baae8e5fc7f163b39fc52 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
