refactor: move interceptor package to web package

GIP-RECIA · Sep 26, 2024 · d76cb8f · d76cb8f
1 parent 502c5ce
commit d76cb8f
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/fr/recia/collabsoft/configuration/InterceptorConfig.java b/src/main/java/fr/recia/collabsoft/configuration/InterceptorConfig.java
@@ -16,8 +16,8 @@
 
 package fr.recia.collabsoft.configuration;
 
-import fr.recia.collabsoft.interceptor.SoffitInterceptor;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.SoffitInterceptor;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;

diff --git a/src/main/java/fr/recia/collabsoft/service/db/FileService.java b/src/main/java/fr/recia/collabsoft/service/db/FileService.java
@@ -27,7 +27,7 @@
 import fr.recia.collabsoft.db.entity.User;
 import fr.recia.collabsoft.db.repository.AssociatedAppRepository;
 import fr.recia.collabsoft.db.repository.FileRepository;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.enums.Authority;
 import fr.recia.collabsoft.model.pojo.JsonFileBody;
 import lombok.extern.slf4j.Slf4j;

diff --git a/src/main/java/fr/recia/collabsoft/service/db/MetadataService.java b/src/main/java/fr/recia/collabsoft/service/db/MetadataService.java
@@ -21,7 +21,7 @@
 import fr.recia.collabsoft.db.entity.QMetadata;
 import fr.recia.collabsoft.db.entity.User;
 import fr.recia.collabsoft.db.repository.MetadataRepository;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.enums.Authority;
 import fr.recia.collabsoft.model.pojo.JsonMetadataBody;
 import lombok.extern.slf4j.Slf4j;

diff --git a/src/main/java/fr/recia/collabsoft/service/db/UserService.java b/src/main/java/fr/recia/collabsoft/service/db/UserService.java
@@ -19,7 +19,7 @@
 import fr.recia.collabsoft.db.entity.QUser;
 import fr.recia.collabsoft.db.entity.User;
 import fr.recia.collabsoft.db.repository.UserRepository;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

diff --git a/...absoft/interceptor/SoffitInterceptor.java → ...ft/web/interceptor/SoffitInterceptor.java b/...absoft/interceptor/SoffitInterceptor.java → ...ft/web/interceptor/SoffitInterceptor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package fr.recia.collabsoft.interceptor;
+package fr.recia.collabsoft.web.interceptor;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -41,7 +41,7 @@ public SoffitInterceptor(SoffitHolder soffitHolder) {
   }
 
   @Override
-  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
     String path = request.getRequestURI().substring(request.getContextPath().length());
 
     if (path.startsWith("/api")) {

diff --git a/...absoft/interceptor/bean/SoffitHolder.java → ...ft/web/interceptor/bean/SoffitHolder.java b/...absoft/interceptor/bean/SoffitHolder.java → ...ft/web/interceptor/bean/SoffitHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package fr.recia.collabsoft.interceptor.bean;
+package fr.recia.collabsoft.web.interceptor.bean;
 
 import lombok.Data;
 

diff --git a/src/test/java/fr/recia/collabsoft/service/db/CollaborationServiceTest.java b/src/test/java/fr/recia/collabsoft/service/db/CollaborationServiceTest.java
@@ -18,7 +18,7 @@
 
 import fr.recia.collabsoft.db.entity.Collaboration;
 import fr.recia.collabsoft.db.enums.Role;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.pojo.JsonCollaborationBody;
 import fr.recia.collabsoft.test.DatabaseUtils;
 import org.junit.jupiter.api.AfterEach;

diff --git a/src/test/java/fr/recia/collabsoft/service/db/FileHistoryServiceTest.java b/src/test/java/fr/recia/collabsoft/service/db/FileHistoryServiceTest.java
@@ -17,7 +17,7 @@
 package fr.recia.collabsoft.service.db;
 
 import fr.recia.collabsoft.db.entity.FileHistory;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.pojo.JsonHistoryBody;
 import fr.recia.collabsoft.test.DatabaseUtils;
 import org.junit.jupiter.api.AfterEach;

diff --git a/src/test/java/fr/recia/collabsoft/service/db/FileServiceTest.java b/src/test/java/fr/recia/collabsoft/service/db/FileServiceTest.java
@@ -17,7 +17,7 @@
 package fr.recia.collabsoft.service.db;
 
 import fr.recia.collabsoft.db.entity.File;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.enums.Authority;
 import fr.recia.collabsoft.model.pojo.JsonFileBody;
 import fr.recia.collabsoft.test.DatabaseUtils;

diff --git a/src/test/java/fr/recia/collabsoft/service/db/MetadataServiceTest.java b/src/test/java/fr/recia/collabsoft/service/db/MetadataServiceTest.java
@@ -16,7 +16,7 @@
 
 package fr.recia.collabsoft.service.db;
 
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.model.pojo.JsonMetadataBody;
 import fr.recia.collabsoft.test.DatabaseUtils;
 import org.junit.jupiter.api.AfterEach;

diff --git a/src/test/java/fr/recia/collabsoft/service/db/UserServiceTest.java b/src/test/java/fr/recia/collabsoft/service/db/UserServiceTest.java
@@ -17,7 +17,7 @@
 package fr.recia.collabsoft.service.db;
 
 import fr.recia.collabsoft.db.entity.User;
-import fr.recia.collabsoft.interceptor.bean.SoffitHolder;
+import fr.recia.collabsoft.web.interceptor.bean.SoffitHolder;
 import fr.recia.collabsoft.test.DatabaseUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;