Removed: Try catch were removed, In addition add CustomExceptionHandler for Handling Exceptions.

Author: ganeshbabugb

Diff for: src/main/java/com/ganesh/security/config/ApplicationConfig.java

@@ -1,6 +1,6 @@
 package com.ganesh.security.config;
 
-import com.ganesh.security.repo.UserRepository;
+import com.ganesh.security.repositorys.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

Diff for: src/main/java/com/ganesh/security/controller/AuthenticationController.java

@@ -1,19 +1,14 @@
 package com.ganesh.security.controller;
 
-import com.ganesh.security.exceptions.DuplicateEmailException;
-import com.ganesh.security.exceptions.UserNotFoundException;
 import com.ganesh.security.payload.request.AuthenticationRequest;
 import com.ganesh.security.payload.request.RegisterRequest;
 import com.ganesh.security.payload.response.AuthenticationResponse;
-import com.ganesh.security.payload.response.MessageResponse;
 import com.ganesh.security.service.AuthenticationService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,38 +25,20 @@ public class AuthenticationController {
 
     @PostMapping("/register")
     public ResponseEntity<?> register(
-            @Valid @RequestBody RegisterRequest request,
-            BindingResult bindingResult
-    ) {
-        try {
-            if (bindingResult.hasErrors()) return service.handleValidationErrors(bindingResult);
-            AuthenticationResponse response = service.register(request);
-            return ResponseEntity.ok(response);
-        } catch (DuplicateEmailException ex) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(new MessageResponse(ex.getMessage()));
-        } catch (Exception ex) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(new MessageResponse("An error occurred on the server"));
-        }
+            @Valid @RequestBody RegisterRequest request
+            ) {
+//            if (bindingResult.hasErrors()) return service.handleValidationErrors(bindingResult);
+        AuthenticationResponse response = service.register(request);
+        return ResponseEntity.ok(response);
     }
 
 
     @PostMapping("/authenticate")
     public ResponseEntity<?> authenticate(
-            @Valid @RequestBody AuthenticationRequest request,
-            BindingResult bindingResult
-    ) {
-        try {
-            if (bindingResult.hasErrors()) return service.handleValidationErrors(bindingResult);
-            return ResponseEntity.ok(service.authenticate(request));
-        } catch (UserNotFoundException ex) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(new MessageResponse(ex.getMessage()));
-        } catch (Exception ex) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(new MessageResponse("An error occurred on the server"));
-        }
+            @Valid @RequestBody AuthenticationRequest request
+            ) {
+//        if (bindingResult.hasErrors()) return service.handleValidationErrors(bindingResult);
+        return ResponseEntity.ok(service.authenticate(request));
     }
 
     @PostMapping("/refresh-token")

Diff for: src/main/java/com/ganesh/security/exceptions/CustomExceptionHandler.java

@@ -0,0 +1,40 @@
+package com.ganesh.security.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestControllerAdvice
+public class CustomExceptionHandler {
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Map<String, String> handleValidationException(MethodArgumentNotValidException ex) {
+        Map<String, String> errors = new HashMap<>();
+        ex.getBindingResult()
+                .getFieldErrors()
+                .forEach(error -> errors.put(error.getField(), error.getDefaultMessage()));
+        return errors;
+    }
+
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ExceptionHandler(UserNotFoundException.class)
+    public Map<String, String> handleUserNotFoundException(UserNotFoundException ex) {
+        Map<String, String> error = new HashMap<>();
+        error.put("error", ex.getMessage());
+        return error;
+    }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(UserAlreadyExistsException.class)
+    public Map<String, String> handleUserAlreadyExistsException(UserAlreadyExistsException ex) {
+        Map<String, String> error = new HashMap<>();
+        error.put("error", ex.getMessage());
+        return error;
+    }
+}

Diff for: src/main/java/com/ganesh/security/exceptions/DuplicateEmailException.java

@@ -0,0 +1,7 @@
+package com.ganesh.security.exceptions;
+
+public class UserAlreadyExistsException extends RuntimeException {
+    public UserAlreadyExistsException(String message) {
+        super(message);
+    }
+}

Diff for: src/main/java/com/ganesh/security/exceptions/UserAlreadyExistsException.java

@@ -1,6 +1,6 @@
 package com.ganesh.security.filters;
 
-import com.ganesh.security.repo.TokenRepository;
+import com.ganesh.security.repositorys.TokenRepository;
 import com.ganesh.security.service.JwtService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

Diff for: src/main/java/com/ganesh/security/filters/JwtAuthenticationFilter.java

@@ -1,4 +1,4 @@
-package com.ganesh.security.repo;
+package com.ganesh.security.repositorys;
 
 import com.ganesh.security.models.token.Token;
 import org.springframework.data.jpa.repository.JpaRepository;

Diff for: src/main/java/com/ganesh/security/repo/TokenRepository.java renamed to src/main/java/com/ganesh/security/repositorys/TokenRepository.java

@@ -1,4 +1,4 @@
-package com.ganesh.security.repo;
+package com.ganesh.security.repositorys;
 
 import com.ganesh.security.models.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;

Diff for: src/main/java/com/ganesh/security/repo/UserRepository.java renamed to src/main/java/com/ganesh/security/repositorys/UserRepository.java

@@ -1,31 +1,26 @@
 package com.ganesh.security.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ganesh.security.exceptions.DuplicateEmailException;
+import com.ganesh.security.exceptions.UserAlreadyExistsException;
 import com.ganesh.security.exceptions.UserNotFoundException;
 import com.ganesh.security.models.token.Token;
 import com.ganesh.security.models.token.TokenType;
 import com.ganesh.security.models.user.User;
 import com.ganesh.security.payload.request.AuthenticationRequest;
 import com.ganesh.security.payload.request.RegisterRequest;
 import com.ganesh.security.payload.response.AuthenticationResponse;
-import com.ganesh.security.repo.TokenRepository;
-import com.ganesh.security.repo.UserRepository;
+import com.ganesh.security.repositorys.TokenRepository;
+import com.ganesh.security.repositorys.UserRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -39,7 +34,7 @@ public class AuthenticationService {
     public AuthenticationResponse register(RegisterRequest request) {
 
         if (repository.findByEmail(request.getEmail()).isPresent())
-            throw new DuplicateEmailException("Email already exists");
+            throw new UserAlreadyExistsException("Email already exists");
 
         var user = User.builder()
                 .firstname(request.getFirstname())
@@ -58,15 +53,6 @@ public AuthenticationResponse register(RegisterRequest request) {
                 .build();
     }
 
-    public ResponseEntity<?> handleValidationErrors(BindingResult bindingResult) {
-        Map<String, String> errorMap = new HashMap<>();
-
-        for (FieldError fieldError : bindingResult.getFieldErrors())
-            errorMap.put(fieldError.getField(), fieldError.getDefaultMessage());
-
-        return ResponseEntity.badRequest().body(errorMap);
-    }
-
     public AuthenticationResponse authenticate(AuthenticationRequest request) {
 
         var user = repository.findByEmail(request.getEmail())

Diff for: src/main/java/com/ganesh/security/service/AuthenticationService.java

@@ -1,6 +1,6 @@
 package com.ganesh.security.service;
 
-import com.ganesh.security.repo.TokenRepository;
+import com.ganesh.security.repositorys.TokenRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;