From f953254b216d5a3349f27f55e6147c54915ec2bd Mon Sep 17 00:00:00 2001 From: Gustav Karlsson Date: Thu, 30 May 2024 16:56:19 +0200 Subject: [PATCH 1/2] fix: always set task_data via JdbcCustomization method --- .../github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java index 041ea349..8a618b75 100644 --- a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java +++ b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java @@ -218,7 +218,7 @@ public Instant replace(Execution toBeReplaced, SchedulableInstance newInstance) ps.setInt(index++, 0); // consecutive_failures jdbcCustomization.setInstant(ps, index++, newExecutionTime); // execution_time // may cause datbase-specific problems, might have to use setNull instead - ps.setObject(index++, serializer.serialize(newData)); // task_data + jdbcCustomization.setTaskData(ps, index++, serializer.serialize(newData)); //task_data ps.setString(index++, toBeReplaced.taskInstance.getTaskName()); // task_name ps.setString(index++, toBeReplaced.taskInstance.getId()); // task_instance ps.setLong(index++, toBeReplaced.version); // version @@ -485,7 +485,7 @@ private boolean rescheduleInternal( if (newData != null) { // may cause datbase-specific problems, might have to use setNull instead // FIXLATER: optionally support bypassing serializer if byte[] already - ps.setObject(index++, serializer.serialize(newData.data)); + jdbcCustomization.setTaskData(ps, index++, serializer.serialize(newData.data)); } ps.setString(index++, execution.taskInstance.getTaskName()); ps.setString(index++, execution.taskInstance.getId()); From 1e3b84a39ff00b1c9bb46efba64c40bde1a5cd4f Mon Sep 17 00:00:00 2001 From: Gustav Karlsson Date: Thu, 30 May 2024 17:04:05 +0200 Subject: [PATCH 2/2] spotless --- .../github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java index 8a618b75..e39d8476 100644 --- a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java +++ b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/jdbc/JdbcTaskRepository.java @@ -218,7 +218,8 @@ public Instant replace(Execution toBeReplaced, SchedulableInstance newInstance) ps.setInt(index++, 0); // consecutive_failures jdbcCustomization.setInstant(ps, index++, newExecutionTime); // execution_time // may cause datbase-specific problems, might have to use setNull instead - jdbcCustomization.setTaskData(ps, index++, serializer.serialize(newData)); //task_data + jdbcCustomization.setTaskData( + ps, index++, serializer.serialize(newData)); // task_data ps.setString(index++, toBeReplaced.taskInstance.getTaskName()); // task_name ps.setString(index++, toBeReplaced.taskInstance.getId()); // task_instance ps.setLong(index++, toBeReplaced.version); // version