Fix code smells

bcgov · Sep 1, 2023 · 38f64d4 · 38f64d4
1 parent 1fdae24
commit 38f64d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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/**
         </sonar.exclusions>
         <sonar.coverage.exclusions>
@@ -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/**
         </sonar.coverage.exclusions>
         <java.version>18</java.version>

diff --git a/...java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java b/...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<String, Object> context, OutputStream out) throws IOEx
     public Map<String, Object> 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);
     }
 }