Download as
Browse Code »

Commit 1fac2c5365741d5c1204ec2e577837d3cfac88d0

Authored by Emerson Oliveira
1 parent 94d1d58a
Exists in master

Pequena refatoração da classe, com remoção de métodos e condicionais 

desnecessários
Showing 1 changed file with 3 additions and 19 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java
  Diff comments   View file @1fac2c5
... ... @@ -85,7 +85,7 @@ public class RequiredPermissionInterceptor implements Serializable {
85 85 String username = null;
86 86  
87 87 if (getSecurityContext().isLoggedIn()) {
88   - username = getUsername();
  88 + username = getSecurityContext().getUser().getId();
89 89 getLogger().trace(getBundle().getString("access-checking", username, operation, resource));
90 90 }
91 91  
... ... @@ -99,22 +99,6 @@ public class RequiredPermissionInterceptor implements Serializable {
99 99 }
100 100  
101 101 /**
102   - * Returns the id of the currently logged in user.
103   - *
104   - * @return the id of the currently logged in user
105   - */
106   - private String getUsername() {
107   - String username = "";
108   - User user = getSecurityContext().getUser();
109   -
110   - if (user != null && user.getId() != null) {
111   - username = user.getId();
112   - }
113   -
114   - return username;
115   - }
116   -
117   - /**
118 102 * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}
119 103 * annotation or the class name itself
120 104 *
... ... @@ -131,7 +115,7 @@ public class RequiredPermissionInterceptor implements Serializable {
131 115 requiredPermission = ic.getTarget().getClass().getAnnotation(RequiredPermission.class);
132 116 }
133 117  
134   - if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) {
  118 + if (Strings.isEmpty(requiredPermission.resource())) {
135 119 if (ic.getTarget().getClass().getAnnotation(Name.class) == null) {
136 120 return ic.getTarget().getClass().getSimpleName();
137 121 } else {
... ... @@ -159,7 +143,7 @@ public class RequiredPermissionInterceptor implements Serializable {
159 143 requiredPermission = ic.getTarget().getClass().getAnnotation(RequiredPermission.class);
160 144 }
161 145  
162   - if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) {
  146 + if (Strings.isEmpty(requiredPermission.operation())) {
163 147 if (ic.getMethod().getAnnotation(Name.class) == null) {
164 148 return ic.getMethod().getName();
165 149 } else {
... ...