Merge branch 'develop'

Author: longcoding

src/main/java/com/longcoding/moon/exceptions/ExceptionAdvice.java

@@ -12,6 +12,7 @@
 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.async.AsyncRequestTimeoutException;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.PrintWriter;
@@ -45,6 +46,15 @@ public ResponseEntity exception(Exception e, HttpServletRequest request) {
         return HttpHelper.newResponseEntityWithId(HttpStatus.INTERNAL_SERVER_ERROR, response);
     }
 
+    @ExceptionHandler(AsyncRequestTimeoutException.class)
+    public ResponseEntity asyncRequestTimeoutException(Exception e, HttpServletRequest request) {
+        log.error("{}", getStackTrace(e));
+        ExceptionType exceptionType = ExceptionType.E_7104_OUTBOUND_SERVICE_REQUEST_TIME_OUT;
+        setHttpResponseErrorCode(request, ExceptionType.E_7104_OUTBOUND_SERVICE_REQUEST_TIME_OUT.getCode());
+        CommonResponseEntity response = CommonResponseEntity.generateException(exceptionType.getCode(), messageManager.getProperty(exceptionType.getCode()));
+        return HttpHelper.newResponseEntityWithId(HttpStatus.REQUEST_TIMEOUT, response);
+    }
+
     @ExceptionHandler(RatelimitFailException.class)
     public ResponseEntity ratelimtFailException(RatelimitFailException e, HttpServletRequest request) {
         log.error("{}", getStackTrace(e));

src/main/java/com/longcoding/moon/exceptions/ExceptionType.java

@@ -36,6 +36,7 @@ public enum ExceptionType {
     E_1101_API_GATEWAY_IS_EXHAUSTED("1101", HttpStatus.SERVICE_UNAVAILABLE),
     E_1102_OUTBOUND_SERVICE_IS_NOT_UNSTABLE("1102", HttpStatus.GATEWAY_TIMEOUT),
     E_1103_OUTBOUND_SERVICE_CAPACITY_OVER("1103", HttpStatus.SERVICE_UNAVAILABLE),
+    E_1104_OUTBOUND_SERVICE_REQUEST_TIME_OUT("1104", HttpStatus.REQUEST_TIMEOUT),
 
     E_1200_FAIL_SERVICE_INFO_CONFIGURATION_INIT("1200", HttpStatus.INTERNAL_SERVER_ERROR),
     E_1201_FAIL_API_INFO_CONFIGURATION_INIT("1201", HttpStatus.INTERNAL_SERVER_ERROR),

src/main/resources/message/error-message_en.yml

@@ -17,6 +17,7 @@
 1101: Internal Server Error. Proxy server is exhausted.
 1102: Internal Server Error. Outbound Service is unstable.
 1103: Went over service Capacity.
+1104: Request Timeout.
 
 1200: Failed Configuration Init. Please check the service info configuration.
 1201: Failed Configuration Init. Please check the API info configuration.