#1294 refine acl
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7f790837 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7f790837 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7f790837 Branch: refs/heads/KYLIN-2606 Commit: 7f79083722b634df8f4f814c6a59e0472dbcbe74 Parents: c490e6c Author: Roger Shi <rogershijich...@hotmail.com> Authored: Thu Jun 29 16:35:05 2017 +0800 Committer: liyang-gmt8 <liy...@apache.org> Committed: Thu Jun 29 16:36:57 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/controller2/AccessControllerV2.java | 2 +- .../src/main/java/org/apache/kylin/rest/service/AccessService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7f790837/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java index a61e321..1ca8652 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/AccessControllerV2.java @@ -80,7 +80,7 @@ public class AccessControllerV2 extends BasicController { public EnvelopeResponse listAccessEntitiesV2(@PathVariable String type, @PathVariable String uuid) { AclEntity ae = accessService.getAclEntity(type, uuid); Acl acl = accessService.getAcl(ae); - return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, accessService.generateListAceResponses(acl), ""); + return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, accessService.generateAllAceResponses(acl), ""); } /** http://git-wip-us.apache.org/repos/asf/kylin/blob/7f790837/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java b/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java index 3a6d723..affa508 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/AccessService.java @@ -322,7 +322,7 @@ public class AccessService { } } - public Object generateListAceResponses(Acl acl) { + public Object generateAllAceResponses(Acl acl) { List<AccessEntryResponse> result = new ArrayList<AccessEntryResponse>(); while (acl != null) {