feat(rest): PR comments fixes

camunda · Jan 6, 2025 · 3edf511 · 3edf511
1 parent fbe8d10
commit 3edf511
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 43 deletions.
diff --git a/connector-sdk/document/src/main/java/io/camunda/document/store/DocumentCreationRequest.java b/connector-sdk/document/src/main/java/io/camunda/document/store/DocumentCreationRequest.java
@@ -21,7 +21,6 @@
 import java.io.InputStream;
 import java.time.Duration;
 import java.util.Map;
-import java.util.UUID;
 
 public record DocumentCreationRequest(
     InputStream content,
@@ -46,7 +45,7 @@ public static class BuilderFinalStep {
     private String documentId;
     private String storeId;
     private String contentType;
-    private String fileName = UUID.randomUUID().toString();
+    private String fileName;
     private Duration timeToLive;
     private Map<String, Object> customProperties;
 

diff --git a/...ors/http/http-base/src/main/java/io/camunda/connector/http/base/ExecutionEnvironment.java b/...ors/http/http-base/src/main/java/io/camunda/connector/http/base/ExecutionEnvironment.java
@@ -19,54 +19,44 @@
 import io.camunda.connector.api.outbound.OutboundConnectorContext;
 
 public sealed interface ExecutionEnvironment
-    permits ExecutionEnvironment.SaaSCallerSideEnvironment,
-        ExecutionEnvironment.SaaSCloudFunctionSideEnvironment,
-        ExecutionEnvironment.SelfManagedEnvironment {
-
-  /**
-   * Indicates whether the option to store the response as a document was selected in the Element
-   * Template.
-   */
-  boolean storeResponseSelected();
+    permits ExecutionEnvironment.SaaSCluster,
+        ExecutionEnvironment.SaaSCloudFunction,
+        ExecutionEnvironment.SelfManaged {
 
   /**
    * The connector is executed in the context of the cloud function. This is where the
    * HttpCommonRequest will be executed.
    */
-  record SaaSCloudFunctionSideEnvironment(boolean storeResponseSelected)
-      implements ExecutionEnvironment {}
+  record SaaSCloudFunction() implements ExecutionEnvironment {}
 
   /**
    * The connector is executed in the context of the caller, i.e. in the C8 Cluster. When executed
    * here, the initial HttpCommonRequest will be serialized as JSON and passed to the Cloud
    * Function.
    */
-  record SaaSCallerSideEnvironment(boolean storeResponseSelected, OutboundConnectorContext context)
+  record SaaSCluster(OutboundConnectorContext context)
       implements ExecutionEnvironment, StoresDocument {}
 
-  record SelfManagedEnvironment(boolean storeResponseSelected, OutboundConnectorContext context)
+  record SelfManaged(OutboundConnectorContext context)
       implements ExecutionEnvironment, StoresDocument {}
 
   /**
    * Factory method to create an ExecutionEnvironment based on the given parameters.
    *
    * @param cloudFunctionEnabled whether the connector is executed in the context of a cloud
    * @param isRunningInCloudFunction whether the connector is executed in the cloud function
-   * @param storeResponseSelected whether the response should be stored as a Document (this property
-   *     comes from the Element Template)
    */
   static ExecutionEnvironment from(
       boolean cloudFunctionEnabled,
       boolean isRunningInCloudFunction,
-      boolean storeResponseSelected,
       OutboundConnectorContext context) {
     if (cloudFunctionEnabled) {
-      return new SaaSCallerSideEnvironment(storeResponseSelected, context);
+      return new SaaSCluster(context);
     }
     if (isRunningInCloudFunction) {
-      return new SaaSCloudFunctionSideEnvironment(storeResponseSelected);
+      return new SaaSCloudFunction();
     }
-    return new SelfManagedEnvironment(storeResponseSelected, context);
+    return new SelfManaged(context);
   }
 
   interface StoresDocument {

diff --git a/connectors/http/http-base/src/main/java/io/camunda/connector/http/base/HttpService.java b/connectors/http/http-base/src/main/java/io/camunda/connector/http/base/HttpService.java
@@ -58,10 +58,9 @@ public HttpCommonResult executeConnectorRequest(
         ExecutionEnvironment.from(
             cloudFunctionService.isCloudFunctionEnabled(),
             cloudFunctionService.isRunningInCloudFunction(),
-            request.isStoreResponse(),
             context);
 
-    if (executionEnvironment instanceof ExecutionEnvironment.SaaSCallerSideEnvironment) {
+    if (executionEnvironment instanceof ExecutionEnvironment.SaaSCluster) {
       // Wrap the request in a proxy request
       request = cloudFunctionService.toCloudFunctionRequest(request);
     }
@@ -76,7 +75,7 @@ private HttpCommonResult executeRequest(
       return jsonResult;
     } catch (ConnectorException e) {
       LOGGER.debug("Failed to execute request {}", request, e);
-      if (executionEnvironment instanceof ExecutionEnvironment.SaaSCallerSideEnvironment) {
+      if (executionEnvironment instanceof ExecutionEnvironment.SaaSCluster) {
         throw cloudFunctionService.parseCloudFunctionError(e);
       }
       throw e;

diff --git a/...se/src/main/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClient.java b/...se/src/main/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClient.java
@@ -106,7 +106,10 @@ public HttpCommonResult execute(
               // (http.proxyHost, http.proxyPort, etc)
               .useSystemProperties()
               .build()
-              .execute(apacheRequest, new HttpCommonResultResponseHandler(executionEnvironment));
+              .execute(
+                  apacheRequest,
+                  new HttpCommonResultResponseHandler(
+                      executionEnvironment, request.isStoreResponse()));
       if (HttpStatusHelper.isError(result.status())) {
         throw ConnectorExceptionMapper.from(result);
       }

diff --git a/...in/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandler.java b/...in/java/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandler.java
@@ -49,9 +49,14 @@ public class HttpCommonResultResponseHandler
 
   private final ExecutionEnvironment executionEnvironment;
 
-  public HttpCommonResultResponseHandler(@Nullable ExecutionEnvironment executionEnvironment) {
+  private final boolean isStoreResponseSelected;
+
+  public HttpCommonResultResponseHandler(
+      @Nullable ExecutionEnvironment executionEnvironment, boolean isStoreResponseSelected) {
     this.executionEnvironment = executionEnvironment;
-    this.fileResponseHandler = new FileResponseHandler(executionEnvironment);
+    this.isStoreResponseSelected = isStoreResponseSelected;
+    this.fileResponseHandler =
+        new FileResponseHandler(executionEnvironment, isStoreResponseSelected);
   }
 
   @Override
@@ -65,7 +70,7 @@ public HttpCommonResult handleResponse(ClassicHttpResponse response) {
                 Collectors.toMap(Header::getName, Header::getValue, (first, second) -> first));
     if (response.getEntity() != null) {
       try (InputStream content = response.getEntity().getContent()) {
-        if (executionEnvironment instanceof ExecutionEnvironment.SaaSCallerSideEnvironment) {
+        if (executionEnvironment instanceof ExecutionEnvironment.SaaSCluster) {
           return getResultForCloudFunction(code, content, headers, reason);
         }
         var bytes = content.readAllBytes();
@@ -121,8 +126,8 @@ private HttpCommonResult getResultForCloudFunction(
    * @param content the response content
    */
   private Object extractBody(byte[] content) throws IOException {
-    if (executionEnvironment instanceof ExecutionEnvironment.SaaSCloudFunctionSideEnvironment
-        && executionEnvironment.storeResponseSelected()) {
+    if (executionEnvironment instanceof ExecutionEnvironment.SaaSCloudFunction
+        && isStoreResponseSelected) {
       return Base64.getEncoder().encodeToString(content);
     }
 

diff --git a/.../http-base/src/main/java/io/camunda/connector/http/base/document/FileResponseHandler.java b/.../http-base/src/main/java/io/camunda/connector/http/base/document/FileResponseHandler.java
@@ -33,9 +33,12 @@ public class FileResponseHandler {
   private static final Logger LOGGER = LoggerFactory.getLogger(FileResponseHandler.class);
   public static final String CONTENT_TYPE = "Content-Type";
   private final ExecutionEnvironment executionEnvironment;
+  private final boolean isStoreResponseSelected;
 
-  public FileResponseHandler(@Nullable ExecutionEnvironment executionEnvironment) {
+  public FileResponseHandler(
+      @Nullable ExecutionEnvironment executionEnvironment, boolean isStoreResponseSelected) {
     this.executionEnvironment = executionEnvironment;
+    this.isStoreResponseSelected = isStoreResponseSelected;
   }
 
   public Document handleCloudFunctionResult(HttpCommonResult result) {
@@ -78,6 +81,6 @@ private String getContentType(Map<String, String> headers) {
   }
 
   private boolean storeResponseSelected() {
-    return executionEnvironment != null && executionEnvironment.storeResponseSelected();
+    return executionEnvironment != null && isStoreResponseSelected;
   }
 }
diff --git a/...rc/test/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClientTest.java b/...rc/test/java/io/camunda/connector/http/base/client/apache/CustomApacheHttpClientTest.java
@@ -93,9 +93,7 @@ public void shouldStoreDocument_whenStoreResponseEnabled(WireMockRuntimeInfo wmR
       request.setUrl(wmRuntimeInfo.getHttpBaseUrl() + "/download");
       HttpCommonResult result =
           customApacheHttpClient.execute(
-              request,
-              new ExecutionEnvironment.SelfManagedEnvironment(
-                  request.isStoreResponse(), new DocumentOutboundContext()));
+              request, new ExecutionEnvironment.SelfManaged(new DocumentOutboundContext()));
       assertThat(result).isNotNull();
       assertThat(result.status()).isEqualTo(200);
       assertThat(result.headers().get(HttpHeaders.CONTENT_TYPE))

diff --git a/...ava/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandlerTest.java b/...ava/io/camunda/connector/http/base/client/apache/HttpCommonResultResponseHandlerTest.java
@@ -35,7 +35,7 @@ public class HttpCommonResultResponseHandlerTest {
   @Test
   public void shouldHandleJsonResponse_whenCloudFunctionDisabled() throws Exception {
     // given
-    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null);
+    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null, false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(200);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "application/json")};
     response.setHeaders(headers);
@@ -55,7 +55,7 @@ public void shouldHandleJsonResponse_whenCloudFunctionDisabled() throws Exceptio
   @Test
   public void shouldHandleTextResponse_whenCloudFunctionDisabled() throws Exception {
     // given
-    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null);
+    HttpCommonResultResponseHandler handler = new HttpCommonResultResponseHandler(null, false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(200);
     Header[] headers = new Header[] {new BasicHeader("Content-Type", "text/plain")};
     response.setHeaders(headers);
@@ -76,8 +76,7 @@ public void shouldHandleTextResponse_whenCloudFunctionDisabled() throws Exceptio
   public void shouldHandleJsonResponse_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCallerSideEnvironment(false, null));
+        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);
@@ -102,8 +101,7 @@ public void shouldHandleJsonResponse_whenCloudFunctionEnabled() throws Exception
   public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCallerSideEnvironment(false, null));
+        new HttpCommonResultResponseHandler(new ExecutionEnvironment.SaaSCluster(null), false);
     ClassicHttpResponse response = new BasicClassicHttpResponse(500);
     Header[] headers =
         new Header[] {
@@ -132,8 +130,7 @@ public void shouldHandleError_whenCloudFunctionEnabled() throws Exception {
   public void shouldHandleJsonAsTextResponse_whenCloudFunctionEnabled() throws Exception {
     // given
     HttpCommonResultResponseHandler handler =
-        new HttpCommonResultResponseHandler(
-            new ExecutionEnvironment.SaaSCallerSideEnvironment(false, null));
+        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);