minor, lazy init ACLUtil
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/22631a62 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/22631a62 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/22631a62 Branch: refs/heads/master Commit: 22631a62232c9696ce2532af60c623694468fef0 Parents: b425bb9 Author: tttMelody <245915...@qq.com> Authored: Tue Sep 26 16:06:13 2017 +0800 Committer: Jiatao Tao <245915...@qq.com> Committed: Tue Sep 26 20:48:10 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/UserService.java | 7 ++----- .../src/main/java/org/apache/kylin/rest/util/AclUtil.java | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/22631a62/server-base/src/main/java/org/apache/kylin/rest/service/UserService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/UserService.java b/server-base/src/main/java/org/apache/kylin/rest/service/UserService.java index aa48e1f..b257427 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/UserService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/UserService.java @@ -30,6 +30,7 @@ import org.apache.kylin.common.persistence.JsonSerializer; import org.apache.kylin.common.persistence.ResourceStore; import org.apache.kylin.common.persistence.Serializer; import org.apache.kylin.metadata.project.ProjectInstance; +import org.apache.kylin.metadata.project.ProjectManager; import org.apache.kylin.rest.exception.InternalErrorException; import org.apache.kylin.rest.msg.Message; import org.apache.kylin.rest.msg.MsgPicker; @@ -70,10 +71,6 @@ public class UserService implements UserDetailsManager { @Qualifier("accessService") private AccessService accessService; - @Autowired - @Qualifier("projectService") - private ProjectService projectService; - public boolean isEvictCacheFlag() { return evictCacheFlag; } @@ -114,7 +111,7 @@ public class UserService implements UserDetailsManager { try { //revoke user's project permission - List<ProjectInstance> projectInstances = projectService.listProjects(null, null); + List<ProjectInstance> projectInstances = ProjectManager.getInstance(KylinConfig.getInstanceFromEnv()).listAllProjects(); for (ProjectInstance pi : projectInstances) { AclEntity ae = accessService.getAclEntity("ProjectInstance", pi.getUuid()); Acl acl = accessService.getAcl(ae); http://git-wip-us.apache.org/repos/asf/kylin/blob/22631a62/server-base/src/main/java/org/apache/kylin/rest/util/AclUtil.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/AclUtil.java b/server-base/src/main/java/org/apache/kylin/rest/util/AclUtil.java index 602079e..9ebc8ce 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/util/AclUtil.java +++ b/server-base/src/main/java/org/apache/kylin/rest/util/AclUtil.java @@ -20,10 +20,12 @@ package org.apache.kylin.rest.util; import org.apache.kylin.metadata.project.ProjectInstance; import org.apache.kylin.rest.constant.Constant; +import org.springframework.context.annotation.Lazy; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; +@Lazy @Component("aclUtil") public class AclUtil { String getCurrentUserName() {
