[Gepardec/mega#735] rename mega RolesAllowed to MegaRolesAllowed to a…

…void name clash with java RolesAllowed annotation
Gepardec · Feb 23, 2024 · 335f0dd · 335f0dd
1 parent a912d37
commit 335f0dd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/...application/interceptor/RolesAllowed.java → ...ication/interceptor/MegaRolesAllowed.java b/...application/interceptor/RolesAllowed.java → ...ication/interceptor/MegaRolesAllowed.java
@@ -14,7 +14,7 @@
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
-public @interface RolesAllowed {
+public @interface MegaRolesAllowed {
 
     @Nonbinding
     Role[] value() default {Role.EMPLOYEE};

diff --git a/.../interceptor/RolesAllowedInterceptor.java → ...erceptor/MegaRolesAllowedInterceptor.java b/.../interceptor/RolesAllowedInterceptor.java → ...erceptor/MegaRolesAllowedInterceptor.java
@@ -13,24 +13,24 @@
 import java.util.Set;
 
 @Interceptor
-@RolesAllowed
+@MegaRolesAllowed
 @Priority(Interceptor.Priority.APPLICATION)
-public class RolesAllowedInterceptor {
+public class MegaRolesAllowedInterceptor {
 
     @Inject
     UserContext userContext;
 
     @AroundInvoke
     public Object intercept(InvocationContext invocationContext) throws Exception {
-        RolesAllowed rolesAllowedAnnotation = invocationContext.getMethod().getAnnotation(RolesAllowed.class);
-        if (rolesAllowedAnnotation == null) {
-            rolesAllowedAnnotation = invocationContext.getTarget().getClass().getAnnotation(RolesAllowed.class);
+        MegaRolesAllowed megaRolesAllowedAnnotation = invocationContext.getMethod().getAnnotation(MegaRolesAllowed.class);
+        if (megaRolesAllowedAnnotation == null) {
+            megaRolesAllowedAnnotation = invocationContext.getTarget().getClass().getAnnotation(MegaRolesAllowed.class);
         }
 
-        Objects.requireNonNull(rolesAllowedAnnotation,
+        Objects.requireNonNull(megaRolesAllowedAnnotation,
                 "Could not resolve Authorizaion annotation. Do you use Stereotype annotations, which are currently not supported?");
 
-        Role[] allowedRoles = rolesAllowedAnnotation.value();
+        Role[] allowedRoles = megaRolesAllowedAnnotation.value();
         if (isInRole(userContext.getUser().getRoles(), allowedRoles)) {
             return invocationContext.proceed();
         } else {

diff --git a/src/main/java/com/gepardec/mega/rest/impl/EmployeeResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/EmployeeResourceImpl.java
@@ -1,6 +1,6 @@
 package com.gepardec.mega.rest.impl;
 
-import com.gepardec.mega.application.interceptor.RolesAllowed;
+import com.gepardec.mega.application.interceptor.MegaRolesAllowed;
 import com.gepardec.mega.domain.model.Employee;
 import com.gepardec.mega.domain.model.Role;
 import com.gepardec.mega.rest.api.EmployeeResource;
@@ -16,7 +16,7 @@
 
 @RequestScoped
 @Authenticated
-@RolesAllowed({Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
+@MegaRolesAllowed({Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
 public class EmployeeResourceImpl implements EmployeeResource {
 
     @Inject

diff --git a/src/main/java/com/gepardec/mega/rest/impl/EnterpriseResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/EnterpriseResourceImpl.java
@@ -1,6 +1,6 @@
 package com.gepardec.mega.rest.impl;
 
-import com.gepardec.mega.application.interceptor.RolesAllowed;
+import com.gepardec.mega.application.interceptor.MegaRolesAllowed;
 import com.gepardec.mega.domain.model.Role;
 import com.gepardec.mega.rest.api.EnterpriseResource;
 import com.gepardec.mega.rest.model.EnterpriseEntryDto;
@@ -15,7 +15,7 @@
 
 @RequestScoped
 @Authenticated
-@RolesAllowed(value = {Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
+@MegaRolesAllowed(value = {Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
 public class EnterpriseResourceImpl implements EnterpriseResource {
 
     @Inject

diff --git a/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java
@@ -1,6 +1,6 @@
 package com.gepardec.mega.rest.impl;
 
-import com.gepardec.mega.application.interceptor.RolesAllowed;
+import com.gepardec.mega.application.interceptor.MegaRolesAllowed;
 import com.gepardec.mega.db.entity.employee.EmployeeState;
 import com.gepardec.mega.db.entity.employee.StepEntry;
 import com.gepardec.mega.db.entity.employee.User;
@@ -35,7 +35,7 @@
 
 @RequestScoped
 @Authenticated
-@RolesAllowed(value = {Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
+@MegaRolesAllowed(value = {Role.PROJECT_LEAD, Role.OFFICE_MANAGEMENT})
 public class ManagementResourceImpl implements ManagementResource {
 
     private static final String DATE_FORMAT_PATTERN = "yyyy-MM-dd";

diff --git a/src/main/java/com/gepardec/mega/rest/impl/UserResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/UserResourceImpl.java
@@ -1,6 +1,6 @@
 package com.gepardec.mega.rest.impl;
 
-import com.gepardec.mega.application.interceptor.RolesAllowed;
+import com.gepardec.mega.application.interceptor.MegaRolesAllowed;
 import com.gepardec.mega.domain.model.Role;
 import com.gepardec.mega.domain.model.UserContext;
 import com.gepardec.mega.rest.api.UserResource;
@@ -13,7 +13,7 @@
 
 @RequestScoped
 @Authenticated
-@RolesAllowed(Role.EMPLOYEE)
+@MegaRolesAllowed(Role.EMPLOYEE)
 public class UserResourceImpl implements UserResource {
 
     @Inject

diff --git a/src/main/java/com/gepardec/mega/rest/impl/WorkerResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/WorkerResourceImpl.java
@@ -1,6 +1,6 @@
 package com.gepardec.mega.rest.impl;
 
-import com.gepardec.mega.application.interceptor.RolesAllowed;
+import com.gepardec.mega.application.interceptor.MegaRolesAllowed;
 import com.gepardec.mega.domain.model.Role;
 import com.gepardec.mega.domain.model.monthlyreport.MonthlyReport;
 import com.gepardec.mega.rest.api.WorkerResource;
@@ -13,7 +13,7 @@
 
 @RequestScoped
 @Authenticated
-@RolesAllowed(Role.EMPLOYEE)
+@MegaRolesAllowed(Role.EMPLOYEE)
 public class WorkerResourceImpl implements WorkerResource {
 
     @Inject

diff --git a/...erceptor/RolesAllowedInterceptorTest.java → .../MegaMegaRolesAllowedInterceptorTest.java b/...erceptor/RolesAllowedInterceptorTest.java → .../MegaMegaRolesAllowedInterceptorTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class RolesAllowedInterceptorTest {
+class MegaMegaRolesAllowedInterceptorTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private UserContext userContext;
@@ -31,15 +31,15 @@ class RolesAllowedInterceptorTest {
     private InvocationContext invocationContext;
 
     @InjectMocks
-    private RolesAllowedInterceptor rolesAllowedInterceptor;
+    private MegaRolesAllowedInterceptor megaRolesAllowedInterceptor;
 
     @Test
     void invoke_whenAnnotationOnClassLevel_thenUsesClassLevelAnnotation() throws Exception {
         when(invocationContext.getMethod().getAnnotation(any())).thenReturn(null);
         when(invocationContext.getTarget()).thenReturn(new TargetWithAnnotation());
         when(userContext.getUser().getRoles()).thenReturn(Set.of(Role.EMPLOYEE));
 
-        rolesAllowedInterceptor.intercept(invocationContext);
+        megaRolesAllowedInterceptor.intercept(invocationContext);
 
         verify(invocationContext, times(1)).proceed();
     }
@@ -49,7 +49,7 @@ void invoke_whenNoAnnotationOnMethodAndClassLevel_thenThrowsNullpointerException
         when(invocationContext.getMethod().getAnnotation(any())).thenReturn(null);
         when(invocationContext.getTarget()).thenReturn(new TargetNoAnnotation());
 
-        assertThatThrownBy(() -> rolesAllowedInterceptor.intercept(invocationContext))
+        assertThatThrownBy(() -> megaRolesAllowedInterceptor.intercept(invocationContext))
                 .isInstanceOf(NullPointerException.class);
     }
 
@@ -58,42 +58,42 @@ void invoke_whenNoAnnotationOnMethodAndClassLevel_thenThrowsNullpointerException
     @Disabled
     void intercept_whenNotLogged_thenThrowsForbiddenException() {
         when(invocationContext.getMethod().getAnnotation(any())).thenReturn(createAnnotation(new Role[]{Role.EMPLOYEE}));
-        assertThatThrownBy(() -> rolesAllowedInterceptor.intercept(invocationContext)).isInstanceOf(ForbiddenException.class);
+        assertThatThrownBy(() -> megaRolesAllowedInterceptor.intercept(invocationContext)).isInstanceOf(ForbiddenException.class);
     }
 
     @Test
     void invoke_whenLoggedAndNotInRole_thenThrowsForbiddenException() {
         when(invocationContext.getMethod().getAnnotation(any())).thenReturn(createAnnotation(new Role[]{Role.OFFICE_MANAGEMENT}));
         when(userContext.getUser().getRoles()).thenReturn(Set.of(Role.EMPLOYEE));
 
-        assertThatThrownBy(() -> rolesAllowedInterceptor.intercept(invocationContext)).isInstanceOf(ForbiddenException.class);
+        assertThatThrownBy(() -> megaRolesAllowedInterceptor.intercept(invocationContext)).isInstanceOf(ForbiddenException.class);
     }
 
     @Test
     void invoke_whenLoggedAndInRoleMethodAnnotated_thenThrowsForbiddenException() throws Exception {
         when(invocationContext.getMethod().getAnnotation(any())).thenReturn(createAnnotation(Role.values()));
         when(userContext.getUser().getRoles()).thenReturn(Set.of(Role.EMPLOYEE));
 
-        rolesAllowedInterceptor.intercept(invocationContext);
+        megaRolesAllowedInterceptor.intercept(invocationContext);
 
         verify(invocationContext, times(1)).proceed();
     }
 
-    private RolesAllowed createAnnotation(final Role[] roles) {
-        return new RolesAllowed() {
+    private MegaRolesAllowed createAnnotation(final Role[] roles) {
+        return new MegaRolesAllowed() {
             @Override
             public Role[] value() {
                 return roles;
             }
 
             @Override
             public Class<? extends Annotation> annotationType() {
-                return RolesAllowed.class;
+                return MegaRolesAllowed.class;
             }
         };
     }
 
-    @RolesAllowed(Role.EMPLOYEE)
+    @MegaRolesAllowed(Role.EMPLOYEE)
     private static class TargetWithAnnotation {
 
     }