From 4eba81bd57e1efbeb72e70d3dbba11e14be6b163 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:53:25 +0100
Subject: [PATCH] TSK-1150: now returning 404 StatusCode for
 TaskCommentNotFoundException

---
 .../rest/TaskanaRestExceptionHandler.java     | 20 +++----------------
 .../rest/TaskCommentControllerIntTest.java    |  2 +-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java
index 25a32e39c..35e127252 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaRestExceptionHandler.java
@@ -14,21 +14,19 @@ import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException;
-import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
 import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.api.exceptions.NotFoundException;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;
 import pro.taskana.task.api.exceptions.InvalidStateException;
 import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
-import pro.taskana.task.api.exceptions.TaskNotFoundException;
 import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;
 import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;
 import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException;
 import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
 import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException;
-import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
 
 /**
  * This class handles taskana exceptions.
@@ -52,8 +50,8 @@ public class TaskanaRestExceptionHandler extends ResponseEntityExceptionHandler
     return buildResponse(ex, req, HttpStatus.FORBIDDEN);
   }
 
-  @ExceptionHandler(TaskNotFoundException.class)
-  protected ResponseEntity<Object> handleTaskNotFound(TaskNotFoundException ex, WebRequest req) {
+  @ExceptionHandler(NotFoundException.class)
+  protected ResponseEntity<Object> handleTaskNotFound(NotFoundException ex, WebRequest req) {
     return buildResponse(ex, req, HttpStatus.NOT_FOUND);
   }
 
@@ -79,12 +77,6 @@ public class TaskanaRestExceptionHandler extends ResponseEntityExceptionHandler
     return buildResponse(ex, req, HttpStatus.CONFLICT);
   }
 
-  @ExceptionHandler(ClassificationNotFoundException.class)
-  protected ResponseEntity<Object> handleClassificationNotFound(
-      ClassificationNotFoundException ex, WebRequest req) {
-    return buildResponse(ex, req, HttpStatus.NOT_FOUND);
-  }
-
   @ExceptionHandler(ClassificationAlreadyExistException.class)
   protected ResponseEntity<Object> handleClassificationAlreadyExist(
       ClassificationAlreadyExistException ex, WebRequest req) {
@@ -120,12 +112,6 @@ public class TaskanaRestExceptionHandler extends ResponseEntityExceptionHandler
     return buildResponse(ex, req, HttpStatus.CONFLICT);
   }
 
-  @ExceptionHandler(WorkbasketNotFoundException.class)
-  protected ResponseEntity<Object> handleWorkbasketNotFound(
-      WorkbasketNotFoundException ex, WebRequest req) {
-    return buildResponse(ex, req, HttpStatus.NOT_FOUND);
-  }
-
   @ExceptionHandler(InvalidWorkbasketException.class)
   protected ResponseEntity<Object> handleInvalidWorkbasket(
       InvalidWorkbasketException ex, WebRequest req) {
diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskCommentControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskCommentControllerIntTest.java
index 8f2889a47..0eef2bc4e 100644
--- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskCommentControllerIntTest.java
+++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskCommentControllerIntTest.java
@@ -53,7 +53,7 @@ class TaskCommentControllerIntTest {
                     new HttpEntity<String>(restHelper.getHeadersAdmin()),
                     ParameterizedTypeReference.forType(TaskCommentResource.class)))
         .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
-        .isEqualTo(HttpStatus.BAD_REQUEST);
+        .isEqualTo(HttpStatus.NOT_FOUND);
   }
 
   @Test