Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ protected static RequestSupplier buildRequestSupplier(
return new WithoutBodyRequestSupplier(Invocation.Builder::delete, application, redirect);
case HttpMethod.HEAD:
return new WithoutBodyRequestSupplier(Invocation.Builder::head, application, redirect);
case HttpMethod.OPTIONS:
return new WithoutBodyRequestSupplier(Invocation.Builder::options, application, redirect);
case HttpMethod.PATCH:
return new WithBodyRequestSupplier(
(request, entity) -> request.method("patch", entity), application, body, redirect);
(request, entity) -> request.method("PATCH", entity), application, body, redirect);
case HttpMethod.OPTIONS:
return new WithoutBodyRequestSupplier(Invocation.Builder::options, application, redirect);
case HttpMethod.GET:
default:
return new WithoutBodyRequestSupplier(Invocation.Builder::get, application, redirect);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/
package io.serverlessworkflow.impl.executors.http;

import static jakarta.ws.rs.core.Response.Status.Family.REDIRECTION;
import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;

import io.serverlessworkflow.impl.TaskContext;
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.WorkflowError;
Expand All @@ -36,6 +39,7 @@ public AbstractRequestSupplier(boolean redirect) {
public WorkflowModel apply(
Builder request, WorkflowContext workflow, TaskContext task, WorkflowModel model) {
HttpModelConverter converter = HttpConverterResolver.converter(workflow, task);

Response response = invokeRequest(request, converter, workflow, task, model);
validateStatus(task, response, converter);
return workflow
Expand All @@ -46,7 +50,9 @@ public WorkflowModel apply(
}

private void validateStatus(TaskContext task, Response response, HttpModelConverter converter) {
if (response.getStatusInfo().getFamily() != Family.SUCCESSFUL) {
Family statusFamily = response.getStatusInfo().getFamily();

if (statusFamily != SUCCESSFUL || (!this.redirect && statusFamily == REDIRECTION)) {
throw new WorkflowException(
converter
.errorFromResponse(WorkflowError.communication(response.getStatus(), task), response)
Expand Down
Loading