dev/codeforces/ Отрефакторил util классы

Author: AlexanderGarifullin

src/main/java/com/cf/cfteam/advicers/codeforces/CodeforcesExceptionHandler.java

@@ -1,13 +1,12 @@
 package com.cf.cfteam.advicers.codeforces;
 
 import com.cf.cfteam.exceptions.codeforces.GroupNotFoundException;
+import com.cf.cfteam.utils.ErrorResponseBuilder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.Map;
 
 @ControllerAdvice
@@ -16,20 +15,7 @@ public class CodeforcesExceptionHandler {
 
     @ExceptionHandler(GroupNotFoundException.class)
     public ResponseEntity<Object> handleUserNotFoundException(GroupNotFoundException ex) {
-        return buildErrorResponse(ex.getMessage(), HttpStatus.NOT_FOUND, Map.of(ID, ex.getId()));
+        return ErrorResponseBuilder.buildErrorResponse(ex.getMessage(), HttpStatus.NOT_FOUND, Map.of(ID, ex.getId()));
     }
 
-    private ResponseEntity<Object> buildErrorResponse(String message, HttpStatus status, Map<String, Object> details) {
-        Map<String, Object> errorResponse = new HashMap<>();
-        errorResponse.put("timestamp", LocalDateTime.now());
-        errorResponse.put("status", status.value());
-        errorResponse.put("error", status.getReasonPhrase());
-        errorResponse.put("message", message);
-
-        if (details != null) {
-            errorResponse.put("details", details);
-        }
-
-        return new ResponseEntity<>(errorResponse, status);
-    }
 }

src/main/java/com/cf/cfteam/advicers/security/SecurityExceptionHandler.java

@@ -4,58 +4,40 @@
 import com.cf.cfteam.exceptions.security.TokenRevokedException;
 import com.cf.cfteam.exceptions.security.UserAlreadyRegisterException;
 import com.cf.cfteam.exceptions.security.UserNotFoundException;
+import com.cf.cfteam.utils.ErrorResponseBuilder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.Map;
 
 @ControllerAdvice
 public class SecurityExceptionHandler {
 
     private static final String LOGIN = "login";
     private static final String TOKEN = "token";
-    private static final String UNEXPECTED_ERROR = "unexpected.error";
 
     @ExceptionHandler(UserAlreadyRegisterException.class)
     public ResponseEntity<Object> handleUserAlreadyRegisterException(UserAlreadyRegisterException ex) {
-        return buildErrorResponse(ex.getMessage(), HttpStatus.CONFLICT, Map.of(LOGIN, ex.getLogin()));
+        return ErrorResponseBuilder.buildErrorResponse(ex.getMessage(), HttpStatus.CONFLICT, Map.of(LOGIN,
+                ex.getLogin()));
     }
 
     @ExceptionHandler(UserNotFoundException.class)
     public ResponseEntity<Object> handleUserNotFoundException(UserNotFoundException ex) {
-        return buildErrorResponse(ex.getMessage(), HttpStatus.NOT_FOUND, Map.of(LOGIN, ex.getLogin()));
+        return ErrorResponseBuilder.buildErrorResponse(ex.getMessage(), HttpStatus.NOT_FOUND, Map.of(LOGIN,
+                ex.getLogin()));
     }
 
     @ExceptionHandler(TokenRevokedException.class)
     public ResponseEntity<Object> handleTokenRevokedException(TokenRevokedException ex) {
-        return buildErrorResponse(ex.getMessage(), HttpStatus.UNAUTHORIZED, Map.of(TOKEN, ex.getToken()));
+        return ErrorResponseBuilder.buildErrorResponse(ex.getMessage(), HttpStatus.UNAUTHORIZED, Map.of(TOKEN,
+                ex.getToken()));
     }
 
     @ExceptionHandler(InvalidTwoFactorCodeException.class)
     public ResponseEntity<Object> handleInvalidTwoFactorCodeException(InvalidTwoFactorCodeException ex) {
-        return buildErrorResponse(ex.getMessage(), HttpStatus.BAD_REQUEST, null);
-    }
-
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity<Object> handleGenericException(Exception ex) {
-        return buildErrorResponse(UNEXPECTED_ERROR, HttpStatus.INTERNAL_SERVER_ERROR, null);
-    }
-
-    private ResponseEntity<Object> buildErrorResponse(String message, HttpStatus status, Map<String, Object> details) {
-        Map<String, Object> errorResponse = new HashMap<>();
-        errorResponse.put("timestamp", LocalDateTime.now());
-        errorResponse.put("status", status.value());
-        errorResponse.put("error", status.getReasonPhrase());
-        errorResponse.put("message", message);
-
-        if (details != null) {
-            errorResponse.put("details", details);
-        }
-
-        return new ResponseEntity<>(errorResponse, status);
+        return ErrorResponseBuilder.buildErrorResponse(ex.getMessage(), HttpStatus.BAD_REQUEST, null);
     }
 }

src/main/java/com/cf/cfteam/services/codeforces/GroupService.java

@@ -2,7 +2,7 @@
 
 import com.cf.cfteam.exceptions.codeforces.GroupNotFoundException;
 import com.cf.cfteam.exceptions.security.UserNotFoundException;
-import com.cf.cfteam.mappers.codeforces.GroupMapper;
+import com.cf.cfteam.utils.codeforces.GroupMapper;
 import com.cf.cfteam.models.entities.codeforces.Group;
 import com.cf.cfteam.models.entities.security.User;
 import com.cf.cfteam.repositories.jpa.codeforces.GroupRepository;

src/main/java/com/cf/cfteam/utils/ErrorResponseBuilder.java

@@ -0,0 +1,30 @@
+package com.cf.cfteam.utils;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class ErrorResponseBuilder {
+
+    public static ResponseEntity<Object> buildErrorResponse(String message, HttpStatus status,
+                                                            Map<String, Object> details) {
+        Map<String, Object> errorResponse = new HashMap<>();
+        errorResponse.put("timestamp", LocalDateTime.now());
+        errorResponse.put("status", status.value());
+        errorResponse.put("error", status.getReasonPhrase());
+        errorResponse.put("message", message);
+
+        if (details != null) {
+            errorResponse.put("details", details);
+        }
+
+        return new ResponseEntity<>(errorResponse, status);
+    }
+
+    private ErrorResponseBuilder() {
+        throw new UnsupportedOperationException("Utility class");
+    }
+}

…team/mappers/codeforces/GroupMapper.java …cfteam/utils/codeforces/GroupMapper.javasrc/main/java/com/cf/cfteam/mappers/codeforces/GroupMapper.java renamed to src/main/java/com/cf/cfteam/utils/codeforces/GroupMapper.java src/main/java/com/cf/cfteam/mappers/codeforces/GroupMapper.java renamed to src/main/java/com/cf/cfteam/utils/codeforces/GroupMapper.java

@@ -1,4 +1,4 @@
-package com.cf.cfteam.mappers.codeforces;
+package com.cf.cfteam.utils.codeforces;
 
 import com.cf.cfteam.models.entities.codeforces.Group;
 import com.cf.cfteam.models.entities.security.User;