Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade spring-javaformat maven plugin to version 0.0.39

Browse Source
This commit is contained in:
Mahmoud Ben Hassine
2023-06-05 11:11:48 +02:00
parent bb5598e569
commit c25cd55901
264 changed files with 2551 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java
View File

@@ -50,8 +50,13 @@ public class RetrySampleConfiguration {
@Bean
protected Step step(JobRepository jobRepository) {
return new StepBuilder("step", jobRepository).<Trade, Object>chunk(1, this.transactionManager).reader(reader())
.writer(writer()).faultTolerant().retry(Exception.class).retryLimit(3).build();
return new StepBuilder("step", jobRepository).<Trade, Object>chunk(1, this.transactionManager)
.reader(reader())
.writer(writer())
.faultTolerant()
.retry(Exception.class)
.retryLimit(3)
.build();
}
@Bean

28
spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java
View File

@@ -31,9 +31,10 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter<Game> {
@Override
protected void initDao() throws Exception {
super.initDao();
insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES").usingColumns("player_id", "year_no",
"team", "week", "opponent", " completes", "attempts", "passing_yards", "passing_td", "interceptions",
"rushes", "rush_yards", "receptions", "receptions_yards", "total_td");
insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES")
.usingColumns("player_id", "year_no", "team", "week", "opponent", " completes", "attempts", "passing_yards",
"passing_td", "interceptions", "rushes", "rush_yards", "receptions", "receptions_yards",
"total_td");
}
@Override
@@ -42,13 +43,20 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter<Game> {
for (Game game : games) {
SqlParameterSource values = new MapSqlParameterSource().addValue("player_id", game.getId())
.addValue("year_no", game.getYear()).addValue("team", game.getTeam())
.addValue("week", game.getWeek()).addValue("opponent", game.getOpponent())
.addValue("completes", game.getCompletes()).addValue("attempts", game.getAttempts())
.addValue("passing_yards", game.getPassingYards()).addValue("passing_td", game.getPassingTd())
.addValue("interceptions", game.getInterceptions()).addValue("rushes", game.getRushes())
.addValue("rush_yards", game.getRushYards()).addValue("receptions", game.getReceptions())
.addValue("receptions_yards", game.getReceptionYards()).addValue("total_td", game.getTotalTd());
.addValue("year_no", game.getYear())
.addValue("team", game.getTeam())
.addValue("week", game.getWeek())
.addValue("opponent", game.getOpponent())
.addValue("completes", game.getCompletes())
.addValue("attempts", game.getAttempts())
.addValue("passing_yards", game.getPassingYards())
.addValue("passing_td", game.getPassingTd())
.addValue("interceptions", game.getInterceptions())
.addValue("rushes", game.getRushes())
.addValue("rush_yards", game.getRushYards())
.addValue("receptions", game.getReceptions())
.addValue("receptions_yards", game.getReceptionYards())
.addValue("total_td", game.getTotalTd());
this.insertGame.execute(values);
}

17
spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java
View File

@@ -40,12 +40,17 @@ public class JdbcPlayerSummaryDao implements ItemWriter<PlayerSummary> {
for (PlayerSummary summary : summaries) {
MapSqlParameterSource args = new MapSqlParameterSource().addValue("id", summary.getId())
.addValue("year", summary.getYear()).addValue("completes", summary.getCompletes())
.addValue("attempts", summary.getAttempts()).addValue("passingYards", summary.getPassingYards())
.addValue("passingTd", summary.getPassingTd()).addValue("interceptions", summary.getInterceptions())
.addValue("rushes", summary.getRushes()).addValue("rushYards", summary.getRushYards())
.addValue("receptions", summary.getReceptions())
.addValue("receptionYards", summary.getReceptionYards()).addValue("totalTd", summary.getTotalTd());
.addValue("year", summary.getYear())
.addValue("completes", summary.getCompletes())
.addValue("attempts", summary.getAttempts())
.addValue("passingYards", summary.getPassingYards())
.addValue("passingTd", summary.getPassingTd())
.addValue("interceptions", summary.getInterceptions())
.addValue("rushes", summary.getRushes())
.addValue("rushYards", summary.getRushYards())
.addValue("receptions", summary.getReceptions())
.addValue("receptionYards", summary.getReceptionYards())
.addValue("totalTd", summary.getTotalTd());
namedParameterJdbcTemplate.update(INSERT_SUMMARY, args);
}

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java
View File

@@ -167,7 +167,7 @@ public class OrderValidator implements Validator {
// price for single item = discountedPrice + shipping + handling
BigDecimal singleItemPrice = discountedPrice.add(lineItem.getShippingPrice())
.add(lineItem.getHandlingPrice());
.add(lineItem.getHandlingPrice());
// total price = singleItemPrice * quantity
BigDecimal quantity = new BigDecimal(lineItem.getQuantity());

3
spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java
View File

@@ -39,7 +39,8 @@ public class Job1Configuration {
@Bean
public Job job1(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job1", jobRepository).start(step1(jobRepository, transactionManager))
.next(step2(jobRepository, transactionManager)).build();
.next(step2(jobRepository, transactionManager))
.build();
}
@Bean

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java
View File

@@ -48,7 +48,9 @@ public class Job2Configuration {
@Bean
public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new StepBuilder("step1", jobRepository).<Integer, Integer>chunk(3, transactionManager)
.reader(itemReader()).writer(itemWriter()).build();
.reader(itemReader())
.writer(itemWriter())
.build();
}
@Bean

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java
View File

@@ -27,7 +27,7 @@ public class JobScheduler {
@Scheduled(cron = "*/10 * * * * *")
public void launchJob1() throws Exception {
JobParameters jobParameters = new JobParametersBuilder().addLong("time", System.currentTimeMillis())
.toJobParameters();
.toJobParameters();
jobLauncher.run(job1, jobParameters);
}
@@ -35,7 +35,7 @@ public class JobScheduler {
@Scheduled(cron = "*/15 * * * * *")
public void launchJob2() throws Exception {
JobParameters jobParameters = new JobParametersBuilder().addLong("time", System.currentTimeMillis())
.toJobParameters();
.toJobParameters();
jobLauncher.run(job2, jobParameters);
}

20
spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java
View File

@@ -49,22 +49,30 @@ public class DeletionJobConfiguration {
public MongoItemReader<Person> mongoPersonReader(MongoTemplate mongoTemplate) {
Map<String, Sort.Direction> sortOptions = new HashMap<>();
sortOptions.put("name", Sort.Direction.DESC);
return new MongoItemReaderBuilder<Person>().name("personItemReader").collection("person_out")
.targetType(Person.class).template(mongoTemplate)
.query(new Query().addCriteria(where("name").is("foo3"))).sorts(sortOptions).build();
return new MongoItemReaderBuilder<Person>().name("personItemReader")
.collection("person_out")
.targetType(Person.class)
.template(mongoTemplate)
.query(new Query().addCriteria(where("name").is("foo3")))
.sorts(sortOptions)
.build();
}
@Bean
public MongoItemWriter<Person> mongoPersonRemover(MongoTemplate mongoTemplate) {
return new MongoItemWriterBuilder<Person>().template(mongoTemplate).delete(true).collection("person_out")
.build();
return new MongoItemWriterBuilder<Person>().template(mongoTemplate)
.delete(true)
.collection("person_out")
.build();
}
@Bean
public Step deletionStep(JobRepository jobRepository, PlatformTransactionManager transactionManager,
MongoItemReader<Person> mongoPersonReader, MongoItemWriter<Person> mongoPersonRemover) {
return new StepBuilder("step", jobRepository).<Person, Person>chunk(2, transactionManager)
.reader(mongoPersonReader).writer(mongoPersonRemover).build();
.reader(mongoPersonReader)
.writer(mongoPersonRemover)
.build();
}
@Bean

13
spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java
View File

@@ -46,8 +46,13 @@ public class InsertionJobConfiguration {
public MongoItemReader<Person> mongoItemReader(MongoTemplate mongoTemplate) {
Map<String, Sort.Direction> sortOptions = new HashMap<>();
sortOptions.put("name", Sort.Direction.DESC);
return new MongoItemReaderBuilder<Person>().name("personItemReader").collection("person_in")
.targetType(Person.class).template(mongoTemplate).jsonQuery("{}").sorts(sortOptions).build();
return new MongoItemReaderBuilder<Person>().name("personItemReader")
.collection("person_in")
.targetType(Person.class)
.template(mongoTemplate)
.jsonQuery("{}")
.sorts(sortOptions)
.build();
}
@Bean
@@ -59,7 +64,9 @@ public class InsertionJobConfiguration {
public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager,
MongoItemReader<Person> mongoItemReader, MongoItemWriter<Person> mongoItemWriter) {
return new StepBuilder("step", jobRepository).<Person, Person>chunk(2, transactionManager)
.reader(mongoItemReader).writer(mongoItemWriter).build();
.reader(mongoItemReader)
.writer(mongoItemWriter)
.build();
}
@Bean

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/DataSourceConfiguration.java
View File

@@ -32,7 +32,9 @@ public class DataSourceConfiguration {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

16
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/ManagerConfiguration.java
View File

@@ -78,8 +78,9 @@ public class ManagerConfiguration {
@Bean
public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
return IntegrationFlow.from(requests())
.handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
}
/*
@@ -93,7 +94,8 @@ public class ManagerConfiguration {
@Bean
public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("replies"))
.channel(replies()).get();
.channel(replies())
.get();
}
/*
@@ -106,8 +108,12 @@ public class ManagerConfiguration {
@Bean
public TaskletStep managerStep() {
return this.managerStepBuilderFactory.get("managerStep").<Integer, Integer>chunk(3).reader(itemReader())
.outputChannel(requests()).inputChannel(replies()).build();
return this.managerStepBuilderFactory.get("managerStep")
.<Integer, Integer>chunk(3)
.reader(itemReader())
.outputChannel(requests())
.inputChannel(replies())
.build();
}
@Bean

15
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/WorkerConfiguration.java
View File

@@ -78,7 +78,8 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests"))
.channel(requests()).get();
.channel(requests())
.get();
}
/*
@@ -91,8 +92,9 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(replies()).handle(Jms.outboundAdapter(connectionFactory).destination("replies"))
.get();
return IntegrationFlow.from(replies())
.handle(Jms.outboundAdapter(connectionFactory).destination("replies"))
.get();
}
/*
@@ -117,8 +119,11 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow workerIntegrationFlow() {
return this.remoteChunkingWorkerBuilder.itemProcessor(itemProcessor()).itemWriter(itemWriter())
.inputChannel(requests()).outputChannel(replies()).build();
return this.remoteChunkingWorkerBuilder.itemProcessor(itemProcessor())
.itemWriter(itemWriter())
.inputChannel(requests())
.outputChannel(replies())
.build();
}
}

16
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/ManagerConfiguration.java
View File

@@ -65,8 +65,9 @@ public class ManagerConfiguration {
@Bean
public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
return IntegrationFlow.from(requests())
.handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
}
/*
@@ -80,7 +81,8 @@ public class ManagerConfiguration {
@Bean
public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("replies"))
.channel(replies()).get();
.channel(replies())
.get();
}
/*
@@ -88,8 +90,12 @@ public class ManagerConfiguration {
*/
@Bean
public Step managerStep() {
return this.managerStepBuilderFactory.get("managerStep").partitioner("workerStep", new BasicPartitioner())
.gridSize(GRID_SIZE).outputChannel(requests()).inputChannel(replies()).build();
return this.managerStepBuilderFactory.get("managerStep")
.partitioner("workerStep", new BasicPartitioner())
.gridSize(GRID_SIZE)
.outputChannel(requests())
.inputChannel(replies())
.build();
}
@Bean

15
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/WorkerConfiguration.java
View File

@@ -64,7 +64,8 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests"))
.channel(requests()).get();
.channel(requests())
.get();
}
/*
@@ -77,8 +78,9 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(replies()).handle(Jms.outboundAdapter(connectionFactory).destination("replies"))
.get();
return IntegrationFlow.from(replies())
.handle(Jms.outboundAdapter(connectionFactory).destination("replies"))
.get();
}
/*
@@ -86,8 +88,11 @@ public class WorkerConfiguration {
*/
@Bean
public Step workerStep(PlatformTransactionManager transactionManager) {
return this.workerStepBuilderFactory.get("workerStep").inputChannel(requests()).outputChannel(replies())
.tasklet(tasklet(null), transactionManager).build();
return this.workerStepBuilderFactory.get("workerStep")
.inputChannel(requests())
.outputChannel(replies())
.tasklet(tasklet(null), transactionManager)
.build();
}
@Bean

12
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/ManagerConfiguration.java
View File

@@ -65,8 +65,9 @@ public class ManagerConfiguration {
@Bean
public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
return IntegrationFlow.from(requests())
.handle(Jms.outboundAdapter(connectionFactory).destination("requests"))
.get();
}
/*
@@ -74,8 +75,11 @@ public class ManagerConfiguration {
*/
@Bean
public Step managerStep() {
return this.managerStepBuilderFactory.get("managerStep").partitioner("workerStep", new BasicPartitioner())
.gridSize(GRID_SIZE).outputChannel(requests()).build();
return this.managerStepBuilderFactory.get("managerStep")
.partitioner("workerStep", new BasicPartitioner())
.gridSize(GRID_SIZE)
.outputChannel(requests())
.build();
}
@Bean

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/WorkerConfiguration.java
View File

@@ -64,7 +64,8 @@ public class WorkerConfiguration {
@Bean
public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) {
return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests"))
.channel(requests()).get();
.channel(requests())
.get();
}
/*
@@ -72,8 +73,10 @@ public class WorkerConfiguration {
*/
@Bean
public Step workerStep(PlatformTransactionManager transactionManager) {
return this.workerStepBuilderFactory.get("workerStep").inputChannel(requests())
.tasklet(tasklet(null), transactionManager).build();
return this.workerStepBuilderFactory.get("workerStep")
.inputChannel(requests())
.tasklet(tasklet(null), transactionManager)
.build();
}
@Bean

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java
View File

@@ -28,7 +28,9 @@ public class DataSourceConfiguration {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java
View File

@@ -84,8 +84,13 @@ public class SkippableExceptionDuringProcessSample {
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step", jobRepository).<Integer, Integer>chunk(3, this.transactionManager)
.reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant()
.skip(IllegalArgumentException.class).skipLimit(3).build();
.reader(itemReader())
.processor(itemProcessor())
.writer(itemWriter())
.faultTolerant()
.skip(IllegalArgumentException.class)
.skipLimit(3)
.build();
}
@Bean

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java
View File

@@ -84,8 +84,13 @@ public class SkippableExceptionDuringReadSample {
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step", jobRepository).<Integer, Integer>chunk(3, this.transactionManager)
.reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant()
.skip(IllegalArgumentException.class).skipLimit(3).build();
.reader(itemReader())
.processor(itemProcessor())
.writer(itemWriter())
.faultTolerant()
.skip(IllegalArgumentException.class)
.skipLimit(3)
.build();
}
@Bean

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java
View File

@@ -84,8 +84,13 @@ public class SkippableExceptionDuringWriteSample {
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step", jobRepository).<Integer, Integer>chunk(3, this.transactionManager)
.reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant()
.skip(IllegalArgumentException.class).skipLimit(3).build();
.reader(itemReader())
.processor(itemProcessor())
.writer(itemWriter())
.faultTolerant()
.skip(IllegalArgumentException.class)
.skipLimit(3)
.build();
}
@Bean

9
spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java
View File

@@ -66,7 +66,10 @@ public class ValidationSampleConfiguration {
@Bean
public Step step(JobRepository jobRepository) throws Exception {
return new StepBuilder("step", jobRepository).<Person, Person>chunk(1, transactionManager(dataSource()))
.reader(itemReader()).processor(itemValidator()).writer(itemWriter()).build();
.reader(itemReader())
.processor(itemValidator())
.writer(itemWriter())
.build();
}
@Bean
@@ -77,7 +80,9 @@ public class ValidationSampleConfiguration {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
View File

@@ -59,7 +59,7 @@ class GracefulShutdownFunctionalTests {
@Test
void testLaunchJob() throws Exception {
final JobParameters jobParameters = new JobParametersBuilder().addLong("timestamp", System.currentTimeMillis())
.toJobParameters();
.toJobParameters();
JobExecution jobExecution = jobLauncherTestUtils.launchJob(jobParameters);

22
spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java
View File

@@ -124,17 +124,17 @@ class HibernateFailureJobFunctionalTests {
protected void validatePreConditions() {
ensureState();
creditsBeforeUpdate = new TransactionTemplate(transactionManager)
.execute(new TransactionCallback<List<BigDecimal>>() {
@Override
public List<BigDecimal> doInTransaction(TransactionStatus status) {
return jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper<BigDecimal>() {
@Override
public BigDecimal mapRow(ResultSet rs, int rowNum) throws SQLException {
return rs.getBigDecimal(CREDIT_COLUMN);
}
});
}
});
.execute(new TransactionCallback<List<BigDecimal>>() {
@Override
public List<BigDecimal> doInTransaction(TransactionStatus status) {
return jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper<BigDecimal>() {
@Override
public BigDecimal mapRow(ResultSet rs, int rowNum) throws SQLException {
return rs.getBigDecimal(CREDIT_COLUMN);
}
});
}
});
}
/*

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java
View File

@@ -56,8 +56,8 @@ class JobStepFunctionalTests {
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
jobLauncherTestUtils
.launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
"input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt")));
.launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
"input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt")));
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "TRADE");
assertEquals(5, after);

20
spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java
View File

@@ -76,21 +76,27 @@ class JsonSupportIntegrationTests {
@Bean
public JsonItemReader<Trade> itemReader() {
return new JsonItemReaderBuilder<Trade>().name("tradesJsonItemReader")
.resource(new FileSystemResource(INPUT_FILE_DIRECTORY + "trades.json"))
.jsonObjectReader(new GsonJsonObjectReader<>(Trade.class)).build();
.resource(new FileSystemResource(INPUT_FILE_DIRECTORY + "trades.json"))
.jsonObjectReader(new GsonJsonObjectReader<>(Trade.class))
.build();
}
@Bean
public JsonFileItemWriter<Trade> itemWriter() {
return new JsonFileItemWriterBuilder<Trade>()
.resource(new FileSystemResource(OUTPUT_FILE_DIRECTORY + "trades.json")).lineSeparator("\n")
.jsonObjectMarshaller(new JacksonJsonObjectMarshaller<>()).name("tradesJsonFileItemWriter").build();
.resource(new FileSystemResource(OUTPUT_FILE_DIRECTORY + "trades.json"))
.lineSeparator("\n")
.jsonObjectMarshaller(new JacksonJsonObjectMarshaller<>())
.name("tradesJsonFileItemWriter")
.build();
}
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step", jobRepository).<Trade, Trade>chunk(2, transactionManager(dataSource()))
.reader(itemReader()).writer(itemWriter()).build();
.reader(itemReader())
.writer(itemWriter())
.build();
}
@Bean
@@ -101,7 +107,9 @@ class JsonSupportIntegrationTests {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java
View File

@@ -76,7 +76,7 @@ class PartitionFileJobFunctionalTests implements ApplicationContextAware {
@SuppressWarnings("unchecked")
ItemReader<CustomerCredit> outputReader = (ItemReader<CustomerCredit>) applicationContext
.getBean("outputTestReader");
.getBean("outputTestReader");
open(outputReader);
List<CustomerCredit> outputs = new ArrayList<>(getCredits(outputReader));
close(outputReader);

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java
View File

@@ -76,7 +76,7 @@ class PartitionJdbcJobFunctionalTests implements ApplicationContextAware {
@SuppressWarnings("unchecked")
ItemReader<CustomerCredit> outputReader = (ItemReader<CustomerCredit>) applicationContext
.getBean("outputTestReader");
.getBean("outputTestReader");
open(outputReader);
List<CustomerCredit> outputs = new ArrayList<>(getCredits(outputReader));
close(outputReader);

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java
View File

@@ -59,8 +59,10 @@ class RemoteChunkingJobFunctionalTests {
@BeforeEach
void setUp() throws Exception {
Configuration configuration = new ConfigurationImpl().addAcceptorConfiguration("jms", "tcp://localhost:61616")
.setPersistenceEnabled(false).setSecurityEnabled(false).setJMXManagementEnabled(false)
.setJournalDatasync(false);
.setPersistenceEnabled(false)
.setSecurityEnabled(false)
.setJMXManagementEnabled(false)
.setJournalDatasync(false);
this.brokerService = new EmbeddedActiveMQ().setConfiguration(configuration).start();
this.workerApplicationContext = new AnnotationConfigApplicationContext(WorkerConfiguration.class);
}

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java
View File

@@ -69,8 +69,10 @@ public abstract class RemotePartitioningJobFunctionalTests {
@BeforeEach
void setUp() throws Exception {
Configuration configuration = new ConfigurationImpl().addAcceptorConfiguration("jms", "tcp://localhost:61617")
.setPersistenceEnabled(false).setSecurityEnabled(false).setJMXManagementEnabled(false)
.setJournalDatasync(false);
.setPersistenceEnabled(false)
.setSecurityEnabled(false)
.setJMXManagementEnabled(false)
.setJournalDatasync(false);
this.brokerService = new EmbeddedActiveMQ().setConfiguration(configuration).start();
ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-drop-hsqldb.sql"));

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java
View File

@@ -93,8 +93,8 @@ class RestartFunctionalTests {
// load the application context and launch the job
private JobExecution runJobForRestartTest() throws Exception {
return jobLauncherTestUtils
.launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
"input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt")));
.launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties(
"input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt")));
}
}

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java
View File

@@ -38,7 +38,7 @@ class TaskletJobFunctionalTests {
@Test
void testLaunchJob() throws Exception {
JobExecution jobExecution = jobLauncherTestUtils
.launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
.launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters());
assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
assertEquals("yes", jobExecution.getExecutionContext().getString("done"));
}

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java
View File

@@ -37,7 +37,8 @@ class DelimitedFunctionalTests extends AbstractIoSampleTests {
@Override
protected void pointReaderToOutput(ItemReader<CustomerCredit> reader) {
JobParameters jobParameters = super.getUniqueJobParametersBuilder()
.addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters();
.addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv")
.toJobParameters();
StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters);
StepSynchronizationManager.close();
StepSynchronizationManager.register(stepExecution);
@@ -46,7 +47,8 @@ class DelimitedFunctionalTests extends AbstractIoSampleTests {
@Override
protected JobParameters getUniqueJobParameters() {
return super.getUniqueJobParametersBuilder().addString("inputFile", "data/iosample/input/delimited.csv")
.addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters();
.addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv")
.toJobParameters();
}
}

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java
View File

@@ -30,7 +30,8 @@ class FixedLengthFunctionalTests extends AbstractIoSampleTests {
@Override
protected void pointReaderToOutput(ItemReader<CustomerCredit> reader) {
JobParameters jobParameters = super.getUniqueJobParametersBuilder()
.addString("inputFile", "file:./target/test-outputs/fixedLengthOutput.txt").toJobParameters();
.addString("inputFile", "file:./target/test-outputs/fixedLengthOutput.txt")
.toJobParameters();
StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters);
StepSynchronizationManager.close();
StepSynchronizationManager.register(stepExecution);
@@ -39,7 +40,8 @@ class FixedLengthFunctionalTests extends AbstractIoSampleTests {
@Override
protected JobParameters getUniqueJobParameters() {
return super.getUniqueJobParametersBuilder().addString("inputFile", "data/iosample/input/fixedLength.txt")
.addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt").toJobParameters();
.addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt")
.toJobParameters();
}
}

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java
View File

@@ -37,7 +37,8 @@ class MultiResourceFunctionalTests extends AbstractIoSampleTests {
@Override
protected void pointReaderToOutput(ItemReader<CustomerCredit> reader) {
JobParameters jobParameters = super.getUniqueJobParametersBuilder()
.addString("input.file.path", "file:target/test-outputs/multiResourceOutput.csv.*").toJobParameters();
.addString("input.file.path", "file:target/test-outputs/multiResourceOutput.csv.*")
.toJobParameters();
StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters);
StepSynchronizationManager.close();
StepSynchronizationManager.register(stepExecution);
@@ -47,7 +48,8 @@ class MultiResourceFunctionalTests extends AbstractIoSampleTests {
protected JobParameters getUniqueJobParameters() {
JobParametersBuilder builder = super.getUniqueJobParametersBuilder();
return builder.addString("input.file.path", "classpath:data/iosample/input/delimited*.csv")
.addString("output.file.path", "file:target/test-outputs/multiResourceOutput.csv").toJobParameters();
.addString("output.file.path", "file:target/test-outputs/multiResourceOutput.csv")
.toJobParameters();
}
}

9
spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java
View File

@@ -75,7 +75,8 @@ class TwoJobInstancesDelimitedFunctionalTests {
private void verifyOutput(int expected) throws Exception {
JobParameters jobParameters = new JobParametersBuilder()
.addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters();
.addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv")
.toJobParameters();
StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters);
int count = StepScopeTestUtils.doInStepScope(stepExecution, new Callable<Integer>() {
@@ -101,8 +102,10 @@ class TwoJobInstancesDelimitedFunctionalTests {
}
protected JobParameters getJobParameters(String fileName) {
return new JobParametersBuilder().addLong("timestamp", new Date().getTime()).addString("inputFile", fileName)
.addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters();
return new JobParametersBuilder().addLong("timestamp", new Date().getTime())
.addString("inputFile", fileName)
.addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv")
.toJobParameters();
}
}

5
spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java
View File

@@ -73,8 +73,9 @@ class TwoJobInstancesPagingFunctionalTests {
}
protected JobParameters getJobParameters(double amount) {
return new JobParametersBuilder().addLong("timestamp", new Date().getTime()).addDouble("credit", amount)
.toJobParameters();
return new JobParametersBuilder().addLong("timestamp", new Date().getTime())
.addDouble("credit", amount)
.toJobParameters();
}
}