BENCH-196 refactored code and duplications removed

Author: AudriusPutys

src/main/java/com/answerdigital/answerking/exception/custom/AnswerKingValidationException.java

@@ -0,0 +1,22 @@
+package com.answerdigital.answerking.exception.custom;
+
+import com.answerdigital.answerking.exception.generic.BadRequestException;
+import lombok.Getter;
+
+import java.util.Collection;
+import java.util.Map;
+
+@Getter
+public class ValidationException extends BadRequestException {
+
+    private static final String TITLE = "Validation Exception";
+
+    private static final String DETAIL = "One or more validation errors occurred";
+
+    private final Map<String, Collection<String>> errors;
+
+    public ValidationException(final Map<String, Collection<String>> errors) {
+        super(DETAIL);
+        this.errors = errors;
+    }
+}

src/main/java/com/answerdigital/answerking/exception/custom/ValidationException.java

@@ -1,7 +1,7 @@
 package com.answerdigital.answerking.exception.util;
 
 import com.answerdigital.answerking.exception.AnswerKingException;
-import com.answerdigital.answerking.exception.custom.AnswerKingValidationException;
+import com.answerdigital.answerking.exception.custom.ValidationException;
 import com.answerdigital.answerking.exception.generic.BadRequestException;
 import com.answerdigital.answerking.exception.generic.InternalServerErrorException;
 import org.springframework.http.HttpStatus;
@@ -40,27 +40,27 @@ public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(
     }
 
     @ExceptionHandler(ConstraintViolationException.class)
-    public ResponseEntity<ValidationErrorResponse> handleConstraintViolationException(
+    public ResponseEntity<ErrorResponse> handleConstraintViolationException(
             final ConstraintViolationException exception,
             final HttpServletRequest request) {
 
-        final Map<String, Collection<String>> newMap = new HashMap<>();
+        final Map<String, Collection<String>> errorsMap = new HashMap<>();
         for (ConstraintViolation<?> constraintViolation : exception.getConstraintViolations()) {
             final String mapKey = Objects.requireNonNull(StreamSupport
                     .stream(constraintViolation.getPropertyPath().spliterator(), false)
                     .reduce((first, second) -> second)
                     .orElse(null)).toString();
 
-            if (newMap.containsKey(mapKey)) {
-                newMap.get(mapKey).add(constraintViolation.getMessage());
+            if (errorsMap.containsKey(mapKey)) {
+                errorsMap.get(mapKey).add(constraintViolation.getMessage());
             } else {
                 final Collection<String> newCollection = new ArrayList<>();
                 newCollection.add(constraintViolation.getMessage());
-                newMap.put(mapKey, newCollection);
+                errorsMap.put(mapKey, newCollection);
             }
         }
 
-        final ValidationErrorResponse response = new ValidationErrorResponse(new AnswerKingValidationException(newMap), request);
+        final ErrorResponse response = new ValidationErrorResponse(new ValidationException(errorsMap), request);
         return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
     }
 

src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java

@@ -1,44 +1,21 @@
 package com.answerdigital.answerking.exception.util;
 
-import com.answerdigital.answerking.exception.custom.AnswerKingValidationException;
+import com.answerdigital.answerking.exception.custom.ValidationException;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
 @Getter
-public class ValidationErrorResponse {
+public class ValidationErrorResponse extends ErrorResponse {
 
-    private final String type;
+    private final Map<String, Collection<String>> errors;
 
-    private final String title;
-
-    private final int status;
-
-    private final String detail;
-
-    private final String instance;
-
-    private final Map<String, Collection<String>> errors = new HashMap<>();
-
-    private final String traceId;
-
-    public ValidationErrorResponse(final AnswerKingValidationException exception, final HttpServletRequest request) {
-        this.type = exception.getType();
-        this.title = exception.getTitle();
-        this.status = exception.getStatus().value();
-        this.detail = exception.getDetail();
-        this.instance = request.getRequestURI();
-        this.errors.putAll(exception.getErrors());
-        this.traceId = CorrelationId.getId();
-
-        log.error(String.format(
-                "RETURNING EXCEPTION - TYPE: %s - TITLE: %s - STATUS: %s - DETAIL: %s - INSTANCE: %s - ERRORS: %s - TRACEID: %s",
-                type, title, status, detail, instance, errors, traceId)
-        );
+    public ValidationErrorResponse(final ValidationException exception, final HttpServletRequest request) {
+        super(exception, request);
+        this.errors = exception.getErrors();
     }
 }