[Engine-patches] Change in ovirt-engine[master]: core: refactor; extra public & improved readability

[mmucha]

Martin Mucha has uploaded a new change for review.

Change subject: core: refactor; extra public & improved readability
......................................................................

core: refactor; extra public & improved readability

Change-Id: Ib04747c9528f8a7f70442506cb5fa6430106b97f
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQuery.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAO.java
2 files changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/33956/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQuery.java
index 8b1b1c7..d5e00a4 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQuery.java
@@ -4,7 +4,6 @@
 
 import org.ovirt.engine.core.common.businessentities.Permissions;
 import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
-import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dao.PermissionDAO;
 
 public class GetPermissionsForObjectQuery<P extends 
GetPermissionsForObjectParameters> extends QueriesCommandBase<P> {
@@ -15,17 +14,22 @@
 
     @Override
     protected void executeQueryCommand() {
-        Guid objectId = getParameters().getObjectId();
+        getQueryReturnValue().setReturnValue(queryPermissions());
+    }
+
+    private List<Permissions> queryPermissions() {
         PermissionDAO dao = getDbFacade().getPermissionDao();
-        List<Permissions> perms;
+
         if (getParameters().getDirectOnly()) {
-            perms = dao.getAllForEntity(objectId, getUserID(), 
getParameters().isFiltered(), getParameters().getAllUsersWithPermission());
+            return dao.getAllForEntity(getParameters().getObjectId(),
+                    getUserID(),
+                    getParameters().isFiltered(),
+                    getParameters().getAllUsersWithPermission());
         } else {
-            perms = dao.getTreeForEntity(objectId,
+            return dao.getTreeForEntity(getParameters().getObjectId(),
                     getParameters().getVdcObjectType(),
                     getUserID(),
                     getParameters().isFiltered());
         }
-        getQueryReturnValue().setReturnValue(perms);
     }
 }
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAO.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAO.java
index 62c5dd3..2cc665b 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAO.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAO.java
@@ -136,7 +136,7 @@
     List<Permissions> getAllForEntity(Guid id, Guid userID, boolean 
isFiltered);
 
 
-    public List<Permissions> getAllForEntity(Guid id, Guid userID, boolean 
isFiltered, boolean allUsersWithPermission);
+    List<Permissions> getAllForEntity(Guid id, Guid userID, boolean 
isFiltered, boolean allUsersWithPermission);
 
     List<Permissions> getAllForEntity(Guid id, Guid userID, boolean 
isFiltered, boolean allUsersWithPermission, int appMode);
 


-- 
To view, visit http://gerrit.ovirt.org/33956
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib04747c9528f8a7f70442506cb5fa6430106b97f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmu...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches