Initial Commit

Author: rajsingha

src/main/java/com/webservice/mobile/app/exceptions/AppExceptionsHandler.java

@@ -1,19 +1,37 @@
 package com.webservice.mobile.app.exceptions;
 
+import com.webservice.mobile.app.ui.model.response.ErrorMessage;
 import org.springframework.http.HttpHeaders;
 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 org.springframework.web.context.request.WebRequest;
 
+import java.util.Date;
+
 @ControllerAdvice
 public class AppExceptionsHandler {
 
     @ExceptionHandler(value = {UserServiceException.class})
     public ResponseEntity<Object> handleUserServiceException(UserServiceException exception,
                                                              WebRequest webRequest){
-        return new ResponseEntity<>(exception.getMessage(),new HttpHeaders(),
+
+        ErrorMessage errorMessage = new ErrorMessage(new Date(),exception.getMessage());
+
+
+        return new ResponseEntity<>(errorMessage,new HttpHeaders(),
+                HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    @ExceptionHandler(value = {Exception.class})
+    public ResponseEntity<Object> handleOtherException(UserServiceException ex,
+                                                       WebRequest request){
+
+        ErrorMessage errorMessage = new ErrorMessage(new Date(),ex.getMessage());
+
+
+        return new ResponseEntity<>(errorMessage,new HttpHeaders(),
                 HttpStatus.INTERNAL_SERVER_ERROR);
     }
 

src/main/java/com/webservice/mobile/app/service/impl/UserServiceImpl.java

@@ -1,11 +1,13 @@
 package com.webservice.mobile.app.service.impl;
 
 
+import com.webservice.mobile.app.exceptions.UserServiceException;
 import com.webservice.mobile.app.io.entity.UserEntity;
 import com.webservice.mobile.app.io.repositories.UserRepository;
 import com.webservice.mobile.app.service.UserService;
 import com.webservice.mobile.app.shared.Utils;
 import com.webservice.mobile.app.shared.dto.UserDTO;
+import com.webservice.mobile.app.ui.model.response.ErrorMessages;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.User;
@@ -33,8 +35,11 @@ public class UserServiceImpl implements UserService {
     public UserDTO createUser(UserDTO userDTO) {
 
 
-        if (userRepository.findUserByEmail(userDTO.getEmail()) !=null)
-            throw new RuntimeException("Record Already Exists");
+        if (userRepository != null){
+            if (userRepository.findUserByEmail(userDTO.getEmail()) !=null)
+                throw new UserServiceException(ErrorMessages.RECORD_ALREADY_EXISTS.getErrorMessage());
+        }
+
 
         UserEntity userEntity = new UserEntity();
         BeanUtils.copyProperties(userDTO,userEntity);
@@ -53,7 +58,7 @@ public UserDTO createUser(UserDTO userDTO) {
     @Override
     public UserDTO getUser(String email) {
         UserEntity userEntity = userRepository.findUserByEmail(email);
-        if (userEntity == null) throw new UsernameNotFoundException(email);
+        if (userEntity == null) throw new UserServiceException(ErrorMessages.NO_RECORD_FOUND.getErrorMessage());
         UserDTO returnValue = new UserDTO();
         BeanUtils.copyProperties(userEntity,returnValue);
         return returnValue;
@@ -65,7 +70,7 @@ public UserDTO getUserByUserId(String userId) {
 
         UserDTO returnValue = new UserDTO();
         UserEntity userEntity = userRepository.findByUserId(userId);
-        if (userEntity == null) throw new UsernameNotFoundException(userId);
+        if (userEntity == null) throw new UserServiceException(ErrorMessages.NO_RECORD_FOUND.getErrorMessage());
         BeanUtils.copyProperties(userEntity,returnValue);
 
         return returnValue;

src/main/java/com/webservice/mobile/app/ui/controller/UserController.java

@@ -37,7 +37,6 @@ public UserRest createUser(@RequestBody UserDetailsRequestModel userDetails) thr
 
         UserRest returnValue = new UserRest();
 
-
         if (userDetails.getFirstName().isEmpty()) throw new
                 UserServiceException(ErrorMessages.MISSING_REQUIRED_FIELD.getErrorMessage());
 

src/main/java/com/webservice/mobile/app/ui/model/response/ErrorMessage.java

@@ -0,0 +1,33 @@
+package com.webservice.mobile.app.ui.model.response;
+
+import java.util.Date;
+
+public class ErrorMessage {
+    private Date timeStamp;
+    private String message;
+
+    public ErrorMessage() {
+
+    }
+
+    public ErrorMessage(Date timeStamp, String message) {
+        this.timeStamp = timeStamp;
+        this.message = message;
+    }
+
+    public Date getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(Date timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}