Skip to content

Commit 175fa1f

Browse files
quafffmbenhassine
authored andcommitted
Remove unused id from persistence domain object
`getId()` always return null. Remove unnecessary public constructor Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1 parent 9d9fd36 commit 175fa1f

File tree

4 files changed

+19
-42
lines changed

4 files changed

+19
-42
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
/**
3838
* @author Mahmoud Ben Hassine
39+
* @author Yanming Zhou
3940
* @since 5.2.0
4041
*/
4142
public class MongoStepExecutionDao implements StepExecutionDao {
@@ -130,7 +131,8 @@ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepNa
130131
.filter(stepExecution -> stepExecution.getName().equals(stepName))
131132
.max(Comparator
132133
.comparing(org.springframework.batch.core.repository.persistence.StepExecution::getCreateTime)
133-
.thenComparing(org.springframework.batch.core.repository.persistence.StepExecution::getId));
134+
.thenComparing(
135+
org.springframework.batch.core.repository.persistence.StepExecution::getStepExecutionId));
134136
if (lastStepExecution.isPresent()) {
135137
org.springframework.batch.core.repository.persistence.StepExecution stepExecution = lastStepExecution.get();
136138
JobExecution jobExecution = this.jobExecutionConverter.toJobExecution(jobExecutions.stream()

spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobExecution.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525

2626
/**
2727
* @author Mahmoud Ben Hassine
28+
* @author Yanming Zhou
2829
* @since 5.2.0
2930
*/
3031
public class JobExecution {
3132

32-
private String id;
33-
3433
private long jobExecutionId;
3534

3635
private long jobInstanceId;
@@ -53,13 +52,6 @@ public class JobExecution {
5352

5453
private ExecutionContext executionContext;
5554

56-
public JobExecution() {
57-
}
58-
59-
public String getId() {
60-
return id;
61-
}
62-
6355
public long getJobInstanceId() {
6456
return jobInstanceId;
6557
}
@@ -150,11 +142,10 @@ public void setExecutionContext(ExecutionContext executionContext) {
150142

151143
@Override
152144
public String toString() {
153-
return "JobExecution{" + "id='" + id + '\'' + ", jobExecutionId=" + jobExecutionId + ", jobInstanceId="
154-
+ jobInstanceId + ", jobParameters=" + jobParameters + ", stepExecutions=" + stepExecutions
155-
+ ", status=" + status + ", startTime=" + startTime + ", createTime=" + createTime + ", endTime="
156-
+ endTime + ", lastUpdated=" + lastUpdated + ", exitStatus=" + exitStatus + ", executionContext="
157-
+ executionContext + '}';
145+
return "JobExecution{jobExecutionId=" + jobExecutionId + ", jobInstanceId=" + jobInstanceId + ", jobParameters="
146+
+ jobParameters + ", stepExecutions=" + stepExecutions + ", status=" + status + ", startTime="
147+
+ startTime + ", createTime=" + createTime + ", endTime=" + endTime + ", lastUpdated=" + lastUpdated
148+
+ ", exitStatus=" + exitStatus + ", executionContext=" + executionContext + '}';
158149
}
159150

160151
}

spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/JobInstance.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,17 @@
1717

1818
/**
1919
* @author Mahmoud Ben Hassine
20+
* @author Yanming Zhou
2021
* @since 5.2.0
2122
*/
2223
public class JobInstance {
2324

24-
private String id;
25-
2625
private long jobInstanceId;
2726

2827
private String jobName;
2928

3029
private String jobKey;
3130

32-
public JobInstance() {
33-
}
34-
35-
public String getId() {
36-
return id;
37-
}
38-
3931
public long getJobInstanceId() {
4032
return jobInstanceId;
4133
}
@@ -62,8 +54,8 @@ public void setJobKey(String jobKey) {
6254

6355
@Override
6456
public String toString() {
65-
return "JobInstance{" + "id='" + id + '\'' + ", jobInstanceId=" + jobInstanceId + ", jobName='" + jobName + '\''
66-
+ ", jobKey='" + jobKey + '\'' + '}';
57+
return "JobInstance{jobInstanceId=" + jobInstanceId + ", jobName='" + jobName + '\'' + ", jobKey='" + jobKey
58+
+ '\'' + '}';
6759
}
6860

6961
}

spring-batch-core/src/main/java/org/springframework/batch/core/repository/persistence/StepExecution.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121

2222
/**
2323
* @author Mahmoud Ben Hassine
24+
* @author Yanming Zhou
2425
* @since 5.2.0
2526
*/
2627
public class StepExecution {
2728

28-
private String id;
29-
3029
private long stepExecutionId;
3130

3231
private long jobExecutionId;
@@ -65,13 +64,6 @@ public class StepExecution {
6564

6665
private boolean terminateOnly;
6766

68-
public StepExecution() {
69-
}
70-
71-
public String getId() {
72-
return id;
73-
}
74-
7567
public long getStepExecutionId() {
7668
return stepExecutionId;
7769
}
@@ -226,13 +218,13 @@ public void setTerminateOnly(boolean terminateOnly) {
226218

227219
@Override
228220
public String toString() {
229-
return "StepExecution{" + "id='" + id + '\'' + ", stepExecutionId=" + stepExecutionId + ", jobExecutionId='"
230-
+ jobExecutionId + '\'' + ", name='" + name + '\'' + ", status=" + status + ", readCount=" + readCount
231-
+ ", writeCount=" + writeCount + ", commitCount=" + commitCount + ", rollbackCount=" + rollbackCount
232-
+ ", readSkipCount=" + readSkipCount + ", processSkipCount=" + processSkipCount + ", writeSkipCount="
233-
+ writeSkipCount + ", filterCount=" + filterCount + ", startTime=" + startTime + ", createTime="
234-
+ createTime + ", endTime=" + endTime + ", lastUpdated=" + lastUpdated + ", executionContext="
235-
+ executionContext + ", exitStatus=" + exitStatus + ", terminateOnly=" + terminateOnly + '}';
221+
return "StepExecution{stepExecutionId=" + stepExecutionId + ", jobExecutionId='" + jobExecutionId + '\''
222+
+ ", name='" + name + '\'' + ", status=" + status + ", readCount=" + readCount + ", writeCount="
223+
+ writeCount + ", commitCount=" + commitCount + ", rollbackCount=" + rollbackCount + ", readSkipCount="
224+
+ readSkipCount + ", processSkipCount=" + processSkipCount + ", writeSkipCount=" + writeSkipCount
225+
+ ", filterCount=" + filterCount + ", startTime=" + startTime + ", createTime=" + createTime
226+
+ ", endTime=" + endTime + ", lastUpdated=" + lastUpdated + ", executionContext=" + executionContext
227+
+ ", exitStatus=" + exitStatus + ", terminateOnly=" + terminateOnly + '}';
236228
}
237229

238230
}

0 commit comments

Comments
 (0)