Restore backward-compatible default job key format

Signed-off-by: MJY <jmoon0227@gmail.com>

Author: answndud

spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobKeyGenerator.java

@@ -50,10 +50,15 @@ public String generateKey(JobParameters source) {
 		for (String key : keys) {
 			JobParameter<?> jobParameter = source.getParameter(key);
 			if (jobParameter != null && jobParameter.identifying()) {
-				stringBuffer.append(jobParameter);
+				stringBuffer.append(key).append("=").append(asLegacyParameterValue(jobParameter)).append(";");
 			}
 		}
 		return DigestUtils.md5DigestAsHex(stringBuffer.toString().getBytes(StandardCharsets.UTF_8));
 	}
 
+	private static String asLegacyParameterValue(JobParameter<?> jobParameter) {
+		return "{" + "value=" + jobParameter.value() + ", type=" + jobParameter.type() + ", identifying="
+				+ jobParameter.identifying() + '}';
+	}
+
 }

spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java

@@ -70,6 +70,15 @@ void testCreateJobKeyOrdering() {
 		assertEquals(key1, key2);
 	}
 
+	@Test
+	void testCreateJobKeyBackwardCompatibility() {
+		JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar")
+			.addString("bar", "foo")
+			.toJobParameters();
+		String key = jobKeyGenerator.generateKey(jobParameters);
+		assertEquals("0e2a48a17d785b4ec5f073a849a79c9d", key);
+	}
+
 	@Test
 	public void testCreateJobKeyForEmptyParameters() {
 		JobParameters jobParameters1 = new JobParameters();

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

@@ -34,6 +34,7 @@
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.jdbc.support.incrementer.H2SequenceMaxValueIncrementer;
 import org.springframework.test.jdbc.JdbcTestUtils;
+import org.springframework.util.DigestUtils;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -191,4 +192,22 @@ void testCreateDuplicateInstance() {
 		assertThrows(IllegalStateException.class, () -> jdbcJobInstanceDao.createJobInstance("job", jobParameters));
 	}
 
+	@Test
+	void testGetExistingLegacyJobInstance() {
+		JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar")
+			.addString("bar", "foo")
+			.toJobParameters();
+		String legacySerializedParameters = "bar={value=foo, type=class java.lang.String, identifying=true};"
+				+ "foo={value=bar, type=class java.lang.String, identifying=true};";
+		String legacyJobKey = DigestUtils.md5DigestAsHex(legacySerializedParameters.getBytes(StandardCharsets.UTF_8));
+
+		jdbcTemplate.update(
+				"INSERT INTO BATCH_JOB_INSTANCE(JOB_INSTANCE_ID, JOB_NAME, JOB_KEY, VERSION) VALUES (?, ?, ?, ?)", 3L,
+				"job", legacyJobKey, 0);
+
+		JobInstance jobInstance = jdbcJobInstanceDao.getJobInstance("job", jobParameters);
+		assertNotNull(jobInstance);
+		assertEquals(3L, jobInstance.getInstanceId());
+	}
+
 }