BENCH-155 new ValidationException class added

AudriusPutys · AudriusPutys · commit e4cd8c4ed4c9 · 2022-11-21T11:21:46.000Z
diff --git a/src/main/java/com/answerdigital/answerking/exception/AnswerKingException.java b/src/main/java/com/answerdigital/answerking/exception/AnswerKingException.java
@@ -1,9 +1,5 @@
 package com.answerdigital.answerking.exception;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
@@ -18,36 +14,16 @@ public abstract class AnswerKingException extends RuntimeException {
 
     private final String detail;
 
-    private final Map<String, Collection<String>> errors = new HashMap<>();
-    private final String error;
-
-    protected AnswerKingException(
-            final String type,
-            final String title,
-            final HttpStatus status,
-            final String detail,
-            final Map<String, Collection<String>> errors
-    ) {
-        super(errors.toString());
-        this.type = type;
-        this.title = title;
-        this.status = status;
-        this.detail = detail;
-        this.errors.putAll(errors);
-        this.error = "";
-    }
     protected AnswerKingException(
             final String type,
             final String title,
             final HttpStatus status,
-            final String detail,
-            final String error
+            final String detail
     ) {
-        super(error);
+        super(detail);
         this.type = type;
         this.title = title;
         this.status = status;
         this.detail = detail;
-        this.error = error;
     }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/AnswerKingValidationException.java b/src/main/java/com/answerdigital/answerking/exception/custom/AnswerKingValidationException.java
@@ -0,0 +1,27 @@
+package com.answerdigital.answerking.exception.custom;
+
+import com.answerdigital.answerking.exception.AnswerKingException;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+import java.util.Collection;
+import java.util.Map;
+
+@Getter
+public class AnswerKingValidationException extends AnswerKingException {
+
+    private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
+
+    private static final String TITLE = "Validation Exception";
+
+    private static final HttpStatus STATUS = HttpStatus.BAD_REQUEST;
+
+    private static final String DETAIL = "One or more validation errors occurred";
+
+    private final Map<String, Collection<String>> errors;
+
+    public AnswerKingValidationException(final Map<String, Collection<String>> errors) {
+        super(TYPE, TITLE, STATUS, DETAIL);
+        this.errors = errors;
+    }
+}
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/NameUnavailableException.java b/src/main/java/com/answerdigital/answerking/exception/custom/NameUnavailableException.java
@@ -2,8 +2,6 @@
 
 import com.answerdigital.answerking.exception.generic.BadRequestException;
 
-import java.util.Collection;
-
 public class NameUnavailableException extends BadRequestException {
 
     public NameUnavailableException(final String error) {
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/ProductAlreadyPresentException.java b/src/main/java/com/answerdigital/answerking/exception/custom/ProductAlreadyPresentException.java
@@ -2,8 +2,6 @@
 
 import com.answerdigital.answerking.exception.generic.BadRequestException;
 
-import java.util.Collection;
-
 public class ProductAlreadyPresentException extends BadRequestException {
 
     public ProductAlreadyPresentException(final String error) {
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/RetirementException.java b/src/main/java/com/answerdigital/answerking/exception/custom/RetirementException.java
@@ -3,9 +3,6 @@
 import com.answerdigital.answerking.exception.AnswerKingException;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collection;
-import java.util.List;
-
 public class RetirementException extends AnswerKingException {
 
     private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
@@ -14,10 +11,8 @@ public class RetirementException extends AnswerKingException {
 
     private static final HttpStatus STATUS = HttpStatus.GONE;
 
-    private static final String DETAIL = null;
-
     public RetirementException(final String errors) {
-        super(TYPE, TITLE, STATUS, DETAIL, errors);
+        super(TYPE, TITLE, STATUS, errors);
     }
 
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/BadRequestException.java b/src/main/java/com/answerdigital/answerking/exception/generic/BadRequestException.java
@@ -3,10 +3,6 @@
 import com.answerdigital.answerking.exception.AnswerKingException;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 public class BadRequestException extends AnswerKingException {
 
     private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
@@ -15,12 +11,7 @@ public class BadRequestException extends AnswerKingException {
 
     private static final HttpStatus STATUS = HttpStatus.BAD_REQUEST;
 
-    private static final String DETAIL = null;
-
     public BadRequestException(final String error) {
-        super(TYPE, TITLE, STATUS, DETAIL, error);
-    }
-    public BadRequestException(final Map<String, Collection<String>> errors, String detail) {
-        super(TYPE, TITLE, STATUS, detail, errors);
+        super(TYPE, TITLE, STATUS, error);
     }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/ConflictException.java b/src/main/java/com/answerdigital/answerking/exception/generic/ConflictException.java
@@ -3,9 +3,6 @@
 import com.answerdigital.answerking.exception.AnswerKingException;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collection;
-import java.util.List;
-
 public class ConflictException extends AnswerKingException {
 
     private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
@@ -14,10 +11,8 @@ public class ConflictException extends AnswerKingException {
 
     private static final HttpStatus STATUS = HttpStatus.CONFLICT;
 
-    private static final String DETAIL = null;
-
     public ConflictException(final String errors) {
-        super(TYPE, TITLE, STATUS, DETAIL, errors);
+        super(TYPE, TITLE, STATUS, errors);
     }
 
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/InternalServerErrorException.java b/src/main/java/com/answerdigital/answerking/exception/generic/InternalServerErrorException.java
@@ -3,9 +3,6 @@
 import com.answerdigital.answerking.exception.AnswerKingException;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collection;
-import java.util.List;
-
 public class InternalServerErrorException extends AnswerKingException {
 
     private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
@@ -14,10 +11,8 @@ public class InternalServerErrorException extends AnswerKingException {
 
     private static final HttpStatus STATUS = HttpStatus.INTERNAL_SERVER_ERROR;
 
-    private static final String DETAIL = null;
-
     public InternalServerErrorException(final String errors) {
-        super(TYPE, TITLE, STATUS, DETAIL, errors);
+        super(TYPE, TITLE, STATUS, errors);
     }
 
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/NotFoundException.java b/src/main/java/com/answerdigital/answerking/exception/generic/NotFoundException.java
@@ -3,9 +3,6 @@
 import com.answerdigital.answerking.exception.AnswerKingException;
 import org.springframework.http.HttpStatus;
 
-import java.util.Collection;
-import java.util.List;
-
 public class NotFoundException extends AnswerKingException {
 
     private static final String TYPE = "https://www.rfc-editor.org/rfc/rfc7231";
@@ -14,10 +11,7 @@ public class NotFoundException extends AnswerKingException {
 
     private static final HttpStatus STATUS = HttpStatus.NOT_FOUND;
 
-    private static final String DETAIL = null;
-
     public NotFoundException(final String errors) {
-        super(TYPE, TITLE, STATUS, DETAIL, errors);
+        super(TYPE, TITLE, STATUS, errors);
     }
-
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/util/ErrorResponse.java b/src/main/java/com/answerdigital/answerking/exception/util/ErrorResponse.java
@@ -5,9 +5,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 @Slf4j
 @Getter
@@ -23,29 +20,13 @@ public class ErrorResponse {
 
     private final String instance;
 
-    private final Map<String, Collection<String>> errors = new HashMap<>();
-
     private final String traceId;
 
-    public ErrorResponse(final AnswerKingException exception, final HttpServletRequest request, boolean validtionProblem) {
-        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.toString(), traceId)
-        );
-    }
     public ErrorResponse(final AnswerKingException exception, final HttpServletRequest request) {
         this.type = exception.getType();
         this.title = exception.getTitle();
         this.status = exception.getStatus().value();
-        this.detail = exception.getError();
+        this.detail = exception.getDetail();
         this.instance = request.getRequestURI();
         this.traceId = CorrelationId.getId();
 
diff --git a/src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java b/src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java
@@ -1,6 +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.generic.BadRequestException;
 import com.answerdigital.answerking.exception.generic.InternalServerErrorException;
 import org.springframework.http.HttpStatus;
@@ -39,28 +40,27 @@ public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(
     }
 
     @ExceptionHandler(ConstraintViolationException.class)
-    public ResponseEntity<ErrorResponse> handleConstraintViolationException(
+    public ResponseEntity<ValidationErrorResponse> handleConstraintViolationException(
             final ConstraintViolationException exception,
-            final HttpServletRequest request ) {
-
+            final HttpServletRequest request) {
 
-        Map<String, Collection<String>> newMap = new HashMap<>();
+        final Map<String, Collection<String>> newMap = new HashMap<>();
         for (ConstraintViolation<?> constraintViolation : exception.getConstraintViolations()) {
-            String mapKey = Objects.requireNonNull(StreamSupport
+            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 (newMap.containsKey(mapKey)) {
+                newMap.get(mapKey).add(constraintViolation.getMessage());
             } else {
-                Collection<String> newCollection = new ArrayList<>();
+                final Collection<String> newCollection = new ArrayList<>();
                 newCollection.add(constraintViolation.getMessage());
                 newMap.put(mapKey, newCollection);
             }
         }
 
-        final ErrorResponse response = new ErrorResponse(new BadRequestException(newMap, "One or more validation errors occurred"), request, true);
+        final ValidationErrorResponse response = new ValidationErrorResponse(new AnswerKingValidationException(newMap), request);
         return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
     }
 
diff --git a/src/main/java/com/answerdigital/answerking/exception/util/ValidationErrorResponse.java b/src/main/java/com/answerdigital/answerking/exception/util/ValidationErrorResponse.java
@@ -0,0 +1,44 @@
+package com.answerdigital.answerking.exception.util;
+
+import com.answerdigital.answerking.exception.custom.AnswerKingValidationException;
+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 {
+
+    private final String type;
+
+    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)
+        );
+    }
+}
