- FixedIntervalRetryStrategy

-  Added SchedulerCustomizer

Author: sterlp

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.5.2 - (2025-01-13)
+
+-  FixedIntervalRetryStrategy
+-  Added SchedulerCustomizer
+
 ## v1.5.1 - (2025-01-12)
 
 -  filter trigger by status

RUN_AND_BUILD.md

@@ -1,7 +1,7 @@
 mvn versions:display-dependency-updates
-mvn versions:set -DnewVersion=1.5.1 -DgenerateBackupPoms=false
-git tag -a v1.5.1 -m "v1.5.1 release"
-mvn versions:set -DnewVersion=1.5.2-SNAPSHOT -DgenerateBackupPoms=false
+mvn versions:set -DnewVersion=1.5.2 -DgenerateBackupPoms=false
+git tag -a v1.5.2 -m "v1.5.2 release"
+mvn versions:set -DnewVersion=1.5.3-SNAPSHOT -DgenerateBackupPoms=false
 
 ## postgres
 

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/java/org/sterl/spring/persistent_tasks/api/RetryStrategy.java

@@ -111,4 +111,34 @@ public OffsetDateTime retryAt(int executionCount, Exception error) {
             return OffsetDateTime.now().plus(scalingFactor * executionCount, unit);
         }
     }
+    
+    /**
+     * A retry strategy that determines the next retry time by adding a fixed
+     * interval to the current time in the specified temporal unit.
+     * 
+     * <p>This strategy can be used to create retry intervals that remain constant
+     * regardless of the number of attempts, providing a uniform delay between retries.</p>
+     *
+     * <p>Example:
+     * If {@code interval = 5}, {@code unit = ChronoUnit.SECONDS}, each retry will
+     * be scheduled after 5 seconds from the current time.</p>
+     *
+     * <p>Note: The retry attempts will stop once the maximum execution count
+     * ({@code maxExecutionCount}) is reached.</p>
+     */
+    @RequiredArgsConstructor
+    class FixedIntervalRetryStrategy implements RetryStrategy {
+        private final int maxExecutionCount;
+        private final TemporalUnit unit;
+        private final int interval;
+
+        @Override
+        public boolean shouldRetry(int executionCount, Exception error) {
+            return maxExecutionCount > executionCount;
+        }
+        @Override
+        public OffsetDateTime retryAt(int executionCount, Exception error) {
+            return OffsetDateTime.now().plus(interval, unit);
+        }
+    }
 }

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/config/SchedulerConfig.java

@@ -2,6 +2,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
@@ -23,6 +24,22 @@
 @Slf4j
 public class SchedulerConfig {
 
+    public interface SchedulerCustomizer {
+        default String name() {
+            try {
+                final var ip = InetAddress.getLocalHost();
+                String name = ip.getHostName();
+                
+                if (name == null) {
+                    name = ip.toString();
+                }
+                return name;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
     @ConditionalSchedulerServiceByProperty
     @Primary
     @DependsOnDatabaseInitialization
@@ -31,15 +48,12 @@ SchedulerService schedulerService(
             TriggerService triggerService,
             @Value("${spring.persistent-tasks.max-threads:10}") int maxThreads,
             EditSchedulerStatusComponent editSchedulerStatus,
+            Optional<SchedulerCustomizer> customizer,
             TransactionTemplate trx) throws UnknownHostException {
+        
+        customizer = customizer.isEmpty() ? Optional.of(new SchedulerCustomizer() {}) : customizer;
 
-        final var ip = InetAddress.getLocalHost();
-        String name = ip.getHostName();
-
-        if (name == null) {
-            name = ip.toString();
-        }
-        return new SchedulerService(name, triggerService, 
+        return new SchedulerService(customizer.get().name(), triggerService, 
                 new TaskExecutorComponent(triggerService, maxThreads), 
                 editSchedulerStatus, trx);
     }

db/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/src/main/java/org/sterl/spring/example_app/ExampleApplication.java

@@ -22,6 +22,7 @@
 import org.sterl.spring.persistent_tasks.scheduler.SchedulerService;
 import org.sterl.spring.persistent_tasks.scheduler.component.EditSchedulerStatusComponent;
 import org.sterl.spring.persistent_tasks.scheduler.component.TaskExecutorComponent;
+import org.sterl.spring.persistent_tasks.scheduler.config.SchedulerConfig.SchedulerCustomizer;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
 import org.sterl.spring.persistent_tasks_ui.EnableSpringPersistentTasksUI;
 
@@ -36,6 +37,16 @@ public static void main(String[] args) {
         SpringApplication.run(ExampleApplication.class, args);
     }
 
+    @Bean
+    SchedulerCustomizer SchedulerCustomizer() {
+        return new SchedulerCustomizer() {
+            @Override
+            public String name() {
+                return "Test-Scheduler";
+            }
+        };
+    }
+    
     @Bean
     GroupedOpenApi exampleAppApi() {
       return GroupedOpenApi.builder()

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>org.sterl.spring</groupId>
     <artifactId>spring-persistent-tasks-root</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.5.2</version>
     <packaging>pom</packaging>
 
     <inceptionYear>2024</inceptionYear>

ui/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sterl.spring</groupId>
         <artifactId>spring-persistent-tasks-root</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>