improve caching of roles and permissions

This commit is contained in:
Sebastian Sdorra
2013-05-29 20:52:48 +02:00
parent 235b3322fe
commit c8d98fadb1
6 changed files with 102 additions and 147 deletions

View File

@@ -59,7 +59,7 @@ import sonia.scm.ScmState;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.PermissionCollector;
import sonia.scm.security.AuthorizationCollector;
import sonia.scm.security.PermissionDescriptor;
import sonia.scm.security.Role;
import sonia.scm.security.SecuritySystem;
@@ -121,7 +121,7 @@ public class AuthenticationResource
public AuthenticationResource(SCMContextProvider contextProvider,
ScmConfiguration configuration, RepositoryManager repositoryManger,
UserManager userManager, SecuritySystem securitySystem,
PermissionCollector collector)
AuthorizationCollector collector)
{
this.contextProvider = contextProvider;
this.configuration = configuration;
@@ -338,7 +338,7 @@ public class AuthenticationResource
Builder<String> builder = ImmutableList.builder();
for (Permission p : permissionCollector.collect())
for (Permission p : permissionCollector.collect().getObjectPermissions())
{
if (p instanceof StringablePermission)
{
@@ -380,7 +380,7 @@ public class AuthenticationResource
private SCMContextProvider contextProvider;
/** Field description */
private PermissionCollector permissionCollector;
private AuthorizationCollector permissionCollector;
/** Field description */
private RepositoryManager repositoryManger;