Skip to content

Commit 9eafb31

Browse files
fmbenhassinefmbenhassine
committed
Move DAOs implementations to separate packages
Resolves #4848
1 parent d6ce07b commit 9eafb31

32 files changed

+130
-82
lines changed

‎spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JdbcDefaultBatchConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import org.springframework.batch.core.repository.JobRepository;
3131
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
3232
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
33-
import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
34-
import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
35-
import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
33+
import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
34+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
35+
import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
3636
import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean;
3737
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
3838
import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcExecutionContextDao.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.batch.core.repository.dao;
17+
package org.springframework.batch.core.repository.dao.jdbc;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.ByteArrayOutputStream;
@@ -36,6 +36,9 @@
3636
import org.springframework.batch.core.JobExecution;
3737
import org.springframework.batch.core.StepExecution;
3838
import org.springframework.batch.core.repository.ExecutionContextSerializer;
39+
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
40+
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
41+
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
3942
import org.springframework.batch.item.ExecutionContext;
4043
import org.springframework.core.serializer.Serializer;
4144
import org.springframework.jdbc.core.BatchPreparedStatementSetter;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006-2023 the original author or authors.
2+
* Copyright 2006-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.batch.core.repository.dao;
17+
package org.springframework.batch.core.repository.dao.jdbc;
1818

1919
import java.sql.PreparedStatement;
2020
import java.sql.ResultSet;
@@ -46,6 +46,9 @@
4646
import org.springframework.batch.core.converter.StringToLocalDateConverter;
4747
import org.springframework.batch.core.converter.StringToLocalDateTimeConverter;
4848
import org.springframework.batch.core.converter.StringToLocalTimeConverter;
49+
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
50+
import org.springframework.batch.core.repository.dao.JobExecutionDao;
51+
import org.springframework.batch.core.repository.dao.NoSuchObjectException;
4952
import org.springframework.beans.factory.InitializingBean;
5053
import org.springframework.core.convert.support.ConfigurableConversionService;
5154
import org.springframework.core.convert.support.DefaultConversionService;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobInstanceDao.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.batch.core.repository.dao;
17+
package org.springframework.batch.core.repository.dao.jdbc;
1818

1919
import java.sql.ResultSet;
2020
import java.sql.SQLException;
@@ -28,6 +28,8 @@
2828
import org.springframework.batch.core.JobKeyGenerator;
2929
import org.springframework.batch.core.JobParameters;
3030
import org.springframework.batch.core.launch.NoSuchJobException;
31+
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
32+
import org.springframework.batch.core.repository.dao.JobInstanceDao;
3133
import org.springframework.beans.factory.InitializingBean;
3234
import org.springframework.dao.DataAccessException;
3335
import org.springframework.dao.EmptyResultDataAccessException;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006-2024 the original author or authors.
2+
* Copyright 2006-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.batch.core.repository.dao;
17+
package org.springframework.batch.core.repository.dao.jdbc;
1818

1919
import java.sql.PreparedStatement;
2020
import java.sql.ResultSet;
@@ -38,6 +38,8 @@
3838
import org.springframework.batch.core.JobExecution;
3939
import org.springframework.batch.core.JobInstance;
4040
import org.springframework.batch.core.StepExecution;
41+
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
42+
import org.springframework.batch.core.repository.dao.StepExecutionDao;
4143
import org.springframework.beans.factory.InitializingBean;
4244
import org.springframework.dao.OptimisticLockingFailureException;
4345
import org.springframework.jdbc.core.BatchPreparedStatementSetter;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoExecutionContextDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoExecutionContextDao.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2024-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.mongodb;
1717

1818
import java.util.Collection;
1919

2020
import org.springframework.batch.core.JobExecution;
2121
import org.springframework.batch.core.StepExecution;
22+
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
2223
import org.springframework.batch.item.ExecutionContext;
2324
import org.springframework.data.mongodb.core.MongoOperations;
2425
import org.springframework.data.mongodb.core.query.Query;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobExecutionDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.mongodb;
1717

1818
import java.util.HashSet;
1919
import java.util.List;
2020
import java.util.Set;
2121

