diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
index 481e3de370..a43619e919 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoStepExecutionDao.java
@@ -36,6 +36,7 @@
 
 /**
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  * @since 5.2.0
  */
 public class MongoStepExecutionDao implements StepExecutionDao {
@@ -130,7 +131,8 @@ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepNa
 			.filter(stepExecution -> stepExecution.getName().equals(stepName))
 			.max(Comparator
 				.comparing(org.springframework.batch.core.repository.persistence.StepExecution::getCreateTime)
-				.thenComparing(org.springframework.batch.core.repository.persistence.StepExecution::getId));
+				.thenComparing(
+						org.springframework.batch.core.repository.persistence.StepExecution::getStepExecutionId));
 		if (lastStepExecution.isPresent()) {
 			org.springframework.batch.core.repository.persistence.StepExecution stepExecution = lastStepExecution.get();
 			JobExecution jobExecution = this.jobExecutionConverter.toJobExecution(jobExecutions.stream()
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobExecution.java
index 7304155781..3c139fe368 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobExecution.java
@@ -25,12 +25,11 @@
 
 /**
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  * @since 5.2.0
  */
 public class JobExecution {
 
-	private String id;
-
 	private long jobExecutionId;
 
 	private long jobInstanceId;
@@ -53,13 +52,6 @@ public class JobExecution {
 
 	private ExecutionContext executionContext;
 
-	public JobExecution() {
-	}
-
-	public String getId() {
-		return id;
-	}
-
 	public long getJobInstanceId() {
 		return jobInstanceId;
 	}
@@ -150,11 +142,10 @@ public void setExecutionContext(ExecutionContext executionContext) {
 
 	@Override
 	public String toString() {
-		return "JobExecution{" + "id='" + id + '\'' + ", jobExecutionId=" + jobExecutionId + ", jobInstanceId="
-				+ jobInstanceId + ", jobParameters=" + jobParameters + ", stepExecutions=" + stepExecutions
-				+ ", status=" + status + ", startTime=" + startTime + ", createTime=" + createTime + ", endTime="
-				+ endTime + ", lastUpdated=" + lastUpdated + ", exitStatus=" + exitStatus + ", executionContext="
-				+ executionContext + '}';
+		return "JobExecution{jobExecutionId=" + jobExecutionId + ", jobInstanceId=" + jobInstanceId + ", jobParameters="
+				+ jobParameters + ", stepExecutions=" + stepExecutions + ", status=" + status + ", startTime="
+				+ startTime + ", createTime=" + createTime + ", endTime=" + endTime + ", lastUpdated=" + lastUpdated
+				+ ", exitStatus=" + exitStatus + ", executionContext=" + executionContext + '}';
 	}
 
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobInstance.java
index 6462a728b5..812951a536 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobInstance.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobInstance.java
@@ -17,25 +17,17 @@
 
 /**
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  * @since 5.2.0
  */
 public class JobInstance {
 
-	private String id;
-
 	private long jobInstanceId;
 
 	private String jobName;
 
 	private String jobKey;
 
-	public JobInstance() {
-	}
-
-	public String getId() {
-		return id;
-	}
-
 	public long getJobInstanceId() {
 		return jobInstanceId;
 	}
@@ -62,8 +54,8 @@ public void setJobKey(String jobKey) {
 
 	@Override
 	public String toString() {
-		return "JobInstance{" + "id='" + id + '\'' + ", jobInstanceId=" + jobInstanceId + ", jobName='" + jobName + '\''
-				+ ", jobKey='" + jobKey + '\'' + '}';
+		return "JobInstance{jobInstanceId=" + jobInstanceId + ", jobName='" + jobName + '\'' + ", jobKey='" + jobKey
+				+ '\'' + '}';
 	}
 
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/StepExecution.java
index 87bb0b0c44..10425108b5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/StepExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/StepExecution.java
@@ -21,12 +21,11 @@
 
 /**
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  * @since 5.2.0
  */
 public class StepExecution {
 
-	private String id;
-
 	private long stepExecutionId;
 
 	private long jobExecutionId;
@@ -65,13 +64,6 @@ public class StepExecution {
 
 	private boolean terminateOnly;
 
-	public StepExecution() {
-	}
-
-	public String getId() {
-		return id;
-	}
-
 	public long getStepExecutionId() {
 		return stepExecutionId;
 	}
@@ -226,13 +218,13 @@ public void setTerminateOnly(boolean terminateOnly) {
 
 	@Override
 	public String toString() {
-		return "StepExecution{" + "id='" + id + '\'' + ", stepExecutionId=" + stepExecutionId + ", jobExecutionId='"
-				+ jobExecutionId + '\'' + ", name='" + name + '\'' + ", status=" + status + ", readCount=" + readCount
-				+ ", writeCount=" + writeCount + ", commitCount=" + commitCount + ", rollbackCount=" + rollbackCount
-				+ ", readSkipCount=" + readSkipCount + ", processSkipCount=" + processSkipCount + ", writeSkipCount="
-				+ writeSkipCount + ", filterCount=" + filterCount + ", startTime=" + startTime + ", createTime="
-				+ createTime + ", endTime=" + endTime + ", lastUpdated=" + lastUpdated + ", executionContext="
-				+ executionContext + ", exitStatus=" + exitStatus + ", terminateOnly=" + terminateOnly + '}';
+		return "StepExecution{stepExecutionId=" + stepExecutionId + ", jobExecutionId='" + jobExecutionId + '\''
+				+ ", name='" + name + '\'' + ", status=" + status + ", readCount=" + readCount + ", writeCount="
+				+ writeCount + ", commitCount=" + commitCount + ", rollbackCount=" + rollbackCount + ", readSkipCount="
+				+ readSkipCount + ", processSkipCount=" + processSkipCount + ", writeSkipCount=" + writeSkipCount
+				+ ", filterCount=" + filterCount + ", startTime=" + startTime + ", createTime=" + createTime
+				+ ", endTime=" + endTime + ", lastUpdated=" + lastUpdated + ", executionContext=" + executionContext
+				+ ", exitStatus=" + exitStatus + ", terminateOnly=" + terminateOnly + '}';
 	}
 
 }