1055 Reorganize

Author: ivicac

server/ee/apps/scheduler-app/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
     implementation(project(":server:ee:libs:config:observability-config"))
     implementation(project(":server:ee:libs:core:discovery:discovery-redis"))
     implementation(project(":server:ee:libs:platform:platform-component:platform-component-remote-client"))
+    implementation(project(":server:ee:libs:platform:platform-connection:platform-connection-remote-client"))
     implementation(project(":server:ee:libs:platform:platform-scheduler:platform-scheduler-impl"))
     implementation(project(":server:ee:libs:platform:platform-scheduler:platform-scheduler-remote-rest"))
     implementation(project(":server:ee:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-remote-client"))

server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/facade/RemoteConnectionDefinitionFacadeClient.java

@@ -78,7 +78,7 @@ public Optional<String> executeBaseUri(
     }
 
     @Override
-    public Context createConnectionRefreshContext(String componentName, ComponentConnection componentConnection) {
+    public ComponentConnection executeConnectionRefresh(ComponentConnection componentConnection) {
         throw new UnsupportedOperationException();
     }
 

server/ee/libs/platform/platform-component/platform-component-remote-client/src/main/java/com/bytechef/ee/platform/component/remote/client/service/RemoteConnectionDefinitionServiceClient.java

@@ -32,6 +32,11 @@ public void delete(Long id) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Long executeConnectionRefresh(Long connectionId) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public ConnectionDTO getConnection(Long id) {
         throw new UnsupportedOperationException();

server/ee/libs/platform/platform-component/platform-component-remote-rest/src/main/java/com/bytechef/ee/platform/component/remote/web/rest/facade/RemoteConnectionDefinitionFacadeController.java

@@ -5,9 +5,11 @@ dependencies {
     implementation("io.awspring.cloud:spring-cloud-aws-sqs")
     implementation(project(":server:libs:config:app-config"))
     implementation(project(":server:libs:core:commons:commons-util"))
+    implementation(project(":server:libs:core:tenant:tenant-api"))
     implementation(project(":server:libs:platform:platform-scheduler:platform-scheduler-api"))
     implementation(project(":server:libs:platform:platform-workflow:platform-workflow-coordinator:platform-workflow-coordinator-api"))
     implementation(project(":server:libs:platform:platform-api"))
+    implementation(project(":server:libs:platform:platform-connection:platform-connection-api"))
 
     implementation(project(":server:ee:libs:core:cloud:cloud-aws"))
     implementation(project(":server:ee:libs:core:message:message-broker:message-broker-aws"))

server/ee/libs/platform/platform-connection/platform-connection-remote-client/src/main/java/com/bytechef/ee/platform/connection/remote/client/fasade/RemoteConnectionFacadeClient.java

@@ -1,17 +1,8 @@
 /*
  * Copyright 2025 ByteChef
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
  */
 
 package com.bytechef.ee.platform.scheduler.aws;
@@ -22,13 +13,11 @@
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.scheduler.aws.constant.AwsTriggerSchedulerConstants;
 import com.bytechef.platform.scheduler.ConnectionRefreshScheduler;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Date;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.stringtemplate.v4.ST;
 import software.amazon.awssdk.services.scheduler.SchedulerClient;
 import software.amazon.awssdk.services.scheduler.model.ConflictException;
 import software.amazon.awssdk.services.scheduler.model.FlexibleTimeWindowMode;
@@ -43,17 +32,12 @@ public class AwsConnectionRefreshScheduler implements ConnectionRefreshScheduler
 
     private static final Logger log = LoggerFactory.getLogger(AwsConnectionRefreshScheduler.class);
 
-    private final int pollingTriggerCheckPeriod;
     private final SchedulerClient schedulerClient;
     private final String sqsArn;
     private final String roleArn;
 
-    @SuppressWarnings("E1")
-    public AwsConnectionRefreshScheduler(
-        ApplicationProperties.Cloud.Aws aws, ApplicationProperties.Coordinator.Trigger.Polling polling,
-        SchedulerClient schedulerClient) {
-
-        this.pollingTriggerCheckPeriod = polling.getCheckPeriod();
+    @SuppressFBWarnings("EI")
+    public AwsConnectionRefreshScheduler(ApplicationProperties.Cloud.Aws aws, SchedulerClient schedulerClient) {
         this.schedulerClient = schedulerClient;
 
         String accountId = aws.getAccountId();
@@ -80,18 +64,23 @@ public void scheduleConnectionRefresh(Long connectionId, Instant expiry, String
         String scheduleName = CONNECTION_REFRESH + tenantId + connectionId;
         String clientToken = tenantId + connectionId;
 
-        long secondsUntilExpiry = Duration.between(Instant.now(), expiry).getSeconds();
+        Instant now = Instant.now();
+
+        Duration between = Duration.between(now, expiry);
+
+        long secondsUntilExpiry = between.getSeconds();
+
         long minutesUntilExpiry = secondsUntilExpiry / 60;
 
         long refreshMinutes = Math.max(1, minutesUntilExpiry - 5);
 
         String scheduleExpression = "rate(" + refreshMinutes + " minutes)";
 
-        log.info("Scheduling connection refresh for connection: {}, tenant: {}", connectionId, tenantId);
-        log.info("Expiry time: {}, Refresh time: {}", expiry, refreshMinutes);
-        log.info("Schedule expression: {}", scheduleExpression);
-        log.info("SQS ARN: {}", sqsArn + ":" + SCHEDULER_CONNECTION_REFRESH_QUEUE);
-        log.info("Role ARN: {}", roleArn);
+        log.info(
+            "Scheduling connection refresh for connection: {}, tenant: {}, expiry time: {}, refresh time: {}, " +
+                "schedule expression: {}, SQS ARN: {}, role ARN: {}",
+            connectionId, tenantId, expiry, refreshMinutes, scheduleExpression,
+            sqsArn + ":" + SCHEDULER_CONNECTION_REFRESH_QUEUE, roleArn);
 
         Target sqsTarget = Target.builder()
             .roleArn(roleArn)
@@ -106,7 +95,7 @@ public void scheduleConnectionRefresh(Long connectionId, Instant expiry, String
                 .scheduleExpression(scheduleExpression)
                 .target(sqsTarget)
                 .flexibleTimeWindow(mode -> mode.mode(FlexibleTimeWindowMode.OFF))
-                .startDate(Instant.now().plus(Duration.ofMinutes(1))));
+                .startDate(now.plus(Duration.ofMinutes(1))));
 
             log.info("Schedule created successfully.");
         } catch (ConflictException e) {
@@ -118,7 +107,7 @@ public void scheduleConnectionRefresh(Long connectionId, Instant expiry, String
                 .scheduleExpression(scheduleExpression)
                 .target(sqsTarget)
                 .flexibleTimeWindow(mode -> mode.mode(FlexibleTimeWindowMode.OFF))
-                .startDate(Instant.now().plus(Duration.ofMinutes(1))));
+                .startDate(now.plus(Duration.ofMinutes(1))));
 
             log.info("Schedule updated successfully.");
         }

server/ee/libs/platform/platform-scheduler/platform-scheduler-aws/build.gradle.kts

@@ -19,8 +19,6 @@
 import com.bytechef.platform.scheduler.TriggerScheduler;
 import com.bytechef.platform.workflow.WorkflowExecutionId;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import java.time.Duration;
 import java.time.Instant;
 import java.util.Map;
 import org.slf4j.Logger;

server/ee/libs/platform/platform-scheduler/platform-scheduler-aws/src/main/java/com/bytechef/ee/platform/scheduler/aws/AwsConnectionRefreshScheduler.java

@@ -16,15 +16,11 @@
 
 package com.bytechef.ee.platform.scheduler.aws.config;
 
-import com.bytechef.atlas.configuration.service.WorkflowService;
 import com.bytechef.config.ApplicationProperties;
 import com.bytechef.ee.platform.scheduler.aws.AwsConnectionRefreshScheduler;
 import com.bytechef.ee.platform.scheduler.aws.listener.ConnectionRefreshListener;
 import com.bytechef.platform.annotation.ConditionalOnEEVersion;
-import com.bytechef.platform.component.facade.ConnectionDefinitionFacade;
-import com.bytechef.platform.component.facade.TriggerDefinitionFacade;
-import com.bytechef.platform.workflow.execution.accessor.JobPrincipalAccessorRegistry;
-import com.bytechef.platform.workflow.execution.service.TriggerStateService;
+import com.bytechef.platform.connection.facade.ConnectionFacade;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -61,29 +57,17 @@ AwsConnectionRefreshScheduler awsConnectionRefreshScheduler(
 
         ApplicationProperties.Cloud.Aws aws = applicationProperties.getCloud()
             .getAws();
-        ApplicationProperties.Coordinator.Trigger.Polling polling = applicationProperties
-            .getCoordinator()
-            .getTrigger()
-            .getPolling();
 
         SchedulerClient schedulerClient = SchedulerClient.builder()
             .credentialsProvider(awsCredentialsProvider)
             .region(awsRegionProvider.getRegion())
             .build();
 
-        return new AwsConnectionRefreshScheduler(aws, polling, schedulerClient);
+        return new AwsConnectionRefreshScheduler(aws, schedulerClient);
     }
 
     @Bean
-    ConnectionRefreshListener connectionRefreshListener(
-        AwsCredentialsProvider awsCredentialsProvider, AwsRegionProvider awsRegionProvider,
-        ConnectionDefinitionFacade remoteConnectionDefinitionFacade) {
-
-        SchedulerClient schedulerClient = SchedulerClient.builder()
-            .credentialsProvider(awsCredentialsProvider)
-            .region(awsRegionProvider.getRegion())
-            .build();
-
-        return new ConnectionRefreshListener(schedulerClient, remoteConnectionDefinitionFacade);
+    ConnectionRefreshListener connectionRefreshListener(ConnectionFacade connectionFacade) {
+        return new ConnectionRefreshListener(connectionFacade);
     }
 }

server/ee/libs/platform/platform-scheduler/platform-scheduler-aws/src/main/java/com/bytechef/ee/platform/scheduler/aws/AwsTriggerScheduler.java

@@ -1,42 +1,32 @@
-package com.bytechef.ee.platform.scheduler.aws.listener;
-
-import com.bytechef.atlas.configuration.service.WorkflowService;
-import com.bytechef.platform.component.ComponentConnection;
-import com.bytechef.platform.component.facade.ConnectionDefinitionFacade;
-import com.bytechef.platform.workflow.execution.accessor.JobPrincipalAccessorRegistry;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import io.awspring.cloud.sqs.annotation.SqsListener;
-import org.slf4j.Logger;
-import org.springframework.stereotype.Component;
-import software.amazon.awssdk.services.scheduler.SchedulerClient;
-import software.amazon.awssdk.services.scheduler.model.FlexibleTimeWindow;
-import software.amazon.awssdk.services.scheduler.model.FlexibleTimeWindowMode;
-import software.amazon.awssdk.services.scheduler.model.UpdateScheduleRequest;
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the ByteChef Enterprise license (the "Enterprise License");
+ * you may not use this file except in compliance with the Enterprise License.
+ */
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Map;
+package com.bytechef.ee.platform.scheduler.aws.listener;
 
-import static com.bytechef.ee.platform.scheduler.aws.constant.AwsConnectionRefreshSchedulerConstants.CONNECTION_REFRESH;
 import static com.bytechef.ee.platform.scheduler.aws.constant.AwsConnectionRefreshSchedulerConstants.SCHEDULER_CONNECTION_REFRESH_QUEUE;
 import static com.bytechef.ee.platform.scheduler.aws.constant.AwsTriggerSchedulerConstants.SPLITTER;
 
+import com.bytechef.platform.connection.facade.ConnectionFacade;
+import com.bytechef.tenant.TenantContext;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.awspring.cloud.sqs.annotation.SqsListener;
+
 /**
  * @version ee
  *
  * @author Nikolina Spehar
  */
 public class ConnectionRefreshListener {
 
-    private final ConnectionDefinitionFacade remoteConnectionDefinitionFacade;
-    private final SchedulerClient schedulerClient;
+    private final ConnectionFacade connectionFacade;
 
     @SuppressFBWarnings("EI")
-    public ConnectionRefreshListener(
-        SchedulerClient schedulerClient, ConnectionDefinitionFacade remoteConnectionDefinitionFacade) {
-
-        this.schedulerClient = schedulerClient;
-        this.remoteConnectionDefinitionFacade = remoteConnectionDefinitionFacade;
+    public ConnectionRefreshListener(ConnectionFacade connectionFacade) {
+        this.connectionFacade = connectionFacade;
     }
 
     @SqsListener(SCHEDULER_CONNECTION_REFRESH_QUEUE)
@@ -45,24 +35,6 @@ public void onSchedule(String message) {
         String tenantId = split[0];
         Long connectionId = Long.valueOf(split[1]);
 
-        refreshConnection(tenantId, connectionId);
-    }
-
-    private Instant refreshConnection(String tenantId, Long connectionId) {
-        Instant connectionExpiry = null;
-
-        ComponentConnection componentConnection = remoteConnectionDefinitionFacade.executeConnectionRefresh(
-            tenantId, connectionId);
-
-        if (componentConnection != null) {
-            Map<String, ?> parameters = componentConnection.getParameters();
-
-            Long expiresIn = (Long) parameters.get("expires_in");
-
-            connectionExpiry = Instant.now()
-                .plusSeconds(expiresIn);
-        }
-
-        return connectionExpiry;
+        TenantContext.runWithTenantId(tenantId, () -> connectionFacade.executeConnectionRefresh(connectionId));
     }
 }