Merge branch 'kagkarlsson:master' into master

kagkarlsson · Jan 19, 2025 · 5677343 · 5677343
2 parents 65cb952 + 5744bd5
commit 5677343
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ See also [why not Quartz?](#why-db-scheduler-when-there-is-quartz)
 <dependency>
     <groupId>com.github.kagkarlsson</groupId>
     <artifactId>db-scheduler</artifactId>
-    <version>15.1.0</version>
+    <version>15.1.1</version>
 </dependency>
 ```
 
@@ -417,7 +417,7 @@ For Spring Boot applications, there is a starter `db-scheduler-spring-boot-start
     <dependency>
         <groupId>com.github.kagkarlsson</groupId>
         <artifactId>db-scheduler-spring-boot-starter</artifactId>
-        <version>15.1.0</version>
+        <version>15.1.1</version>
     </dependency>
     ```
    **NOTE**: This includes the db-scheduler dependency itself.

diff --git a/db-scheduler/pom.xml b/db-scheduler/pom.xml
@@ -20,7 +20,7 @@
         <hikaricp.version>6.2.1</hikaricp.version>
         <hsqldb.version>2.7.4</hsqldb.version>
         <java8-matchers.version>1.6</java8-matchers.version>
-        <equals-verifier.version>3.17.5</equals-verifier.version>
+        <equals-verifier.version>3.18.1</equals-verifier.version>
         <bytebuddy.version>1.15.11</bytebuddy.version>
         <zonky-pg-embedded.version>2.1.0</zonky-pg-embedded.version>
         <slf4j.version>1.7.36</slf4j.version>

diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/task/AbstractTask.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/task/AbstractTask.java
@@ -50,12 +50,12 @@ public TaskInstance<T> instance(String id) {
 
   @Override
   public TaskInstance<T> instance(String id, T data) {
-    return instanceBuilder(id).priority(getDefaultPriority()).data(data).build();
+    return instanceBuilder(id).data(data).build();
   }
 
   @Override
   public TaskInstance.Builder<T> instanceBuilder(String id) {
-    return new Builder<>(this.name, id);
+    return new Builder<T>(this.name, id).priority(getDefaultPriority());
   }
 
   @Override

diff --git a/db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/task/AbstractTaskTest.java b/db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/task/AbstractTaskTest.java
@@ -0,0 +1,39 @@
+package com.github.kagkarlsson.scheduler.task;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.github.kagkarlsson.scheduler.task.helper.RecurringTask;
+import com.github.kagkarlsson.scheduler.task.helper.Tasks;
+import com.github.kagkarlsson.scheduler.task.schedule.Daily;
+import java.time.LocalTime;
+import org.junit.jupiter.api.Test;
+
+class AbstractTaskTest {
+
+  @Test
+  void test_default_priority_with_data() {
+    RecurringTask<String> task =
+        Tasks.recurring("task", new Daily(LocalTime.MIDNIGHT), String.class)
+            .executeStateful((taskInstance, executionContext) -> "");
+
+    assertEquals(task.getDefaultPriority(), task.instance("id", "data").getPriority());
+  }
+
+  @Test
+  void test_default_priority_without_data() {
+    RecurringTask<Void> task =
+        Tasks.recurring("task", new Daily(LocalTime.MIDNIGHT))
+            .execute((taskInstance, executionContext) -> {});
+
+    assertEquals(task.getDefaultPriority(), task.instance("id").getPriority());
+  }
+
+  @Test
+  void test_default_priority_with_instance_builder() {
+    RecurringTask<Void> task =
+        Tasks.recurring("task", new Daily(LocalTime.MIDNIGHT))
+            .execute((taskInstance, executionContext) -> {});
+
+    assertEquals(task.getDefaultPriority(), task.instanceBuilder("id").build().getPriority());
+  }
+}
diff --git a/examples/features/pom.xml b/examples/features/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>13.0</version>
+            <version>26.0.1</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -87,12 +87,12 @@
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <scope>runtime</scope>
-            <version>2.7.1</version>
+            <version>2.7.4</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.4.5</version>
+            <version>6.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
 		<gson.version>2.11.0</gson.version>
 		<jackson.version>2.18.2</jackson.version>
 		<postgresql.version>42.7.4</postgresql.version>
-		<guava.version>33.3.1-jre</guava.version>
+		<guava.version>33.4.0-jre</guava.version>
 	</properties>
 
 	<modules>
@@ -112,7 +112,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.8.1</version>
 					<executions>
 						<execution>
 							<goals>
@@ -212,7 +212,7 @@
 				<!-- Release plugins -->
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.11.2</version>
 					<executions>
 						<execution>
 							<id>attach-javadocs</id>