Fix serializing JobParameter with Jackson 2

Closes GH-5191

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

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

@@ -106,6 +106,7 @@
  *
  * @author Marten Deinum
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  * @since 3.0.7
  * @see ExecutionContextSerializer
  * @deprecated Since 6.0 in favor of {@link JacksonExecutionContextStringSerializer}.
@@ -210,12 +211,16 @@ public void serializeWithType(JobParameter value, JsonGenerator gen, SerializerP
 			@Override
 			public void serialize(JobParameter jobParameter, JsonGenerator jsonGenerator,
 					SerializerProvider serializerProvider) throws IOException {
+				jsonGenerator.writeStartObject();
+				jsonGenerator.writeFieldName(NAME_KEY_NAME);
+				jsonGenerator.writeObject(jobParameter.name());
 				jsonGenerator.writeFieldName(VALUE_KEY_NAME);
 				jsonGenerator.writeObject(jobParameter.value());
 				jsonGenerator.writeFieldName(TYPE_KEY_NAME);
 				jsonGenerator.writeString(jobParameter.type().getName());
 				jsonGenerator.writeFieldName(IDENTIFYING_KEY_NAME);
-				jsonGenerator.writeObject(jobParameter.identifying());
+				jsonGenerator.writeBoolean(jobParameter.identifying());
+				jsonGenerator.writeEndObject();
 			}
 
 		}

spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializerTests.java

@@ -31,10 +31,14 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.batch.core.repository.ExecutionContextSerializer;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -43,7 +47,9 @@
  * @author Marten Deinum
  * @author Michael Minella
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  */
+@SuppressWarnings("removal")
 class Jackson2ExecutionContextStringSerializerTests extends AbstractExecutionContextSerializerTests {
 
 	private final ExecutionContextSerializer serializer = new Jackson2ExecutionContextStringSerializer(
@@ -174,6 +180,7 @@ public static class UnmappedDomesticNumber extends UnmappedPhoneNumber {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void arrayAsListSerializationTest() throws IOException {
 		// given
 		List<String> list = Arrays.asList("foo", "bar");
@@ -232,4 +239,34 @@ void testJavaTimeLocalDateSerialization() throws IOException {
 		assertEquals(now, deserializedNow);
 	}
 
+	@Test
+	void testJobParametersSerialization() throws IOException {
+		// given
+		Jackson2ExecutionContextStringSerializer serializer = new Jackson2ExecutionContextStringSerializer();
+		LocalDate now = LocalDate.now();
+		JobParameters jobParameters = new JobParametersBuilder()
+			.addJobParameter("date", LocalDate.now(), LocalDate.class)
+			.addJobParameter("foo", "bar", String.class, false)
+			.toJobParameters();
+		Map<String, Object> map = new HashMap<>();
+		map.put("jobParameters", jobParameters);
+
+		// when
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		serializer.serialize(map, outputStream);
+		InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
+		Map<String, Object> deserializedContext = serializer.deserialize(inputStream);
+
+		// then
+		JobParameters deserializedJobParameters = (JobParameters) deserializedContext.get("jobParameters");
+		JobParameter<?> dateJobParameter = deserializedJobParameters.getParameter("date");
+		assertNotNull(dateJobParameter);
+		assertEquals(now, dateJobParameter.value());
+		assertTrue(dateJobParameter.identifying());
+		JobParameter<?> fooJobParameter = deserializedJobParameters.getParameter("foo");
+		assertNotNull(fooJobParameter);
+		assertEquals("bar", fooJobParameter.value());
+		assertFalse(fooJobParameter.identifying());
+	}
+
 }