Change DefaultExecutionContextSerializer to produce Base64

Related to spring-projects#3983

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,24 +19,29 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.util.Base64;
 import java.util.Map;
+import java.util.Objects;
 
 import org.springframework.batch.core.repository.ExecutionContextSerializer;
 import org.springframework.core.serializer.DefaultDeserializer;
 import org.springframework.core.serializer.DefaultSerializer;
 import org.springframework.core.serializer.Deserializer;
 import org.springframework.core.serializer.Serializer;
 import org.springframework.util.Assert;
+import org.springframework.util.Base64Utils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.SerializationUtils;
 
 /**
  * An implementation of the {@link ExecutionContextSerializer} using the default
  * serialization implementations from Spring ({@link DefaultSerializer} and
  * {@link DefaultDeserializer}).
  *
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  * @since 2.2
  */
-@SuppressWarnings("rawtypes")
 public class DefaultExecutionContextSerializer implements ExecutionContextSerializer {
 
 	private Serializer serializer = new DefaultSerializer();
@@ -51,7 +56,6 @@ public class DefaultExecutionContextSerializer implements ExecutionContextSerial
 	 * written.
 	 */
 	@Override
-	@SuppressWarnings("unchecked")
 	public void serialize(Map<String, Object> context, OutputStream out) throws IOException {
 		Assert.notNull(context, "context is required");
 		Assert.notNull(out, "OutputStream is required");
@@ -64,7 +68,9 @@ public void serialize(Map<String, Object> context, OutputStream out) throws IOEx
 								+ value.getClass().getName() + "] must be an instance of " + Serializable.class);
 			}
 		}
-		serializer.serialize(context, out);
+		byte[] serializedContext = SerializationUtils.serialize(context);
+		String base64EncodedContext = Base64Utils.encodeToString(serializedContext);
+		serializer.serialize(base64EncodedContext, out);
 	}
 
 	/**
@@ -73,10 +79,12 @@ public void serialize(Map<String, Object> context, OutputStream out) throws IOEx
 	 * deserialized.
 	 * @return the object serialized in the provided {@link InputStream}
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public Map<String, Object> deserialize(InputStream inputStream) throws IOException {
-		return (Map<String, Object>) deserializer.deserialize(inputStream);
+		String base64EncodedContext = (String) deserializer.deserialize(inputStream);
+		byte[] decodedContext = Base64Utils.decodeFromString(base64EncodedContext);
+		// FIXME use replacement of the following SerializationUtils.deserialize
+		return (Map<String, Object>) SerializationUtils.deserialize(decodedContext);
 	}
 
 }