2629 SF

Author: ivicac

server/libs/platform/platform-webhook/platform-webhook-impl/src/main/java/com/bytechef/platform/webhook/executor/WebhookWorkflowSyncExecutor.java

@@ -20,7 +20,6 @@
 import com.bytechef.atlas.configuration.service.WorkflowService;
 import com.bytechef.commons.util.CollectionUtils;
 import com.bytechef.commons.util.MapUtils;
-import com.bytechef.commons.util.OptionalUtils;
 import com.bytechef.component.definition.TriggerDefinition.WebhookValidateResponse;
 import com.bytechef.evaluator.Evaluator;
 import com.bytechef.platform.component.constant.MetadataConstants;
@@ -41,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import org.apache.commons.lang3.Validate;
 import org.springframework.stereotype.Component;
 
@@ -89,13 +89,15 @@ public TriggerOutput execute(WorkflowExecutionId workflowExecutionId, WebhookReq
         triggerExecution = triggerExecutionService.create(
             triggerExecution.evaluate(getInputMap(workflowExecutionId), evaluator));
 
-        triggerExecution.setState(OptionalUtils.orElse(triggerStateService.fetchValue(workflowExecutionId), null));
+        Optional<Object> valueOptional = triggerStateService.fetchValue(workflowExecutionId);
+
+        triggerExecution.setState(valueOptional.orElse(null));
 
         triggerExecution = preProcess(triggerExecution);
 
         WorkflowNodeType workflowNodeType = getComponentOperation(workflowExecutionId, workflowId);
 
-        Map<String, Long> connectIdMap = MapUtils.getMap(
+        Map<String, Long> connectionIdMap = MapUtils.getMap(
             triggerExecution.getMetadata(), MetadataConstants.CONNECTION_IDS, Long.class, Map.of());
 
         TriggerOutput triggerOutput = triggerDefinitionFacade.executeTrigger(
@@ -104,7 +106,7 @@ public TriggerOutput execute(WorkflowExecutionId workflowExecutionId, WebhookReq
             workflowExecutionId.getJobPrincipalId(), workflowExecutionId.getWorkflowUuid(),
             triggerExecution.getParameters(), triggerExecution.getState(),
             MapUtils.get(triggerExecution.getMetadata(), WebhookRequest.WEBHOOK_REQUEST, WebhookRequest.class),
-            OptionalUtils.orElse(CollectionUtils.findFirst(connectIdMap.values()), null), false);
+            CollectionUtils.findFirstOrElse(connectionIdMap.values(), null), false);
 
         triggerExecution.setBatch(triggerOutput.batch());
         triggerExecution.setOutput(
@@ -128,26 +130,27 @@ public WebhookValidateResponse validate(WorkflowExecutionId workflowExecutionId,
         TriggerExecution triggerExecution = result.triggerExecution();
         WorkflowNodeType workflowNodeType = result.workflowNodeType();
 
-        Map<String, Long> connectIdMap = result.connectIdMap();
+        Map<String, Long> connectionIdMap = result.connectionIdMap();
+
         return triggerDefinitionFacade.executeWebhookValidate(
-            workflowNodeType.name(), workflowNodeType.version(),
-            workflowNodeType.operation(), triggerExecution.getParameters(),
-            webhookRequest, OptionalUtils.orElse(CollectionUtils.findFirst(connectIdMap.values()), null));
+            workflowNodeType.name(), workflowNodeType.version(), workflowNodeType.operation(),
+            triggerExecution.getParameters(), webhookRequest,
+            CollectionUtils.findFirstOrElse(connectionIdMap.values(), null));
     }
 
     public WebhookValidateResponse validateOnEnable(
         WorkflowExecutionId workflowExecutionId, WebhookRequest webhookRequest) {
 
         PreProcessResult result = preProcess(workflowExecutionId, webhookRequest);
 
-        Map<String, Long> connectIdMap = result.connectIdMap();
+        Map<String, Long> connectIdMap = result.connectionIdMap();
         TriggerExecution triggerExecution = result.triggerExecution();
         WorkflowNodeType workflowNodeType = result.workflowNodeType();
 
         return triggerDefinitionFacade.executeWebhookValidateOnEnable(
-            workflowNodeType.name(), workflowNodeType.version(),
-            workflowNodeType.operation(), triggerExecution.getParameters(),
-            webhookRequest, OptionalUtils.orElse(CollectionUtils.findFirst(connectIdMap.values()), null));
+            workflowNodeType.name(), workflowNodeType.version(), workflowNodeType.operation(),
+            triggerExecution.getParameters(), webhookRequest,
+            CollectionUtils.findFirstOrElse(connectIdMap.values(), null));
     }
 
     private WorkflowNodeType getComponentOperation(WorkflowExecutionId workflowExecutionId, String workflowId) {
@@ -179,10 +182,10 @@ private PreProcessResult preProcess(WorkflowExecutionId workflowExecutionId, Web
 
         WorkflowNodeType workflowNodeType = getComponentOperation(workflowExecutionId, workflowId);
 
-        Map<String, Long> connectIdMap = MapUtils.getMap(
+        Map<String, Long> connectionIdMap = MapUtils.getMap(
             triggerExecution.getMetadata(), MetadataConstants.CONNECTION_IDS, Long.class, Map.of());
 
-        return new PreProcessResult(triggerExecution, workflowNodeType, connectIdMap);
+        return new PreProcessResult(triggerExecution, workflowNodeType, connectionIdMap);
     }
 
     private String getWorkflowId(WorkflowExecutionId workflowExecutionId) {
@@ -220,6 +223,6 @@ private TriggerExecution preProcess(TriggerExecution triggerExecution) {
     }
 
     private record PreProcessResult(
-        TriggerExecution triggerExecution, WorkflowNodeType workflowNodeType, Map<String, Long> connectIdMap) {
+        TriggerExecution triggerExecution, WorkflowNodeType workflowNodeType, Map<String, Long> connectionIdMap) {
     }
 }