[Engine-patches] Change in ovirt-engine[master]: aaa: cleanup AuthzUtils

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: aaa: cleanup AuthzUtils
......................................................................

aaa: cleanup AuthzUtils

reorder parameters to be consistent.
remove unneeded parameters.
rename parameters and sync to better reflect meaning.

Topic: AAA
Change-Id: I4b833ca69531b6d8d6b554c3086d7e31c08ff544
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
1 file changed, 7 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/27537/1

diff --git 
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
 
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
index 2a91071..2710942 100644
--- 
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
+++ 
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
@@ -6,7 +6,6 @@
 
 import org.ovirt.engine.api.extensions.Base;
 import org.ovirt.engine.api.extensions.ExtMap;
-import org.ovirt.engine.api.extensions.ExtUUID;
 import org.ovirt.engine.api.extensions.aaa.Authn;
 import org.ovirt.engine.api.extensions.aaa.Authz;
 import org.ovirt.engine.api.extensions.aaa.Authz.QueryEntity;
@@ -101,7 +100,6 @@
             boolean recursiveGroupsResolving) {
         return populatePrincipals(
                 extension,
-                Authz.InvokeCommands.QUERY_OPEN,
                 new ExtMap().mput(
                         Authz.InvokeKeys.QUERY_ENTITY,
                         Authz.QueryEntity.PRINCIPAL
@@ -118,7 +116,6 @@
     private static List<DirectoryGroup> queryGroups(ExtensionProxy extension, 
final ExtMap filter) {
         return populateGroups(
                 extension,
-                Authz.InvokeCommands.QUERY_OPEN,
                 new ExtMap().mput(
                         Authz.InvokeKeys.QUERY_ENTITY,
                         Authz.QueryEntity.GROUP
@@ -130,10 +127,9 @@
     }
 
     private static List<DirectoryUser> populatePrincipals(final ExtensionProxy 
extension,
-            final ExtUUID command,
-            final ExtMap extMap) {
+            final ExtMap input) {
         final List<DirectoryUser> directoryUsers = new ArrayList<>();
-        queryImpl(command, extMap, extension, new QueryResultHandler() {
+        queryImpl(extension, input, new QueryResultHandler() {
 
             @Override
             public boolean handle(List<ExtMap> queryResults) {
@@ -153,10 +149,9 @@
     }
 
     private static List<DirectoryGroup> populateGroups(final ExtensionProxy 
extension,
-            final ExtUUID command,
-            final ExtMap extMap) {
+            final ExtMap input) {
         final List<DirectoryGroup> directoryGroups = new ArrayList<>();
-        queryImpl(command, extMap, extension, new QueryResultHandler() {
+        queryImpl(extension, input, new QueryResultHandler() {
             @Override
             public boolean handle(List<ExtMap> queryResults) {
 
@@ -176,9 +171,8 @@
     }
 
     private static void queryImpl(
-            final ExtUUID command,
-            final ExtMap parameters,
             final ExtensionProxy extension,
+            final ExtMap input,
             final QueryResultHandler handler
             ) {
         Object opaque = null;
@@ -186,9 +180,9 @@
             opaque = extension.invoke(
                     new ExtMap().mput(
                             Base.InvokeKeys.COMMAND,
-                            command
+                            Authz.InvokeCommands.QUERY_OPEN
                             ).mput(
-                                    parameters
+                                    input
                             )
                     ).get(Authz.InvokeKeys.QUERY_OPAQUE);
             List<ExtMap> result = null;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b833ca69531b6d8d6b554c3086d7e31c08ff544
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches