Skip to content

Commit e43f2b0

Browse files
code-not-foundcode-not-found
committed
format code
1 parent b290101 commit e43f2b0

File tree

10 files changed

+111
-59
lines changed

10 files changed

+111
-59
lines changed

‎spring-batch-admin/spring-batch-task/src/main/java/com/codenotfound/batch/job/CapitalizeNamesJobConfig.java

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,39 @@
2323
public class CapitalizeNamesJobConfig {
2424

2525
@Bean
26-
public Job convertNamesJob(JobBuilderFactory jobBuilders, StepBuilderFactory stepBuilders) {
27-
return jobBuilders.get("capitalizeNamesJob").start(convertNamesStep(stepBuilders)).build();
26+
public Job convertNamesJob(JobBuilderFactory jobBuilders,
27+
StepBuilderFactory stepBuilders) {
28+
return jobBuilders.get("capitalizeNamesJob")
29+
.start(convertNamesStep(stepBuilders)).build();
2830
}
2931

3032
@Bean
3133
public Step convertNamesStep(StepBuilderFactory stepBuilders) {
32-
return stepBuilders.get("capitalizeNamesStep").<Person, Person>chunk(10).reader(itemReader())
34+
return stepBuilders.get("capitalizeNamesStep")
35+
.<Person, Person>chunk(10).reader(itemReader())
3336
.processor(itemProcessor()).writer(itemWriter()).build();
3437
}
3538

3639
@Bean
3740
public FlatFileItemReader<Person> itemReader() {
38-
BeanWrapperFieldSetMapper<Person> fieldSetMapper = new BeanWrapperFieldSetMapper<>();
41+
BeanWrapperFieldSetMapper<Person> fieldSetMapper =
42+
new BeanWrapperFieldSetMapper<>();
3943
fieldSetMapper.setTargetType(Person.class);
4044

41-
DelimitedLineTokenizer lineTokenizer = new DelimitedLineTokenizer();
45+
DelimitedLineTokenizer lineTokenizer =
46+
new DelimitedLineTokenizer();
4247
lineTokenizer.setDelimiter(",");
4348
lineTokenizer.setNames(new String[] {"firstName", "lastName"});
4449

4550
DefaultLineMapper<Person> lineMapper = new DefaultLineMapper<>();
4651
lineMapper.setFieldSetMapper(fieldSetMapper);
4752
lineMapper.setLineTokenizer(lineTokenizer);
4853

49-
FlatFileItemReader<Person> flatFileItemReader = new FlatFileItemReader<>();
54+
FlatFileItemReader<Person> flatFileItemReader =
55+
new FlatFileItemReader<>();
5056
flatFileItemReader.setName("personItemReader");
51-
flatFileItemReader.setResource(new ClassPathResource("csv/persons.csv"));
57+
flatFileItemReader
58+
.setResource(new ClassPathResource("csv/persons.csv"));
5259
flatFileItemReader.setLineMapper(lineMapper);
5360

5461
return flatFileItemReader;
@@ -61,17 +68,21 @@ public PersonItemProcessor itemProcessor() {
6168

6269
@Bean
6370
public FlatFileItemWriter<Person> itemWriter() {
64-
BeanWrapperFieldExtractor<Person> fieldExtractor = new BeanWrapperFieldExtractor<>();
71+
BeanWrapperFieldExtractor<Person> fieldExtractor =
72+
new BeanWrapperFieldExtractor<>();
6573
fieldExtractor.setNames(new String[] {"firstName", "lastName"});
6674
fieldExtractor.afterPropertiesSet();
6775

68-
DelimitedLineAggregator<Person> lineAggregator = new DelimitedLineAggregator<>();
76+
DelimitedLineAggregator<Person> lineAggregator =
77+
new DelimitedLineAggregator<>();
6978
lineAggregator.setDelimiter(",");
7079
lineAggregator.setFieldExtractor(fieldExtractor);
7180

72-
FlatFileItemWriter<Person> flatFileItemWriter = new FlatFileItemWriter<>();
81+
FlatFileItemWriter<Person> flatFileItemWriter =
82+
new FlatFileItemWriter<>();
7383
flatFileItemWriter.setName("personItemWriter");
74-
flatFileItemWriter.setResource(new FileSystemResource("target/test-outputs/persons.txt"));
84+
flatFileItemWriter.setResource(
85+
new FileSystemResource("target/test-outputs/persons.txt"));
7586
flatFileItemWriter.setLineAggregator(lineAggregator);
7687

7788
return flatFileItemWriter;

‎spring-batch-admin/spring-batch-task/src/main/java/com/codenotfound/batch/job/PersonItemProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import org.springframework.batch.item.ItemProcessor;
66
import com.codenotfound.model.Person;
77

8-
public class PersonItemProcessor implements ItemProcessor<Person, Person> {
8+
public class PersonItemProcessor
9+
implements ItemProcessor<Person, Person> {
910

10-
private static final Logger LOGGER = LoggerFactory.getLogger(PersonItemProcessor.class);
11+
private static final Logger LOGGER =
12+
LoggerFactory.getLogger(PersonItemProcessor.class);
1113

1214
@Override
1315
public Person process(Person person) throws Exception {

‎spring-batch-hello-world/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
43
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
65

@@ -11,7 +10,7 @@
1110

1211
<name>spring-batch-hello-world</name>
1312
<description>Spring Batch Hello World Example</description>
14-
<url>https://www.codenotfound.com/spring-batch-hello-world-example.html</url>
13+
<url>https://www.codenotfound.com/spring-batch-example.html</url>
1514

1615
<parent>
1716
<groupId>org.springframework.boot</groupId>

‎spring-batch-hello-world/src/main/java/com/codenotfound/batch/job/HelloWorldJobConfig.java

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,26 @@
1919
public class HelloWorldJobConfig {
2020

2121
@Bean
22-
public Job helloWorlJob(JobBuilderFactory jobBuilders, StepBuilderFactory stepBuilders) {
23-
return jobBuilders.get("helloWorldJob").start(helloWorldStep(stepBuilders)).build();
22+
public Job helloWorlJob(JobBuilderFactory jobBuilders,
23+
StepBuilderFactory stepBuilders) {
24+
return jobBuilders.get("helloWorldJob")
25+
.start(helloWorldStep(stepBuilders)).build();
2426
}
2527

2628
@Bean
2729
public Step helloWorldStep(StepBuilderFactory stepBuilders) {
28-
return stepBuilders.get("helloWorldStep").<Person, String>chunk(10).reader(reader())
30+
return stepBuilders.get("helloWorldStep")
31+
.<Person, String>chunk(10).reader(reader())
2932
.processor(processor()).writer(writer()).build();
3033
}
3134

3235
@Bean
3336
public FlatFileItemReader<Person> reader() {
34-
return new FlatFileItemReaderBuilder<Person>().name("personItemReader")
35-
.resource(new ClassPathResource("csv/persons.csv")).delimited()
36-
.names(new String[] {"firstName", "lastName"}).targetType(Person.class).build();
37+
return new FlatFileItemReaderBuilder<Person>()
38+
.name("personItemReader")
39+
.resource(new ClassPathResource("csv/persons.csv"))
40+
.delimited().names(new String[] {"firstName", "lastName"})
41+
.targetType(Person.class).build();
3742
}
3843

3944
@Bean
@@ -43,8 +48,10 @@ public PersonItemProcessor processor() {
4348

4449
@Bean
4550
public FlatFileItemWriter<String> writer() {
46-
return new FlatFileItemWriterBuilder<String>().name("greetingItemWriter")
47-
.resource(new FileSystemResource("target/test-outputs/greetings.txt"))
51+
return new FlatFileItemWriterBuilder<String>()
52+
.name("greetingItemWriter")
53+
.resource(new FileSystemResource(
54+
"target/test-outputs/greetings.txt"))
4855
.lineAggregator(new PassThroughLineAggregator<>()).build();
4956
}
5057
}

‎spring-batch-hello-world/src/main/java/com/codenotfound/batch/job/PersonItemProcessor.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
import org.springframework.batch.item.ItemProcessor;
66
import com.codenotfound.model.Person;
77

8-
public class PersonItemProcessor implements ItemProcessor<Person, String> {
8+
public class PersonItemProcessor
9+
implements ItemProcessor<Person, String> {
910

10-
private static final Logger LOGGER = LoggerFactory.getLogger(PersonItemProcessor.class);
11+
private static final Logger LOGGER =
12+
LoggerFactory.getLogger(PersonItemProcessor.class);
1113

1214
@Override
1315
public String process(Person person) throws Exception {
14-
String greeting = "Hello " + person.getFirstName() + " " + person.getLastName() + "!";
16+
String greeting = "Hello " + person.getFirstName() + " "
17+
+ person.getLastName() + "!";
1518

1619
LOGGER.info("converting '{}' into '{}'", person, greeting);
1720
return greeting;

‎spring-batch-hello-world/src/test/java/com/codenotfound/batch/SpringBatchApplicationTests.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import com.codenotfound.batch.job.HelloWorldJobConfig;
1818

1919
@RunWith(SpringRunner.class)
20-
@SpringBootTest(classes = {SpringBatchApplicationTests.BatchTestConfig.class})
20+
@SpringBootTest(
21+
classes = {SpringBatchApplicationTests.BatchTestConfig.class})
2122
public class SpringBatchApplicationTests {
2223

2324
@Autowired
@@ -26,7 +27,8 @@ public class SpringBatchApplicationTests {
2627
@Test
2728
public void testHelloWorldJob() throws Exception {
2829
JobExecution jobExecution = jobLauncherTestUtils.launchJob();
29-
assertThat(jobExecution.getExitStatus().getExitCode()).isEqualTo("COMPLETED");
30+
assertThat(jobExecution.getExitStatus().getExitCode())
31+
.isEqualTo("COMPLETED");
3032
}
3133

3234
@Configuration
@@ -37,8 +39,10 @@ static class BatchTestConfig {
3739
private Job helloWorlJob;
3840

3941
@Bean
40-
JobLauncherTestUtils jobLauncherTestUtils() throws NoSuchJobException {
41-
JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils();
42+
JobLauncherTestUtils jobLauncherTestUtils()
43+
throws NoSuchJobException {
44+
JobLauncherTestUtils jobLauncherTestUtils =
45+
new JobLauncherTestUtils();
4246
jobLauncherTestUtils.setJob(helloWorlJob);
4347

4448
return jobLauncherTestUtils;

‎spring-batch-tasklet/src/main/java/com/codenotfound/batch/job/CapitalizeNamesJobConfig.java

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,53 @@
2424
@Configuration
2525
public class CapitalizeNamesJobConfig {
2626

27-
private static final Logger LOGGER = LoggerFactory.getLogger(CapitalizeNamesJobConfig.class);
27+
private static final Logger LOGGER =
28+
LoggerFactory.getLogger(CapitalizeNamesJobConfig.class);
2829

2930
@Bean
30-
public Job capitalizeNamesJob(JobBuilderFactory jobBuilders, StepBuilderFactory stepBuilders) {
31-
return jobBuilders.get("capitalizeNamesJob").start(capitalizeNamesStep(stepBuilders))
31+
public Job capitalizeNamesJob(JobBuilderFactory jobBuilders,
32+
StepBuilderFactory stepBuilders) {
33+
return jobBuilders.get("capitalizeNamesJob")
34+
.start(capitalizeNamesStep(stepBuilders))
3235
.next(deleteFilesStep(stepBuilders)).build();
3336
}
3437

3538
@Bean
3639
public Step capitalizeNamesStep(StepBuilderFactory stepBuilders) {
37-
return stepBuilders.get("capitalizeNamesStep").<Person, Person>chunk(10)
38-
.reader(multiItemReader()).processor(itemProcessor()).writer(itemWriter()).build();
40+
return stepBuilders.get("capitalizeNamesStep")
41+
.<Person, Person>chunk(10).reader(multiItemReader())
42+
.processor(itemProcessor()).writer(itemWriter()).build();
3943
}
4044

4145
@Bean
4246
public Step deleteFilesStep(StepBuilderFactory stepBuilders) {
43-
return stepBuilders.get("deleteFilesStep").tasklet(fileDeletingTasklet()).build();
47+
return stepBuilders.get("deleteFilesStep")
48+
.tasklet(fileDeletingTasklet()).build();
4449
}
4550

4651
@Bean
4752
public MultiResourceItemReader<Person> multiItemReader() {
48-
ResourcePatternResolver patternResolver = new PathMatchingResourcePatternResolver();
53+
ResourcePatternResolver patternResolver =
54+
new PathMatchingResourcePatternResolver();
4955
Resource[] resources = null;
5056
try {
51-
resources = patternResolver.getResources("file:target/test-inputs/*.csv");
57+
resources = patternResolver
58+
.getResources("file:target/test-inputs/*.csv");
5259
} catch (IOException e) {
5360
LOGGER.error("error reading files", e);
5461
}
5562

56-
return new MultiResourceItemReaderBuilder<Person>().name("multiPersonItemReader")
57-
.delegate(itemReader()).resources(resources).setStrict(true).build();
63+
return new MultiResourceItemReaderBuilder<Person>()
64+
.name("multiPersonItemReader").delegate(itemReader())
65+
.resources(resources).setStrict(true).build();
5866
}
5967

6068
@Bean
6169
public FlatFileItemReader<Person> itemReader() {
62-
return new FlatFileItemReaderBuilder<Person>().name("personItemReader").delimited()
63-
.names(new String[] {"firstName", "lastName"}).targetType(Person.class).build();
70+
return new FlatFileItemReaderBuilder<Person>()
71+
.name("personItemReader").delimited()
72+
.names(new String[] {"firstName", "lastName"})
73+
.targetType(Person.class).build();
6474
}
6575

6676
@Bean
@@ -70,13 +80,17 @@ public PersonItemProcessor itemProcessor() {
7080

7181
@Bean
7282
public FlatFileItemWriter<Person> itemWriter() {
73-
return new FlatFileItemWriterBuilder<Person>().name("personItemWriter")
74-
.resource(new FileSystemResource("target/test-outputs/persons.txt")).delimited()
75-
.delimiter(", ").names(new String[] {"firstName", "lastName"}).build();
83+
return new FlatFileItemWriterBuilder<Person>()
84+
.name("personItemWriter")
85+
.resource(new FileSystemResource(
86+
"target/test-outputs/persons.txt"))
87+
.delimited().delimiter(", ")
88+
.names(new String[] {"firstName", "lastName"}).build();
7689
}
7790

7891
@Bean
7992
public FileDeletingTasklet fileDeletingTasklet() {
80-
return new FileDeletingTasklet(new FileSystemResource("target/test-inputs"));
93+
return new FileDeletingTasklet(
94+
new FileSystemResource("target/test-inputs"));
8195
}
8296
}

‎spring-batch-tasklet/src/main/java/com/codenotfound/batch/job/FileDeletingTasklet.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
public class FileDeletingTasklet implements Tasklet {
1919

20-
private static final Logger LOGGER = LoggerFactory.getLogger(FileDeletingTasklet.class);
20+
private static final Logger LOGGER =
21+
LoggerFactory.getLogger(FileDeletingTasklet.class);
2122

2223
private Resource directory;
2324

@@ -26,12 +27,16 @@ public FileDeletingTasklet(Resource directory) {
2627
}
2728

2829
@Override
29-
public RepeatStatus execute(StepContribution stepContribution, ChunkContext chunkContext) {
30-
try (Stream<Path> walk = Files.walk(Paths.get(directory.getFile().getPath()))) {
31-
walk.filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
30+
public RepeatStatus execute(StepContribution stepContribution,
31+
ChunkContext chunkContext) {
32+
try (Stream<Path> walk =
33+
Files.walk(Paths.get(directory.getFile().getPath()))) {
34+
walk.filter(Files::isRegularFile).map(Path::toFile)
35+
.forEach(File::delete);
3236
} catch (IOException e) {
3337
LOGGER.error("error deleting files", e);
34-
throw new UnexpectedJobExecutionException("unable to delete files");
38+
throw new UnexpectedJobExecutionException(
39+
"unable to delete files");
3540
}
3641

3742
return RepeatStatus.FINISHED;

‎spring-batch-tasklet/src/main/java/com/codenotfound/batch/job/PersonItemProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import org.springframework.batch.item.ItemProcessor;
66
import com.codenotfound.model.Person;
77

8-
public class PersonItemProcessor implements ItemProcessor<Person, Person> {
8+
public class PersonItemProcessor
9+
implements ItemProcessor<Person, Person> {
910

10-
private static final Logger LOGGER = LoggerFactory.getLogger(PersonItemProcessor.class);
11+
private static final Logger LOGGER =
12+
LoggerFactory.getLogger(PersonItemProcessor.class);
1113

1214
@Override
1315
public Person process(Person person) throws Exception {

‎spring-batch-tasklet/src/test/java/com/codenotfound/batch/SpringBatchApplicationTests.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import com.codenotfound.batch.job.CapitalizeNamesJobConfig;
2727

2828
@RunWith(SpringRunner.class)
29-
@SpringBootTest(classes = {SpringBatchApplicationTests.BatchTestConfig.class})
29+
@SpringBootTest(
30+
classes = {SpringBatchApplicationTests.BatchTestConfig.class})
3031
public class SpringBatchApplicationTests {
3132

3233
private static Path csvFilesPath, testInputsPath;
@@ -35,7 +36,8 @@ public class SpringBatchApplicationTests {
3536
private JobLauncherTestUtils jobLauncherTestUtils;
3637

3738
@BeforeClass
38-
public static void copyFiles() throws URISyntaxException, IOException {
39+
public static void copyFiles()
40+
throws URISyntaxException, IOException {
3941
csvFilesPath = Paths.get(new ClassPathResource("csv").getURI());
4042
testInputsPath = Paths.get("target/test-inputs");
4143
try {
@@ -50,7 +52,8 @@ public static void copyFiles() throws URISyntaxException, IOException {
5052
@Test
5153
public void testHelloWorldJob() throws Exception {
5254
JobExecution jobExecution = jobLauncherTestUtils.launchJob();
53-
assertThat(jobExecution.getExitStatus().getExitCode()).isEqualTo("COMPLETED");
55+
assertThat(jobExecution.getExitStatus().getExitCode())
56+
.isEqualTo("COMPLETED");
5457

5558
// check that all files are deleted
5659
File testInput = testInputsPath.toFile();
@@ -65,8 +68,10 @@ static class BatchTestConfig {
6568
private Job capitalizeNamesJob;
6669

6770
@Bean
68-
JobLauncherTestUtils jobLauncherTestUtils() throws NoSuchJobException {
69-
JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils();
71+
JobLauncherTestUtils jobLauncherTestUtils()
72+
throws NoSuchJobException {
73+
JobLauncherTestUtils jobLauncherTestUtils =
74+
new JobLauncherTestUtils();
7075
jobLauncherTestUtils.setJob(capitalizeNamesJob);
7176

7277
return jobLauncherTestUtils;

0 commit comments

Comments
 (0)