2222
import org.springframework.batch.core.JobExecution;
2323
import org.springframework.batch.core.JobInstance;
24+
import org.springframework.batch.core.repository.dao.JobExecutionDao;
2425
import org.springframework.batch.core.repository.persistence.converter.JobExecutionConverter;
2526
import org.springframework.batch.core.repository.persistence.converter.JobInstanceConverter;
2627
import org.springframework.data.domain.Sort;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoJobInstanceDao.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobInstanceDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.mongodb;
1717

1818
import java.util.List;
1919

@@ -23,8 +23,8 @@
2323
import org.springframework.batch.core.JobKeyGenerator;
2424
import org.springframework.batch.core.JobParameters;
2525
import org.springframework.batch.core.launch.NoSuchJobException;
26+
import org.springframework.batch.core.repository.dao.JobInstanceDao;
2627
import org.springframework.batch.core.repository.persistence.converter.JobInstanceConverter;
27-
import org.springframework.data.domain.Example;
2828
import org.springframework.data.domain.Sort;
2929
import org.springframework.data.mongodb.core.MongoOperations;
3030
import org.springframework.data.mongodb.core.query.Query;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MongoSequenceIncrementer.java renamed to ‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoSequenceIncrementer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2024-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.mongodb;
1717

1818
import com.mongodb.client.model.FindOneAndUpdateOptions;
1919
import com.mongodb.client.model.ReturnDocument;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2024-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.mongodb;
1717

1818
import java.util.ArrayList;
1919
import java.util.Collection;
@@ -24,6 +24,7 @@
2424
import org.springframework.batch.core.JobExecution;
2525
import org.springframework.batch.core.JobInstance;
2626
import org.springframework.batch.core.StepExecution;
27+
import org.springframework.batch.core.repository.dao.StepExecutionDao;
2728
import org.springframework.batch.core.repository.persistence.converter.JobExecutionConverter;
2829
import org.springframework.batch.core.repository.persistence.converter.StepExecutionConverter;
2930
import org.springframework.data.mongodb.core.MongoOperations;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/JobExplorerFactoryBean.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
3636
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
3737
import org.springframework.batch.core.repository.dao.ExecutionContextDao;
38-
import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
39-
import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
40-
import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
41-
import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
38+
import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
39+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
40+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobInstanceDao;
41+
import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
4242
import org.springframework.batch.core.repository.dao.JobExecutionDao;
4343
import org.springframework.batch.core.repository.dao.JobInstanceDao;
4444
import org.springframework.batch.core.repository.dao.StepExecutionDao;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/explore/support/MongoJobExplorerFactoryBean.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2024-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
1919
import org.springframework.batch.core.repository.dao.JobExecutionDao;
2020
import org.springframework.batch.core.repository.dao.JobInstanceDao;
2121
import org.springframework.batch.core.repository.dao.StepExecutionDao;
22-
import org.springframework.batch.core.repository.dao.MongoExecutionContextDao;
23-
import org.springframework.batch.core.repository.dao.MongoJobExecutionDao;
24-
import org.springframework.batch.core.repository.dao.MongoJobInstanceDao;
25-
import org.springframework.batch.core.repository.dao.MongoStepExecutionDao;
22+
import org.springframework.batch.core.repository.dao.mongodb.MongoExecutionContextDao;
23+
import org.springframework.batch.core.repository.dao.mongodb.MongoJobExecutionDao;
24+
import org.springframework.batch.core.repository.dao.mongodb.MongoJobInstanceDao;
25+
import org.springframework.batch.core.repository.dao.mongodb.MongoStepExecutionDao;
2626
import org.springframework.beans.factory.InitializingBean;
2727
import org.springframework.data.mongodb.core.MongoOperations;
2828
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JdbcJobRepositoryFactoryBean.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import org.springframework.batch.core.repository.ExecutionContextSerializer;
1919
import org.springframework.batch.core.repository.dao.AbstractJdbcBatchMetadataDao;
2020
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
21-
import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
22-
import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
23-
import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
21+
import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
22+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
23+
import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
2424
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
2525
import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
2626
import org.springframework.beans.factory.FactoryBean;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBean.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
import org.springframework.batch.core.converter.StringToLocalTimeConverter;
2929
import org.springframework.batch.core.repository.ExecutionContextSerializer;
3030
import org.springframework.batch.core.repository.dao.*;
31+
import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
32+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
33+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobInstanceDao;
34+
import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
3135
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
3236
import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
3337
import org.springframework.batch.support.DatabaseType;

