Alon Bar-Lev has posted comments on this change. Change subject: aaa: using the new extensions API in InternalDirectory ......................................................................
Patch Set 4: (10 comments) http://gerrit.ovirt.org/#/c/26477/4/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalDirectory.java File backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalDirectory.java: Line 15 Line 16 Line 17 Line 18 Line 19 remove ^ ? Line 23: private ExtMap context; Line 24: Line 25: private ExtMap adminUser; Line 26: Line 27: private Opaque opaque; you should not store it. Line 28: Line 29: private static class Opaque { Line 30: public boolean isFirstCall() { Line 31: return firstCall; Line 25: private ExtMap adminUser; Line 26: Line 27: private Opaque opaque; Line 28: Line 29: private static class Opaque { this is private... you can use data only :) no need for getter and setters... Line 30: public boolean isFirstCall() { Line 31: return firstCall; Line 32: } Line 33: Line 67: } else if (commandType.equals(Authz.InvokeCommands.QUERY_EXECUTE)) { Line 68: doQueryExecute(input, output); Line 69: } else { Line 70: output.put(Base.InvokeKeys.COMMAND, Base.InvokeResult.UNSUPPORTED); Line 71: } same here about result, best to handle it at one place. Line 72: } catch (Exception ex) { Line 73: output.mput( Line 74: Base.InvokeKeys.RESULT, Base.InvokeResult.FAILED Line 75: ).mput( Line 73: output.mput( Line 74: Base.InvokeKeys.RESULT, Base.InvokeResult.FAILED Line 75: ).mput( Line 76: Base.InvokeKeys.MESSAGE, ex.getMessage() Line 77: ); btw: don't you like to log these exceptions? Line 78: } Line 79: } Line 80: Line 81: Line 79: } Line 80: Line 81: Line 82: private void doQueryExecute(ExtMap input, ExtMap output) { Line 83: opaque = input.<Opaque> get(Authz.InvokeKeys.QUERY_OPAQUE); you should not store it as member. Line 84: ExtUUID queryType = opaque.getQueryType(); Line 85: boolean firstCall = opaque.isFirstCall(); Line 86: if (queryType.equals(InvokeCommands.QUERY_PRINCIPALS_BY_IDS_OPEN) || queryType.equals(InvokeCommands.QUERY_PRINCIPALS_OPEN)) { Line 87: List<ExtMap> users = null; Line 81: Line 82: private void doQueryExecute(ExtMap input, ExtMap output) { Line 83: opaque = input.<Opaque> get(Authz.InvokeKeys.QUERY_OPAQUE); Line 84: ExtUUID queryType = opaque.getQueryType(); Line 85: boolean firstCall = opaque.isFirstCall(); no need for temp variables... Line 86: if (queryType.equals(InvokeCommands.QUERY_PRINCIPALS_BY_IDS_OPEN) || queryType.equals(InvokeCommands.QUERY_PRINCIPALS_OPEN)) { Line 87: List<ExtMap> users = null; Line 88: // Since there is a single user in the directory, execute Line 89: if (firstCall) { Line 91: users = Arrays.asList(adminUser); Line 92: } else { Line 93: users = null; Line 94: } Line 95: output.put(Authz.InvokeKeys.QUERY_RESULT, users); consider: output.put( Authz.InvokeKeys.QUERY_RESULT, opaque.first ? Arrays.asList(adminUser) : null ); opaque.first = false; Line 96: } Line 97: } Line 98: Line 99: private void fillOpaque(ExtMap output, ExtUUID queryType) { Line 102: } Line 103: Line 104: Line 105: Line 106: private void doFetchPrincipalRecord(ExtMap input, ExtMap output) { check that the admin is on input?!?! Line 107: output.put(Authz.InvokeKeys.PRINCIPAL_RECORD, adminUser); Line 108: fillSuccess(output); Line 109: } Line 110: Line 127: output.mput( Line 128: Base.InvokeKeys.RESULT, Base.InvokeResult.SUCCESS Line 129: ).mput( Line 130: Authz.InvokeKeys.Status, Authz.Status.SUCCESS Line 131: ); you can always put success in invoke. also the result should be handled at invoke see the authn note. Line 132: } Line 133: -- To view, visit http://gerrit.ovirt.org/26477 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I958443292da0455e0a12039fac98eebb9b17dee2 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
