1652 - Reorganize

Author: ivicac

server/libs/platform/platform-component/platform-component-api/src/main/java/com/bytechef/platform/component/definition/ContextFactory.java

@@ -30,8 +30,8 @@ public interface ContextFactory {
 
     ActionContext createActionContext(
         String componentName, int componentVersion, String actionName, @Nullable ModeType type,
-        @Nullable Long jobPrincipalId, @Nullable Long jobPrincipalWorkflowId, @Nullable String workflowId,
-        @Nullable Long jobId, @Nullable ComponentConnection connection, boolean editorEnvironment);
+        @Nullable Long jobPrincipalId, @Nullable Long jobPrincipalWorkflowId, @Nullable Long jobId,
+        @Nullable String workflowId, @Nullable ComponentConnection connection, boolean editorEnvironment);
 
     Context createContext(String componentName, @Nullable ComponentConnection connection);
 

server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/definition/ContextFactoryImpl.java

@@ -61,8 +61,8 @@ public ContextFactoryImpl(
     @Override
     public ActionContext createActionContext(
         String componentName, int componentVersion, String actionName, @Nullable ModeType type,
-        @Nullable Long jobPrincipalId, @Nullable Long jobPrincipalWorkflowId, @Nullable String workflowId,
-        @Nullable Long jobId, @Nullable ComponentConnection connection, boolean editorEnvironment) {
+        @Nullable Long jobPrincipalId, @Nullable Long jobPrincipalWorkflowId, @Nullable Long jobId,
+        @Nullable String workflowId, @Nullable ComponentConnection connection, boolean editorEnvironment) {
 
         return new ActionContextImpl(
             componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId, workflowId,

server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/facade/ActionDefinitionFacadeImpl.java

@@ -70,7 +70,7 @@ public List<Property> executeDynamicProperties(
         ComponentConnection componentConnection = getComponentConnection(connectionId);
 
         ActionContext actionContext = contextFactory.createActionContext(
-            componentName, componentVersion, actionName, null, null, null, workflowId, null, componentConnection, true);
+            componentName, componentVersion, actionName, null, null, null, null, workflowId, componentConnection, true);
 
         return tokenRefreshHelper.executeSingleConnectionFunction(
             componentName, componentVersion, componentConnection, actionContext,
@@ -149,8 +149,8 @@ public Object executePerform(
             ComponentConnection singleComponentConnection = executeFunctionData.getSingleComponentConnection();
 
             ActionContext actionContext = contextFactory.createActionContext(
-                componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId, workflowId,
-                jobId, singleComponentConnection, editorEnvironment);
+                componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId, jobId,
+                workflowId, singleComponentConnection, editorEnvironment);
 
             return tokenRefreshHelper.executeSingleConnectionFunction(
                 componentName, componentVersion, singleComponentConnection, actionContext,
@@ -160,11 +160,11 @@ public Object executePerform(
                     actionContext1),
                 componentConnection1 -> contextFactory.createActionContext(
                     componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId,
-                    workflowId, jobId, componentConnection1, editorEnvironment));
+                    jobId, workflowId, componentConnection1, editorEnvironment));
         } else {
             ActionContext actionContext = contextFactory.createActionContext(
-                componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId, workflowId,
-                jobId, null, editorEnvironment);
+                componentName, componentVersion, actionName, type, jobPrincipalId, jobPrincipalWorkflowId, jobId,
+                workflowId, null, editorEnvironment);
 
             return actionDefinitionService.executeMultipleConnectionsPerform(
                 componentName, componentVersion, actionName, inputParameters, executeFunctionData.componentConnections,
@@ -187,7 +187,7 @@ public Object executePerformForPolyglot(
             componentConnection1 -> contextFactory.createActionContext(
                 componentName, componentVersion, actionName, actionContextAware.getModeType(),
                 actionContextAware.getJobPrincipalId(), actionContextAware.getJobPrincipalWorkflowId(),
-                actionContextAware.getWorkflowId(), actionContextAware.getJobId(), componentConnection1,
+                actionContextAware.getJobId(), actionContextAware.getWorkflowId(), componentConnection1,
                 actionContextAware.isEditorEnvironment()));
     }
 

server/libs/platform/platform-component/platform-component-service/src/main/java/com/bytechef/platform/component/facade/ClusterElementDefinitionFacadeImpl.java

@@ -71,8 +71,7 @@ public Object executeTool(
 
         ActionContext context = contextFactory.createActionContext(
             componentName, componentVersion, clusterElementName, type, jobPrincipalId, jobPrincipalWorkflowId,
-            workflowId, jobId,
-            componentConnection, editorEnvironment);
+            jobId, workflowId, componentConnection, editorEnvironment);
 
         return tokenRefreshHelper.executeSingleConnectionFunction(
             componentName, componentVersion, componentConnection, context, ActionDefinitionErrorType.EXECUTE_PERFORM,
@@ -81,7 +80,7 @@ public Object executeTool(
                 actionContext1),
             componentConnection1 -> contextFactory.createActionContext(
                 componentName, componentVersion, clusterElementName, type, jobPrincipalId, jobPrincipalWorkflowId,
-                workflowId, jobId, componentConnection1, editorEnvironment));
+                jobId, workflowId, componentConnection1, editorEnvironment));
     }
 
     private ComponentConnection getComponentConnection(Long connectionId) {