From fcb4d91e126ef7264be9528ba858a913f4d22307 Mon Sep 17 00:00:00 2001 From: Amit Galitzky Date: Mon, 18 Mar 2024 15:46:11 -0700 Subject: [PATCH] reverting change on rest classes Signed-off-by: Amit Galitzky --- CHANGELOG.md | 1 + .../flowframework/rest/RestCreateWorkflowAction.java | 12 +++--------- .../flowframework/rest/RestDeleteWorkflowAction.java | 12 +++--------- .../rest/RestDeprovisionWorkflowAction.java | 12 +++--------- .../flowframework/rest/RestGetWorkflowAction.java | 12 +++--------- .../rest/RestGetWorkflowStateAction.java | 12 +++--------- .../rest/RestGetWorkflowStepAction.java | 12 +++--------- .../rest/RestProvisionWorkflowAction.java | 12 +++--------- 8 files changed, 22 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48d5d819a..25523641d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) - Added an optional workflow_step param to the get workflow steps API ([#538](https://github.com/opensearch-project/flow-framework/pull/538)) - Add created, updated, and provisioned timestamps to saved template ([#551](https://github.com/opensearch-project/flow-framework/pull/551)) - Enable Flow Framework by default ([#553](https://github.com/opensearch-project/flow-framework/pull/553)) +- Adding new exception type for workflow step failures ([#577](https://github.com/opensearch-project/flow-framework/pull/577)) ### Bug Fixes ### Infrastructure diff --git a/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java index 8fe0c4dc5..c2ec444c4 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java @@ -20,7 +20,6 @@ import org.opensearch.flowframework.common.DefaultUseCases; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.model.Template; import org.opensearch.flowframework.transport.CreateWorkflowAction; import org.opensearch.flowframework.transport.WorkflowRequest; @@ -181,14 +180,9 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli channel.sendResponse(new BytesRestResponse(RestStatus.CREATED, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to create workflow.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java index 7e1df1e45..fc18f103d 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestDeleteWorkflowAction.java @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.DeleteWorkflowAction; import org.opensearch.flowframework.transport.WorkflowRequest; import org.opensearch.rest.BaseRestHandler; @@ -85,14 +84,9 @@ protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to delete workflow.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java index 3d42b5db0..08c8d6722 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestDeprovisionWorkflowAction.java @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.DeprovisionWorkflowAction; import org.opensearch.flowframework.transport.WorkflowRequest; import org.opensearch.rest.BaseRestHandler; @@ -80,14 +79,9 @@ protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to deprovision workflow.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java index 0fec8855c..0710657c2 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowAction.java @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.GetWorkflowAction; import org.opensearch.flowframework.transport.WorkflowRequest; import org.opensearch.rest.BaseRestHandler; @@ -86,14 +85,9 @@ protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java index 35478a60f..45fe9921a 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStateAction.java @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.GetWorkflowStateAction; import org.opensearch.flowframework.transport.GetWorkflowStateRequest; import org.opensearch.rest.BaseRestHandler; @@ -83,14 +82,9 @@ protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to get workflow state.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java index 92e28de70..b9a6deb38 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestGetWorkflowStepAction.java @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.GetWorkflowStepAction; import org.opensearch.flowframework.transport.WorkflowRequest; import org.opensearch.rest.BaseRestHandler; @@ -82,14 +81,9 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to get workflow step.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) { diff --git a/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java index 95a2022bc..6ae56905c 100644 --- a/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java +++ b/src/main/java/org/opensearch/flowframework/rest/RestProvisionWorkflowAction.java @@ -19,7 +19,6 @@ import org.opensearch.core.xcontent.XContentParser; import org.opensearch.flowframework.common.FlowFrameworkSettings; import org.opensearch.flowframework.exception.FlowFrameworkException; -import org.opensearch.flowframework.exception.WorkflowStepException; import org.opensearch.flowframework.transport.ProvisionWorkflowAction; import org.opensearch.flowframework.transport.WorkflowRequest; import org.opensearch.rest.BaseRestHandler; @@ -93,14 +92,9 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder)); }, exception -> { try { - FlowFrameworkException ex; - if (exception instanceof WorkflowStepException) { - ex = (WorkflowStepException) exception; - } else if (exception instanceof FlowFrameworkException) { - ex = (FlowFrameworkException) exception; - } else { - ex = new FlowFrameworkException("Failed to provision workflow.", ExceptionsHelper.status(exception)); - } + FlowFrameworkException ex = exception instanceof FlowFrameworkException + ? (FlowFrameworkException) exception + : new FlowFrameworkException("Failed to get workflow.", ExceptionsHelper.status(exception)); XContentBuilder exceptionBuilder = ex.toXContent(channel.newErrorBuilder(), ToXContent.EMPTY_PARAMS); channel.sendResponse(new BytesRestResponse(ex.getRestStatus(), exceptionBuilder)); } catch (IOException e) {