permission type enum is always upper case

This commit is contained in:
Sebastian Sdorra
2012-09-02 17:48:09 +02:00
parent 65826e749e
commit 53d44fdfc5

View File

@@ -35,7 +35,6 @@ package sonia.scm.security;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.PermissionResolver; import org.apache.shiro.authz.permission.PermissionResolver;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -46,6 +45,7 @@ import sonia.scm.repository.PermissionType;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale;
/** /**
* *
@@ -74,7 +74,7 @@ public class RepositoryPermissionResolver implements PermissionResolver
* @return * @return
*/ */
@Override @Override
public Permission resolvePermission(String permissionString) public RepositoryPermission resolvePermission(String permissionString)
{ {
RepositoryPermission permission = null; RepositoryPermission permission = null;
Iterator<String> permissionIt = Iterator<String> permissionIt =
@@ -120,7 +120,11 @@ public class RepositoryPermissionResolver implements PermissionResolver
{ {
try try
{ {
PermissionType type = PermissionType.valueOf(permissionIt.next()); String typeString = permissionIt.next();
typeString = typeString.trim().toUpperCase(Locale.ENGLISH);
PermissionType type = PermissionType.valueOf(typeString);
permission = new RepositoryPermission(repositoryId, type); permission = new RepositoryPermission(repositoryId, type);
} }