fix(rest-connector): Return always an array for set cookie headers

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClient.java

@@ -112,9 +112,7 @@ public HttpCommonResult execute(
               .execute(
                   apacheRequest,
                   new HttpCommonResultResponseHandler(
-                      executionEnvironment,
-                      request.isStoreResponse(),
-                      request.getGroupSetCookieHeaders()));
+                      executionEnvironment, request.isStoreResponse()));
       if (HttpStatusHelper.isError(result.status())) {
         throw ConnectorExceptionMapper.from(result);
       }

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandler.java

@@ -49,26 +49,20 @@ public class HttpCommonResultResponseHandler
 
   private final boolean isStoreResponseSelected;
 
-  private final boolean groupSetCookieHeaders;
-
   public HttpCommonResultResponseHandler(
-      @Nullable ExecutionEnvironment executionEnvironment,
-      boolean isStoreResponseSelected,
-      boolean groupSetCookieHeaders) {
+      @Nullable ExecutionEnvironment executionEnvironment, boolean isStoreResponseSelected) {
     this.executionEnvironment = executionEnvironment;
     this.isStoreResponseSelected = isStoreResponseSelected;
     this.fileResponseHandler =
         new FileResponseHandler(executionEnvironment, isStoreResponseSelected);
-    this.groupSetCookieHeaders = groupSetCookieHeaders;
   }
 
   @Override
   public HttpCommonResult handleResponse(ClassicHttpResponse response) {
     int code = response.getCode();
     String reason = response.getReasonPhrase();
     Map<String, Object> headers =
-        HttpCommonResultResponseHandler.formatHeaders(
-            response.getHeaders(), this.groupSetCookieHeaders);
+        HttpCommonResultResponseHandler.formatHeaders(response.getHeaders());
 
     if (response.getEntity() != null) {
       try (InputStream content = response.getEntity().getContent()) {
@@ -90,23 +84,20 @@ public HttpCommonResult handleResponse(ClassicHttpResponse response) {
     return new HttpCommonResult(code, headers, null, reason);
   }
 
-  private static Map<String, Object> formatHeaders(
-      Header[] headersArray, Boolean groupSetCookieHeaders) {
+  private static Map<String, Object> formatHeaders(Header[] headersArray) {
     return Arrays.stream(headersArray)
         .collect(
             Collectors.toMap(
                 Header::getName,
                 header -> {
-                  if (groupSetCookieHeaders && header.getName().equalsIgnoreCase("Set-Cookie")) {
+                  if (header.getName().equalsIgnoreCase("Set-Cookie")) {
                     return new ArrayList<String>(List.of(header.getValue()));
                   } else {
                     return header.getValue();
                   }
                 },
                 (existingValue, newValue) -> {
-                  if (groupSetCookieHeaders
-                      && existingValue instanceof List
-                      && newValue instanceof List) {
+                  if (existingValue instanceof List && newValue instanceof List) {
                     ((List<String>) existingValue).add(((List<String>) newValue).getFirst());
                   }
                   return existingValue;

connectors/http/http-base/src/main/java/io/camunda/connector/http/base/model/HttpCommonRequest.java

@@ -120,16 +120,6 @@ public class HttpCommonRequest {
       optional = true)
   private String skipEncoding;
 
-  @TemplateProperty(
-      label = "Group set-cookie headers to a list",
-      description =
-          "Group incoming headers with same name into a List to support <a href=\"https://datatracker.ietf.org/doc/html/rfc6265\">multiple Set-Cookie headers</a>.",
-      type = TemplateProperty.PropertyType.Hidden,
-      feel = Property.FeelMode.disabled,
-      group = "endpoint",
-      optional = true)
-  private String groupSetCookieHeaders;
-
   public Object getBody() {
     return body;
   }
@@ -166,14 +156,6 @@ public void setSkipEncoding(final String skipEncoding) {
     this.skipEncoding = skipEncoding;
   }
 
-  public boolean getGroupSetCookieHeaders() {
-    return Objects.equals(groupSetCookieHeaders, "true");
-  }
-
-  public void setGroupSetCookieHeaders(final String groupSetCookieHeaders) {
-    this.groupSetCookieHeaders = groupSetCookieHeaders;
-  }
-
   public boolean hasAuthentication() {
     return authentication != null;
   }

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/HttpServiceTest.java

@@ -38,6 +38,7 @@
 import io.camunda.document.store.DocumentCreationRequest;
 import java.util.Base64;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import org.apache.hc.core5.http.ContentType;
@@ -200,8 +201,7 @@ public void shouldReturn200WithBody_whenPostRequest(
     // then
     assertThat(result).isNotNull();
     assertThat(result.status()).isEqualTo(200);
-    assertThat(result.headers()).contains(Map.entry("Set-Cookie", "key=value"));
-    assertThat(result.headers()).doesNotContain(Map.entry("Set-Cookie", "key2=value2"));
+    assertThat(result.headers()).containsEntry("Set-Cookie", List.of("key=value", "key2=value2"));
     JSONAssert.assertEquals(
         "{\"responseKey1\":\"value1\",\"responseKey2\":40,\"responseKey3\":null}",
         objectMapper.writeValueAsString(result.body()),

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClientTest.java

@@ -602,25 +602,21 @@ public void shouldReturn200WithoutBody_whenEmptyGet(WireMockRuntimeInfo wmRuntim
 
     private static Stream<Arguments> provideTestDataForHeaderTest() {
       return Stream.of(
-          Arguments.of("Set-Cookie", "false", false, "Test-Value-1"),
-          Arguments.of("Set-Cookie", "true", true, List.of("Test-Value-1", "Test-Value-2")),
-          Arguments.of("other-than-set-cookie", "false", false, "Test-Value-1"),
-          Arguments.of("other-than-set-cookie", "true", false, "Test-Value-1"));
+          Arguments.of("Set-Cookie", true, List.of("Test-Value-1", "Test-Value-2")),
+          Arguments.of("other-than-set-cookie", false, "Test-Value-1"));
     }
 
     @ParameterizedTest
     @MethodSource("provideTestDataForHeaderTest")
     public void shouldReturn200_whenDuplicatedHeadersAsListDisabled(
         String headerKey,
-        String groupSetCookieHeaders,
         Boolean expectedDoesReturnList,
         Object expectedValue,
         WireMockRuntimeInfo wmRuntimeInfo) {
       stubFor(get("/path").willReturn(ok().withHeader(headerKey, "Test-Value-1", "Test-Value-2")));
       HttpCommonRequest request = new HttpCommonRequest();
       request.setMethod(HttpMethod.GET);
       request.setUrl(wmRuntimeInfo.getHttpBaseUrl() + "/path");
-      request.setGroupSetCookieHeaders(groupSetCookieHeaders);
       HttpCommonResult result = customApacheHttpClient.execute(request);
       assertThat(result).isNotNull();
       assertThat(result.status()).isEqualTo(200);

connectors/http/http-base/src/test/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandlerTest.java

@@ -35,8 +35,7 @@ public class HttpCommonResultResponseHandlerTest {
   @Test
   public void shouldHandleJsonResponse_whenCloudFunctionDisabled() throws Exception {
     // given
-    HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(null, false, false);
+    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null, false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(200);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "application/json")};
     response.setHeaders(headers);
@@ -56,8 +55,7 @@ public void shouldHandleJsonResponse_whenCloudFunctionDisabled() throws Exceptio
   @Test
   public void shouldHandleTextResponse_whenCloudFunctionDisabled() throws Exception {
     // given
-    HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(null, false, false);
+    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null, false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(200);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "text/plain")};
     response.setHeaders(headers);
@@ -78,8 +76,7 @@ public void shouldHandleTextResponse_whenCloudFunctionDisabled() throws Exceptio
   public void shouldHandleJsonResponse_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCluster(null), false, false);
+        new HttpCommonResultResponseHandler(new ExecutionEnvironment.SaaSCluster(null), false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(201);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "application/json")};
     response.setHeaders(headers);
@@ -104,8 +101,7 @@ public void shouldHandleJsonResponse_whenCloudFunctionEnabled() throws Exception
   public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCluster(null), false, false);
+        new HttpCommonResultResponseHandler(new ExecutionEnvironment.SaaSCluster(null), false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(500);
     Header[] headers =
         new Header[] {
@@ -134,8 +130,7 @@ public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
   public void shouldHandleJsonAsTextResponse_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCluster(null), false, false);
+        new HttpCommonResultResponseHandler(new ExecutionEnvironment.SaaSCluster(null), false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(201);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "application/json")};
     response.setHeaders(headers);

connectors/http/rest/element-templates/http-json-connector.json

@@ -333,14 +333,14 @@
     },
     "type" : "Dropdown",
     "choices" : [ {
+      "name" : "DELETE",
+      "value" : "DELETE"
+    }, {
       "name" : "POST",
       "value" : "POST"
     }, {
       "name" : "GET",
       "value" : "GET"
-    }, {
-      "name" : "DELETE",
-      "value" : "DELETE"
     }, {
       "name" : "PATCH",
       "value" : "PATCH"
@@ -413,17 +413,6 @@
       "type" : "zeebe:input"
     },
     "type" : "Hidden"
-  }, {
-    "id" : "groupSetCookieHeaders",
-    "label" : "Group set-cookie headers to a list",
-    "description" : "Group incoming headers with same name into a List to support <a href=\"https://datatracker.ietf.org/doc/html/rfc6265\">multiple Set-Cookie headers</a>.",
-    "optional" : true,
-    "group" : "endpoint",
-    "binding" : {
-      "name" : "groupSetCookieHeaders",
-      "type" : "zeebe:input"
-    },
-    "type" : "Hidden"
   }, {
     "id" : "connectionTimeoutInSeconds",
     "label" : "Connection timeout in seconds",

connectors/http/rest/element-templates/hybrid/http-json-connector-hybrid.json

@@ -338,14 +338,14 @@
     },
     "type" : "Dropdown",
     "choices" : [ {
+      "name" : "DELETE",
+      "value" : "DELETE"
+    }, {
       "name" : "POST",
       "value" : "POST"
     }, {
       "name" : "GET",
       "value" : "GET"
-    }, {
-      "name" : "DELETE",
-      "value" : "DELETE"
     }, {
       "name" : "PATCH",
       "value" : "PATCH"
@@ -418,17 +418,6 @@
       "type" : "zeebe:input"
     },
     "type" : "Hidden"
-  }, {
-    "id" : "groupSetCookieHeaders",
-    "label" : "Group set-cookie headers to a list",
-    "description" : "Group incoming headers with same name into a List to support <a href=\"https://datatracker.ietf.org/doc/html/rfc6265\">multiple Set-Cookie headers</a>.",
-    "optional" : true,
-    "group" : "endpoint",
-    "binding" : {
-      "name" : "groupSetCookieHeaders",
-      "type" : "zeebe:input"
-    },
-    "type" : "Hidden"
   }, {
     "id" : "connectionTimeoutInSeconds",
     "label" : "Connection timeout in seconds",

connectors/http/rest/src/main/java/io/camunda/connector/http/rest/HttpJsonFunction.java

@@ -39,7 +39,6 @@
       "writeTimeoutInSeconds",
       "body",
       "storeResponse",
-      "groupSetCookieHeaders"
     },
     type = HttpJsonFunction.TYPE)
 @ElementTemplate(