Merge pull request #54 from bnc-projects/july-updates

Updates for July

Author: pushkar-g

.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
   - TF_IN_AUTOMATION=1
   - SERVICE_NAME=spring-boot-java-base
-  - VERSION=0.12.0
+  - VERSION=0.12.4
   - DEPLOYMENT_ACCESS_KEY_ID=
   - DEPLOYMENT_SECRET_ACCESS_KEY=
   - AWS_DEFAULT_REGION=

build.gradle

@@ -81,11 +81,12 @@ allprojects {
     }
 
     dependencies {
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.4.2'
+        implementation group: 'com.bnc', name: 'market-data-api', version: '0.0.8'
+
+        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.5.0'
         testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
-        testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.28.2'
-        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '2.28.2'
-        testRuntime group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.4.2'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
+        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.0.0'
     }
 }
 

service/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "org.springframework.boot" version "2.1.5.RELEASE"
-    id "io.spring.dependency-management" version "1.0.7.RELEASE"
+    id "org.springframework.boot" version "2.1.6.RELEASE"
+    id "io.spring.dependency-management" version "1.0.8.RELEASE"
     id "com.palantir.docker" version "0.22.1"
     id "com.gorylenko.gradle-git-properties" version "2.0.0"
 }
@@ -40,7 +40,7 @@ dependencies {
     implementation project(':client')
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.1.1.RELEASE'
-    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.1.4'
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.1.2.RELEASE'
+    implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic', version: '1.2.0'
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 }

service/src/main/java/com/bnc/sbjb/model/api/CustomError.java

@@ -1,6 +1,6 @@
 package com.bnc.sbjb.rest;
 
-import com.bnc.sbjb.model.api.CustomError;
+import com.bnc.api.model.error.CustomError;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.http.HttpStatus;

service/src/main/java/com/bnc/sbjb/model/api/ValidationError.java

@@ -1,24 +1,92 @@
 package com.bnc.sbjb.rest;
 
-import com.bnc.sbjb.model.api.CustomError;
+import com.bnc.api.model.error.CustomError;
+import com.bnc.api.model.error.ValidationError;
+import java.nio.file.AccessDeniedException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.FieldError;
+import org.springframework.web.HttpMediaTypeNotSupportedException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 @ControllerAdvice
 public class DefaultExceptionHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(DefaultExceptionHandler.class);
 
+    @ExceptionHandler({NoSuchElementException.class})
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public void handleExceptionNotFound(final Exception ex) {
+        logger.debug("Could not find resource", ex);
+    }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public CustomError handleIllegalArgumentException(final IllegalArgumentException ex) {
+        logger.debug("Invalid Argument Received", ex);
+        return new CustomError(HttpStatus.BAD_REQUEST, "Invalid Argument Received");
+    }
+
+    @ExceptionHandler({
+        HttpMessageNotReadableException.class,
+        MethodArgumentTypeMismatchException.class,
+        HttpMediaTypeNotSupportedException.class})
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public CustomError handleBadRequests(final Exception ex) {
+        logger.debug("Bad input from client", ex);
+        return new CustomError(HttpStatus.BAD_REQUEST, ex.getMessage());
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(code = HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public CustomError handleMethodArgumentNotValid(MethodArgumentNotValidException ex) {
+        CustomError errors = new CustomError(HttpStatus.BAD_REQUEST, "Validation Error");
+        List<ValidationError> subErrors = new ArrayList<>();
+        if (ex.getBindingResult().getFieldErrorCount() > 0) {
+            List<FieldError> fieldErrors = ex.getBindingResult().getFieldErrors();
+            for (FieldError fieldError : fieldErrors) {
+                subErrors.add(new ValidationError(fieldError.getObjectName().replace("Dto", ""), fieldError.getField(),
+                    fieldError.getRejectedValue(), fieldError.getDefaultMessage()));
+            }
+        }
+        errors.setSubErrors(subErrors);
+        return errors;
+    }
+
+    @ExceptionHandler(AccessDeniedException.class)
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    public void handleAccessDenied(AccessDeniedException ex) {
+        logger.debug("Access Denied", ex);
+    }
+
+    @ExceptionHandler({HttpRequestMethodNotSupportedException.class})
+    @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED)
+    @ResponseBody
+    public CustomError handleExceptionMethodNotAllowed(final Exception ex) {
+        logger.debug("Method not allowed", ex);
+        return new CustomError(HttpStatus.METHOD_NOT_ALLOWED, "HTTP Method not allowed");
+    }
+
     @ExceptionHandler(Exception.class)
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ResponseBody
-    public CustomError handleException(Exception ex) {
-        logger.error("Unknown exception errorMessage=\"{}\"]", ex.getMessage(), ex);
+    public CustomError handleException(HttpServletRequest httpServletRequest, Exception ex) {
+        logger.error("Unknown exception [queryString=\"{}\" errorMessage=\"{}\"]", httpServletRequest.getQueryString(), ex.getMessage(), ex);
         return new CustomError(HttpStatus.INTERNAL_SERVER_ERROR,
             "Oops something went wrong. Please contact us if this keeps occurring.");
     }