diff --git a/api/pom.xml b/api/pom.xml index 60c46a3b..04c81201 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -27,6 +27,7 @@ src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/**, src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/**, src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/**, + src/main/java/org/springframework/**, src/test/java/ca/bc/gov/educ/api/batchgraduation/** @@ -41,6 +42,7 @@ src/main/java/ca/bc/gov/educ/api/batchgraduation/processor/**, src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/**, src/main/java/ca/bc/gov/educ/api/batchgraduation/writer/**, + src/main/java/org/springframework/**, src/test/java/ca/bc/gov/educ/api/batchgraduation/** 18 diff --git a/api/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java b/api/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java index c2c8dcde..f56412db 100644 --- a/api/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java +++ b/api/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java @@ -4,11 +4,11 @@ import org.springframework.batch.core.repository.ExecutionContextSerializer; import org.springframework.util.Assert; import org.springframework.util.Base64Utils; -import org.springframework.util.SerializationUtils; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.HashMap; import java.util.Map; public class DefaultExecutionContextSerializer implements ExecutionContextSerializer { @@ -31,6 +31,6 @@ public void serialize(Map context, OutputStream out) throws IOEx public Map deserialize(InputStream inputStream) throws IOException { String base64EncodedContext = new String(inputStream.readAllBytes()); byte[] decodedContext = Base64Utils.decodeFromString(base64EncodedContext); - return (Map)SerializationUtils.deserialize(decodedContext); + return (Map)jsonTransformer.unmarshall(decodedContext, HashMap.class); } }