feat(connect): add http connector response error handling

related to #4241

Author: Nandanrshenoy

connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/AbstractHttpConnector.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
 import java.util.Map;
+import java.util.Optional;
 
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.config.RequestConfig.Builder;
@@ -68,16 +69,28 @@ public void setHttpClient(CloseableHttpClient httpClient) {
 
   @Override
   public R execute(Q request) {
+    R invocationResult;
     HttpRequestBase httpRequest = createHttpRequest(request);
-
     HttpRequestInvocation invocation = new HttpRequestInvocation(httpRequest, request, requestInterceptors, httpClient);
-
     try {
-      return createResponse((CloseableHttpResponse) invocation.proceed());
+      invocationResult = createResponse((CloseableHttpResponse) invocation.proceed());
     } catch (Exception e) {
       throw LOG.unableToExecuteRequest(e);
     }
+    handleErrorResponse(request, invocationResult);
+    return invocationResult;
+  }
 
+  protected void handleErrorResponse(Q request, R invocationResult) {
+    Map<String, Object> configOptions = request.getConfigOptions();
+    if (configOptions != null && invocationResult != null) {
+      int statusCode = invocationResult.getStatusCode();
+      String connectorResponse = invocationResult.getResponse();
+      Object handleHttpError = Optional.ofNullable(configOptions.get("throw-http-error")).orElse("FALSE");
+      if (Boolean.parseBoolean(handleHttpError.toString()) && statusCode >= 400 && statusCode <= 599) {
+        throw LOG.httpRequestError(statusCode, connectorResponse);
+      }
+    }
   }
 
   protected abstract R createResponse(CloseableHttpResponse response);

connect/http-client/src/main/java/org/camunda/connect/httpclient/impl/HttpConnectorLogger.java

@@ -59,4 +59,9 @@ public void ignoreConfig(String field, Object value) {
     logInfo("009", "Ignoring request configuration option with name '{}' and value '{}'", field, value);
   }
 
+  public ConnectorRequestException httpRequestError(int statusCode , String connectorResponse) {
+    return new ConnectorRequestException(exceptionMessage("010", "HTTP request failed with Status Code: {} ," 
+        + " Response: {}", statusCode, connectorResponse));
+  }
+
 }

connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpRequestTest.java

@@ -191,4 +191,33 @@ public void shouldIgnoreConfigWithNullOrEmptyNameOrNullValue() {
       assertThat(request.getConfigOptions()).isNull();
   }
 
+  @Test
+  public void setRequestConfig() {
+    HttpRequest request = connector.createRequest()
+        .configOption("throw-http-error", "TRUE")
+        .configOption("connection-timeout", "10000")
+        .configOption("socket-timeout", "30000");
+
+    assertThat(request.getConfigOptions()).hasSize(3)
+        .containsEntry("throw-http-error", "TRUE")
+        .containsEntry("connection-timeout", "10000")
+        .containsEntry("socket-timeout", "30000");
+    assertThat(request.getConfigOption("throw-http-error")).isEqualTo("TRUE");
+    assertThat(request.getConfigOption("connection-timeout")).isEqualTo("10000");
+    assertThat(request.getConfigOption("socket-timeout")).isEqualTo("30000");
+    assertThat(request.getHeader("unknown")).isNull();
+  }
+
+  @Test
+  public void shouldIgnoreRequestConfigWithNullOrEmptyNameOrValue() {
+    HttpRequest request = connector.createRequest().configOption(null, "test");
+    assertThat(request.getConfigOptions()).isNull();
+
+    request.configOption("throw-http-error", null);
+    assertThat(request.getConfigOption("throw-http-error")).isNull();
+
+    request.configOption("throw-http-error", "");
+    assertThat(request.getConfigOption("throw-http-error")).isEqualTo("");
+  }
+
 }

connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java

@@ -18,6 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.assertj.core.api.Assertions;
+import org.camunda.connect.ConnectorRequestException;
 import org.camunda.connect.httpclient.impl.HttpConnectorImpl;
 import org.camunda.connect.impl.DebugRequestInterceptor;
 import org.junit.Before;
@@ -89,4 +91,84 @@ protected HttpResponse getResponse() {
     return connector.createRequest().url("http://camunda.com").get().execute();
   }
 
+  @Test
+  public void testSuccessfulResponseCode() {
+    // given
+    testResponse.statusCode(200);
+    // when
+    HttpResponse response = getResponse();
+    // then
+    assertThat(response.getStatusCode()).isEqualTo(200);
+  }
+
+  @Test
+  public void testResponseErrorCodeForMalformedRequest() {
+    // given
+    testResponse.statusCode(400);
+    // when
+    HttpResponse response = getResponse();
+    // then
+    assertThat(response.getStatusCode()).isEqualTo(400);
+  }
+
+  @Test
+  public void testResponseErrorCodeForServerError() {
+    // given
+    testResponse.statusCode(500);
+    // when
+    HttpResponse response = getResponse();
+    // then
+    assertThat(response.getStatusCode()).isEqualTo(500);
+  }
+
+  @Test
+  public void testServerErrorResponseWithConfigOptionSet() {
+    // given
+    testResponse.statusCode(500);
+    try {
+      // when
+      connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
+      Assertions.fail("ConnectorRequestException should be thrown");
+    } catch (ConnectorRequestException e) {
+      // then
+      assertThat(e).hasMessageContaining("HTTP request failed with Status Code: 500");
+    }
+  }
+
+  @Test
+  public void testMalformedRequestWithConfigOptionSet() {
+    // given
+    testResponse.statusCode(400);
+    try {
+      // when
+      connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
+      Assertions.fail("ConnectorRequestException should be thrown");
+    } catch (ConnectorRequestException e) {
+      // then
+      assertThat(e).hasMessageContaining("HTTP request failed with Status Code: 400");
+    }
+  }
+
+  @Test
+  public void testSuccessResponseWithConfigOptionSet() {
+    // given
+    testResponse.statusCode(200);
+    // when
+    connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
+    // then
+    HttpResponse response = getResponse();
+    assertThat(response.getStatusCode()).isEqualTo(200);
+  }
+
+  @Test
+  public void testMalformedRequestWithConfigOptionSetToFalse() {
+    // given
+    testResponse.statusCode(400);
+    // when
+    connector.createRequest().configOption("throw-http-error", "FALSE").url("http://camunda.com").get().execute();
+    // then
+    HttpResponse response = getResponse();
+    assertThat(response.getStatusCode()).isEqualTo(400);
+  }
+
 }