ss

transferwise · Aug 8, 2024 · 668f1de · 668f1de
1 parent 87e2086
commit 668f1de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/ITaskDaoDataSerializer.java b/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/ITaskDaoDataSerializer.java
@@ -14,8 +14,6 @@ public interface ITaskDaoDataSerializer {
 
   byte[] deserialize(SerializedData serializedData);
 
-  TaskContext deserializeTaskContext(SerializedData serializedData);
-
   @Data
   @Accessors(chain = true)
   class SerializedData {

diff --git a/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/JdbcTaskDao.java b/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/JdbcTaskDao.java
@@ -731,8 +731,15 @@ protected void assertIsolationLevel(Isolation isolation) {
   }
 
   protected TaskContext getContext(ResultSet rs, int dataFormatIdx, int contextIdx) throws SQLException {
-    byte[] context = rs.getBytes(contextIdx);
-    return taskDataSerializer.deserializeTaskContext(new SerializedData().setDataFormat(rs.getInt(dataFormatIdx)).setData(context));
+    return ExceptionUtils.doUnchecked(() ->
+        objectMapper.readValue(
+            taskDataSerializer.deserialize(new SerializedData()
+                .setDataFormat(rs.getInt(dataFormatIdx))
+                .setData(rs.getBytes(contextIdx))
+            ),
+            TaskContext.class
+        )
+    );
   }
 
   protected byte[] getData(ResultSet rs, int deprecatedDataIdx, int dataFormatIdx, int dataIdx) throws SQLException {

diff --git a/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/TaskDaoDataSerializer.java b/tw-tasks-core/src/main/java/com/transferwise/tasks/dao/TaskDaoDataSerializer.java
@@ -165,18 +165,5 @@ public byte[] deserialize(SerializedData serializedData) {
       return serializedData.getData();
     });
   }
-
-  @Override
-  public TaskContext deserializeTaskContext(SerializedData serializedData) {
-    byte[] deserializedData = deserialize(serializedData);
-    if (deserializedData == null) {
-      return null;
-    }
-    try {
-      return objectMapper.readValue(deserializedData, TaskContext.class);
-    } catch (Exception e) {
-      log.error("Error deserializing task context. Will fallback to empty context.");
-      return new TaskContext();
-    }
-  }
+
 }