Finalise the User service

Author: Chamal-Peiris

note-system-back-end.iml

@@ -88,7 +88,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.21" level="project" />
     <orderEntry type="library" name="Maven: org.modelmapper.extensions:modelmapper-spring:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.modelmapper:modelmapper:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.0.Final" level="project" />
   </component>
 </module>

pom.xml

@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.2.3.Final</version>
+            <version>6.0.0.Final</version>
         </dependency>
 
 

src/main/java/lk/ijse/dep/note/advice/GlobalExceptionHandler.java

@@ -11,12 +11,16 @@
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
+    @ResponseStatus(HttpStatus.CONFLICT)
     @ExceptionHandler(DuplicateEmailException.class)
-    public void handleDuplicateEmailexception(DuplicateEmailException e){
+    public String handleDuplicateEmailexception(DuplicateEmailException e){
        e.initCause( new ResponseStatusException(HttpStatus.CONFLICT,e.getMessage()));
+        return e.getMessage();
     }
+    @ResponseStatus(HttpStatus.NOT_FOUND)
     @ExceptionHandler(NotFoundException.class)
-    public void handleNotfoundExcpetion(NotFoundException e){
+    public String handleNotfoundExcpetion(NotFoundException e){
         e.initCause(new ResponseStatusException(HttpStatus.NOT_FOUND,e.getMessage()));
+        return e.getMessage();
     }
 }

src/main/java/lk/ijse/dep/note/api/UserController.java

@@ -1,17 +1,19 @@
 package lk.ijse.dep.note.api;
 
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lk.ijse.dep.note.dto.UserDTO;
 import lk.ijse.dep.note.service.UserService;
 import lk.ijse.dep.note.service.exception.DuplicateEmailException;
 import lk.ijse.dep.note.service.exception.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
 @RequestMapping("api/v1/users")
+@Validated
 public class UserController {
 
     @Autowired

src/main/java/lk/ijse/dep/note/config/WebAppConfig.java

@@ -11,6 +11,7 @@
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 import java.util.Properties;
@@ -22,14 +23,19 @@
 public class WebAppConfig {
 
 
+    @Bean
+    public LocalValidatorFactoryBean localValidatorFactoryBean() {
+        return new LocalValidatorFactoryBean();
+    }
 
     @Bean
-    public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer(){
-    return  new PropertySourcesPlaceholderConfigurer();
+    public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+        return new PropertySourcesPlaceholderConfigurer();
 
     }
+
     @Bean
-    public ObjectMapper objectMapper(){
-        return  new ObjectMapper();
+    public ObjectMapper objectMapper() {
+        return new ObjectMapper();
     }
 }

src/main/java/lk/ijse/dep/note/dto/UserDTO.java

@@ -1,10 +1,11 @@
 package lk.ijse.dep.note.dto;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
 import lk.ijse.dep.note.entity.SuperEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -22,7 +23,7 @@ public class UserDTO implements Serializable {
     private String email;
 
     @NotNull(message = "Password cannot be empty")
-    @Max(value = 6,message = "Password must have minimum of 6 characters")
+    @Length(max = 6,message = "Password must have minimum of 6 characters")
     @NotNull(message = "Password cannot be null")
     private String password;