Moved Roles to its own package

RyanSusana · Aug 9, 2024 · 96da819 · 96da819
1 parent 91ab01e
commit 96da819
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 18 deletions.
diff --git a/core/src/main/java/com/elepy/Elepy.java b/core/src/main/java/com/elepy/Elepy.java
@@ -8,6 +8,8 @@
 import com.elepy.auth.methods.persistedtokens.PersistedTokenGenerator;
 import com.elepy.auth.methods.persistedtokens.Token;
 import com.elepy.auth.methods.tokens.TokenAuthority;
+import com.elepy.auth.roles.Role;
+import com.elepy.auth.roles.RolesService;
 import com.elepy.auth.users.User;
 import com.elepy.auth.users.UserCenter;
 import com.elepy.configuration.*;

diff --git a/core/src/main/java/com/elepy/auth/Role.java → .../main/java/com/elepy/auth/roles/Role.java b/core/src/main/java/com/elepy/auth/Role.java → .../main/java/com/elepy/auth/roles/Role.java
@@ -1,7 +1,6 @@
-package com.elepy.auth;
+package com.elepy.auth.roles;
 
 import com.elepy.annotations.*;
-import com.elepy.auth.roles.*;
 import com.elepy.query.SortOption;
 import com.elepy.id.SlugIdentityProvider;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/core/src/main/java/com/elepy/auth/roles/RolesCreate.java b/core/src/main/java/com/elepy/auth/roles/RolesCreate.java
@@ -1,7 +1,5 @@
 package com.elepy.auth.roles;
 
-import com.elepy.auth.RolesService;
-import com.elepy.auth.Role;
 import com.elepy.crud.Crud;
 import com.elepy.handlers.SimpleCreate;
 import com.elepy.http.Request;

diff --git a/core/src/main/java/com/elepy/auth/roles/RolesDelete.java b/core/src/main/java/com/elepy/auth/roles/RolesDelete.java
@@ -1,7 +1,5 @@
 package com.elepy.auth.roles;
 
-import com.elepy.auth.RolesService;
-import com.elepy.auth.Role;
 import com.elepy.handlers.DefaultDelete;
 import com.elepy.handlers.HandlerContext;
 import jakarta.inject.Inject;

diff --git a/core/src/main/java/com/elepy/auth/roles/RolesFind.java b/core/src/main/java/com/elepy/auth/roles/RolesFind.java
@@ -1,7 +1,5 @@
 package com.elepy.auth.roles;
 
-import com.elepy.auth.RolesService;
-import com.elepy.auth.Role;
 import com.elepy.crud.Crud;
 import com.elepy.handlers.DefaultFindMany;
 import com.elepy.http.HttpContext;

diff --git a/core/src/main/java/com/elepy/auth/roles/RolesFindOne.java b/core/src/main/java/com/elepy/auth/roles/RolesFindOne.java
@@ -1,7 +1,5 @@
 package com.elepy.auth.roles;
 
-import com.elepy.auth.RolesService;
-import com.elepy.auth.Role;
 import com.elepy.crud.Crud;
 import com.elepy.handlers.DefaultFindOne;
 import com.elepy.http.Request;

diff --git a/...ain/java/com/elepy/auth/RolesService.java → ...va/com/elepy/auth/roles/RolesService.java b/...ain/java/com/elepy/auth/RolesService.java → ...va/com/elepy/auth/roles/RolesService.java
@@ -1,4 +1,4 @@
-package com.elepy.auth;
+package com.elepy.auth.roles;
 
 import com.elepy.annotations.PredefinedRole;
 import com.elepy.auth.permissions.DefaultPermissions;

diff --git a/core/src/main/java/com/elepy/auth/roles/RolesUpdate.java b/core/src/main/java/com/elepy/auth/roles/RolesUpdate.java
@@ -1,7 +1,5 @@
 package com.elepy.auth.roles;
 
-import com.elepy.auth.RolesService;
-import com.elepy.auth.Role;
 import com.elepy.handlers.DefaultUpdate;
 import com.elepy.handlers.HandlerContext;
 import jakarta.inject.Inject;

diff --git a/core/src/main/java/com/elepy/auth/users/User.java b/core/src/main/java/com/elepy/auth/users/User.java
@@ -1,7 +1,7 @@
 package com.elepy.auth.users;
 
 import com.elepy.annotations.*;
-import com.elepy.auth.Role;
+import com.elepy.auth.roles.Role;
 import com.elepy.query.SortOption;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Pattern;

diff --git a/core/src/main/java/com/elepy/auth/users/UserCenter.java b/core/src/main/java/com/elepy/auth/users/UserCenter.java
@@ -1,7 +1,7 @@
 package com.elepy.auth.users;
 
 import com.elepy.auth.AuthenticatedCredentials;
-import com.elepy.auth.RolesService;
+import com.elepy.auth.roles.RolesService;
 import com.elepy.crud.Crud;
 import com.elepy.utils.StringUtils;
 import jakarta.inject.Inject;

diff --git a/core/src/main/java/com/elepy/auth/users/UserCreate.java b/core/src/main/java/com/elepy/auth/users/UserCreate.java
@@ -1,6 +1,6 @@
 package com.elepy.auth.users;
 
-import com.elepy.auth.RolesService;
+import com.elepy.auth.roles.RolesService;
 import com.elepy.crud.Crud;
 import com.elepy.evaluators.DefaultIntegrityEvaluator;
 import com.elepy.evaluators.EvaluationType;

diff --git a/core/src/main/java/com/elepy/auth/users/UserDelete.java b/core/src/main/java/com/elepy/auth/users/UserDelete.java
@@ -1,6 +1,6 @@
 package com.elepy.auth.users;
 
-import com.elepy.auth.RolesService;
+import com.elepy.auth.roles.RolesService;
 import com.elepy.exceptions.ElepyException;
 import com.elepy.exceptions.Message;
 import com.elepy.handlers.ActionHandler;

diff --git a/core/src/main/java/com/elepy/auth/users/UserUpdate.java b/core/src/main/java/com/elepy/auth/users/UserUpdate.java
@@ -1,6 +1,6 @@
 package com.elepy.auth.users;
 
-import com.elepy.auth.RolesService;
+import com.elepy.auth.roles.RolesService;
 import com.elepy.crud.Crud;
 import com.elepy.evaluators.DefaultIntegrityEvaluator;
 import com.elepy.evaluators.DefaultObjectUpdateEvaluator;