Merge pull request #163 from folio-org/MODWRKFLOW-72

MODWRKFLOW-72: Properly handle when workflow engine does not have a workflow to deactivate on workflow delete.

Author: kaladay

service/src/main/java/org/folio/rest/workflow/controller/WorkflowController.java

@@ -7,6 +7,7 @@
 import java.util.regex.Pattern;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.folio.rest.workflow.exception.WorkflowDeploymentNotFound;
 import org.folio.rest.workflow.exception.WorkflowEngineServiceException;
 import org.folio.rest.workflow.exception.WorkflowImportException;
 import org.folio.rest.workflow.exception.WorkflowNotFoundException;
@@ -138,7 +139,7 @@ public JsonNode workflowHistory(
     @PathVariable String id,
     @TenantHeader String tenant,
     @TokenHeader String token
-  ) throws WorkflowEngineServiceException {
+  ) throws WorkflowDeploymentNotFound, WorkflowEngineServiceException {
     LOG.debug(String.format("Retrieving History: %s", sanitize(id)));
     return workflowEngineService.history(id, tenant, token);
   }
@@ -149,7 +150,7 @@ public JsonNode startWorkflow(
     @TenantHeader String tenant,
     @TokenHeader String token,
     @RequestBody JsonNode context
-  ) throws WorkflowEngineServiceException {
+  ) throws WorkflowDeploymentNotFound, WorkflowEngineServiceException, WorkflowNotFoundException {
     LOG.info(String.format("Starting: %s with context %s", sanitize(id), sanitize(context)));
     return workflowEngineService.start(id, tenant, token, context);
   }

service/src/main/java/org/folio/rest/workflow/controller/advice/WorkflowControllerAdvice.java

@@ -5,6 +5,7 @@
 import org.folio.rest.workflow.exception.WorkflowAlreadyActiveException;
 import org.folio.rest.workflow.exception.WorkflowCreateAlreadyExistsException;
 import org.folio.rest.workflow.exception.WorkflowDeploymentException;
+import org.folio.rest.workflow.exception.WorkflowDeploymentNotFound;
 import org.folio.rest.workflow.exception.WorkflowEngineServiceException;
 import org.folio.rest.workflow.exception.WorkflowImportException;
 import org.folio.rest.workflow.exception.WorkflowNotFoundException;
@@ -75,6 +76,12 @@ public ResponseEntity<String> handleWorkflowDeploymentException(WorkflowDeployme
     return buildError(exception, HttpStatus.INTERNAL_SERVER_ERROR);
   }
 
+  @ResponseStatus(HttpStatus.NOT_FOUND)
+  @ExceptionHandler(WorkflowDeploymentNotFound.class)
+  public ResponseEntity<String> handleWorkflowDeploymentNotFound(WorkflowDeploymentNotFound exception) {
+    return buildError(exception, HttpStatus.NOT_FOUND);
+  }
+
   @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
   @ExceptionHandler(WorkflowEngineServiceException.class)
   public ResponseEntity<String> handleWorkflowEngineServiceException(WorkflowEngineServiceException exception) {

service/src/main/java/org/folio/rest/workflow/exception/WorkflowAlreadyActiveException.java

@@ -10,4 +10,8 @@ public WorkflowAlreadyActiveException(String id) {
     super(String.format(WORKFLOW_ALREADY_ACTIVE_MESSAGE, id));
   }
 
+  public WorkflowAlreadyActiveException(String id, Exception e) {
+    super(String.format(WORKFLOW_ALREADY_ACTIVE_MESSAGE, id), e);
+  }
+
 }

service/src/main/java/org/folio/rest/workflow/exception/WorkflowDeploymentNotFound.java

@@ -0,0 +1,26 @@
+package org.folio.rest.workflow.exception;
+
+/**
+ * For providing a 404 when any Workflow deployment is not found in the Workflow Engine.
+ */
+public class WorkflowDeploymentNotFound extends Exception {
+
+  private static final long serialVersionUID = 424162623670077L;
+
+  public WorkflowDeploymentNotFound(String message) {
+    super(message);
+  }
+
+  public WorkflowDeploymentNotFound(String message, Exception e) {
+    super(message, e);
+  }
+
+  public WorkflowDeploymentNotFound(int code) {
+    super(Integer.toString(code));
+  }
+
+  public WorkflowDeploymentNotFound(int code, Exception e) {
+    super(Integer.toString(code), e);
+  }
+
+}

service/src/main/java/org/folio/rest/workflow/exception/WorkflowNotFoundException.java

@@ -10,4 +10,8 @@ public WorkflowNotFoundException(String id) {
     super(String.format(WORKFLOW_NOT_FOUND_MESSAGE, id));
   }
 
+  public WorkflowNotFoundException(String id, Exception e) {
+    super(String.format(WORKFLOW_NOT_FOUND_MESSAGE, id), e);
+  }
+
 }