‎spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/MongoJobRepositoryFactoryBean.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 the original author or authors.
2+
* Copyright 2024-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
1919
import org.springframework.batch.core.repository.dao.JobExecutionDao;
2020
import org.springframework.batch.core.repository.dao.JobInstanceDao;
2121
import org.springframework.batch.core.repository.dao.StepExecutionDao;
22-
import org.springframework.batch.core.repository.dao.MongoExecutionContextDao;
23-
import org.springframework.batch.core.repository.dao.MongoJobExecutionDao;
24-
import org.springframework.batch.core.repository.dao.MongoJobInstanceDao;
25-
import org.springframework.batch.core.repository.dao.MongoStepExecutionDao;
22+
import org.springframework.batch.core.repository.dao.mongodb.MongoExecutionContextDao;
23+
import org.springframework.batch.core.repository.dao.mongodb.MongoJobExecutionDao;
24+
import org.springframework.batch.core.repository.dao.mongodb.MongoJobInstanceDao;
25+
import org.springframework.batch.core.repository.dao.mongodb.MongoStepExecutionDao;
2626
import org.springframework.beans.factory.InitializingBean;
2727
import org.springframework.data.mongodb.core.MongoOperations;
2828
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;

‎spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
import org.springframework.batch.core.launch.JobLauncher;
3535
import org.springframework.batch.core.launch.JobOperator;
3636
import org.springframework.batch.core.repository.JobRepository;
37-
import org.springframework.batch.core.repository.dao.JdbcExecutionContextDao;
38-
import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
39-
import org.springframework.batch.core.repository.dao.JdbcJobInstanceDao;
40-
import org.springframework.batch.core.repository.dao.JdbcStepExecutionDao;
41-
import org.springframework.beans.factory.BeanCreationException;
37+
import org.springframework.batch.core.repository.dao.jdbc.JdbcExecutionContextDao;
38+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
39+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobInstanceDao;
40+
import org.springframework.batch.core.repository.dao.jdbc.JdbcStepExecutionDao;
4241
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
4342
import org.springframework.context.annotation.Bean;
4443
import org.springframework.context.annotation.Configuration;

‎spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
2626
import org.springframework.batch.core.JobExecution;
2727
import org.springframework.batch.core.JobParameters;
2828
import org.springframework.batch.core.JobParametersBuilder;
29-
import org.springframework.batch.core.repository.dao.JdbcJobExecutionDao;
29+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
3030
import org.springframework.beans.factory.annotation.Autowired;
3131
import org.springframework.jdbc.core.JdbcTemplate;
3232
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2008-2023 the original author or authors.
2+
* Copyright 2008-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
3131
import org.springframework.batch.core.JobInstance;
3232
import org.springframework.batch.core.JobParameters;
3333
import org.springframework.batch.core.StepExecution;
34+
import org.springframework.batch.core.repository.dao.jdbc.JdbcJobExecutionDao;
3435
import org.springframework.dao.OptimisticLockingFailureException;
3536
import org.springframework.transaction.annotation.Transactional;
3637

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2008-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springframework.batch.core.repository.dao.jdbc;
17+
18+
import org.jetbrains.annotations.NotNull;
19+
import org.springframework.batch.core.JobKeyGenerator;
20+
21+
public class CustomJobKeyGenerator implements JobKeyGenerator<String> {
22+
23+
@Override
24+
public @NotNull String generateKey(@NotNull String source) {
25+
return "1";
26+
}
27+
28+
}

‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java renamed to ‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/jdbc/JdbcExecutionContextDaoTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2008-2022 the original author or authors.
2+
* Copyright 2008-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.jdbc;
1717

1818
import org.junit.jupiter.api.Test;
1919

20-
import org.springframework.jdbc.core.JdbcOperations;
20+
import org.springframework.batch.core.repository.dao.*;
2121
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
2222

2323
import static org.junit.jupiter.api.Assertions.assertEquals;

‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java renamed to ‎spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobDaoQueryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006-2022 the original author or authors.
2+
* Copyright 2006-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.batch.core.repository.dao;
16+
package org.springframework.batch.core.repository.dao.jdbc;
1717

1818
import java.util.ArrayList;
1919
import java.util.List;

0 commit comments

Comments
 (0)