Skip to content

Commit ac72192

Browse files
committed
Switch to tabs, and adjust tabsizing in asciidoctor.
1 parent 6bcaebb commit ac72192

File tree

5 files changed

+94
-94
lines changed

5 files changed

+94
-94
lines changed

README.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ represent a row of data, as the following example (from
9090
`src/main/java/com/example/batchprocessing/Person.java`) shows:
9191

9292
====
93-
[source,java]
93+
[source,java,tabsize=2]
9494
----
9595
include::complete/src/main/java/com/example/batchprocessing/Person.java[]
9696
----
@@ -109,7 +109,7 @@ to uppercase. The following listing (from
109109
so:
110110

111111
====
112-
[source,java]
112+
[source,java,tabsize=2]
113113
----
114114
include::complete/src/main/java/com/example/batchprocessing/PersonItemProcessor.java[]
115115
----
@@ -133,7 +133,7 @@ To configure your job, you must first create a Spring `@Configuration` class lik
133133
`src/main/java/com/exampe/batchprocessing/BatchConfiguration.java`:
134134

135135
====
136-
[source,java]
136+
[source,java,tabsize=2]
137137
----
138138
include::complete/src/main/java/com/example/batchprocessing/BatchConfiguration.java[tag=setup]
139139
@@ -149,7 +149,7 @@ support jobs and save you a lot of leg work. This example uses a memory-based da
149149
Now add the following beans to your `BatchConfiguration` class to define a reader, a processor, and a writer:
150150

151151
====
152-
[source,java,indent=0]
152+
[source,java,tabsize=2,indent=0]
153153
----
154154
include::complete/src/main/java/com/example/batchprocessing/BatchConfiguration.java[tag=readerwriterprocessor]
155155
----
@@ -170,7 +170,7 @@ The last chunk (from `src/main/java/com/example/batchprocessing/BatchConfigurati
170170
shows the actual job configuration:
171171

172172
====
173-
[source,java,indent=0]
173+
[source,java,tabsize=2,indent=0]
174174
----
175175
include::complete/src/main/java/com/example/batchprocessing/BatchConfiguration.java[tag=jobstep]
176176
----
@@ -197,7 +197,7 @@ following example (from
197197
such a class:
198198

199199
====
200-
[source,java]
200+
[source,java,tabsize=2]
201201
----
202202
include::/complete/src/main/java/com/example/batchprocessing/JobCompletionNotificationListener.java[]
203203
----
@@ -216,7 +216,7 @@ works without further modification. The folowing listing (from
216216
application class:
217217

218218
====
219-
[source,java]
219+
[source,java,tabsize=2]
220220
----
221221
include::complete/src/main/java/com/example/batchprocessing/BatchProcessingApplication.java[]
222222
----

complete/src/main/java/com/example/batchprocessing/BatchConfiguration.java

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,61 @@
2828
@EnableBatchProcessing
2929
public class BatchConfiguration {
3030

31-
@Autowired
32-
public JobBuilderFactory jobBuilderFactory;
31+
@Autowired
32+
public JobBuilderFactory jobBuilderFactory;
3333

34-
@Autowired
35-
public StepBuilderFactory stepBuilderFactory;
36-
// end::setup[]
34+
@Autowired
35+
public StepBuilderFactory stepBuilderFactory;
36+
// end::setup[]
3737

38-
// tag::readerwriterprocessor[]
39-
@Bean
40-
public FlatFileItemReader<Person> reader() {
41-
return new FlatFileItemReaderBuilder<Person>()
42-
.name("personItemReader")
43-
.resource(new ClassPathResource("sample-data.csv"))
44-
.delimited()
45-
.names(new String[]{"firstName", "lastName"})
46-
.fieldSetMapper(new BeanWrapperFieldSetMapper<Person>() {{
47-
setTargetType(Person.class);
48-
}})
49-
.build();
50-
}
38+
// tag::readerwriterprocessor[]
39+
@Bean
40+
public FlatFileItemReader<Person> reader() {
41+
return new FlatFileItemReaderBuilder<Person>()
42+
.name("personItemReader")
43+
.resource(new ClassPathResource("sample-data.csv"))
44+
.delimited()
45+
.names(new String[]{"firstName", "lastName"})
46+
.fieldSetMapper(new BeanWrapperFieldSetMapper<Person>() {{
47+
setTargetType(Person.class);
48+
}})
49+
.build();
50+
}
5151

52-
@Bean
53-
public PersonItemProcessor processor() {
54-
return new PersonItemProcessor();
55-
}
52+
@Bean
53+
public PersonItemProcessor processor() {
54+
return new PersonItemProcessor();
55+
}
5656

57-
@Bean
58-
public JdbcBatchItemWriter<Person> writer(DataSource dataSource) {
59-
return new JdbcBatchItemWriterBuilder<Person>()
60-
.itemSqlParameterSourceProvider(new BeanPropertyItemSqlParameterSourceProvider<>())
61-
.sql("INSERT INTO people (first_name, last_name) VALUES (:firstName, :lastName)")
62-
.dataSource(dataSource)
63-
.build();
64-
}
65-
// end::readerwriterprocessor[]
57+
@Bean
58+
public JdbcBatchItemWriter<Person> writer(DataSource dataSource) {
59+
return new JdbcBatchItemWriterBuilder<Person>()
60+
.itemSqlParameterSourceProvider(new BeanPropertyItemSqlParameterSourceProvider<>())
61+
.sql("INSERT INTO people (first_name, last_name) VALUES (:firstName, :lastName)")
62+
.dataSource(dataSource)
63+
.build();
64+
}
65+
// end::readerwriterprocessor[]
6666

67-
// tag::jobstep[]
68-
@Bean
69-
public Job importUserJob(JobCompletionNotificationListener listener, Step step1) {
70-
return jobBuilderFactory.get("importUserJob")
71-
.incrementer(new RunIdIncrementer())
72-
.listener(listener)
73-
.flow(step1)
74-
.end()
75-
.build();
76-
}
67+
// tag::jobstep[]
68+
@Bean
69+
public Job importUserJob(JobCompletionNotificationListener listener, Step step1) {
70+
return jobBuilderFactory.get("importUserJob")
71+
.incrementer(new RunIdIncrementer())
72+
.listener(listener)
73+
.flow(step1)
74+
.end()
75+
.build();
76+
}
7777

78-
@Bean
79-
public Step step1(JdbcBatchItemWriter<Person> writer) {
80-
return stepBuilderFactory.get("step1")
81-
.<Person, Person> chunk(10)
82-
.reader(reader())
83-
.processor(processor())
84-
.writer(writer)
85-
.build();
86-
}
87-
// end::jobstep[]
78+
@Bean
79+
public Step step1(JdbcBatchItemWriter<Person> writer) {
80+
return stepBuilderFactory.get("step1")
81+
.<Person, Person> chunk(10)
82+
.reader(reader())
83+
.processor(processor())
84+
.writer(writer)
85+
.build();
86+
}
87+
// end::jobstep[]
8888
}

complete/src/main/java/com/example/batchprocessing/BatchProcessingApplication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@SpringBootApplication
77
public class BatchProcessingApplication {
88

9-
public static void main(String[] args) throws Exception {
10-
SpringApplication.run(BatchProcessingApplication.class, args);
11-
}
9+
public static void main(String[] args) throws Exception {
10+
SpringApplication.run(BatchProcessingApplication.class, args);
11+
}
1212
}

complete/src/main/java/com/example/batchprocessing/Person.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22

33
public class Person {
44

5-
private String lastName;
6-
private String firstName;
5+
private String lastName;
6+
private String firstName;
77

8-
public Person() {
9-
}
8+
public Person() {
9+
}
1010

11-
public Person(String firstName, String lastName) {
12-
this.firstName = firstName;
13-
this.lastName = lastName;
14-
}
11+
public Person(String firstName, String lastName) {
12+
this.firstName = firstName;
13+
this.lastName = lastName;
14+
}
1515

16-
public void setFirstName(String firstName) {
17-
this.firstName = firstName;
18-
}
16+
public void setFirstName(String firstName) {
17+
this.firstName = firstName;
18+
}
1919

20-
public String getFirstName() {
21-
return firstName;
22-
}
20+
public String getFirstName() {
21+
return firstName;
22+
}
2323

24-
public String getLastName() {
25-
return lastName;
26-
}
24+
public String getLastName() {
25+
return lastName;
26+
}
2727

28-
public void setLastName(String lastName) {
29-
this.lastName = lastName;
30-
}
28+
public void setLastName(String lastName) {
29+
this.lastName = lastName;
30+
}
3131

32-
@Override
33-
public String toString() {
34-
return "firstName: " + firstName + ", lastName: " + lastName;
35-
}
32+
@Override
33+
public String toString() {
34+
return "firstName: " + firstName + ", lastName: " + lastName;
35+
}
3636

3737
}

complete/src/main/java/com/example/batchprocessing/PersonItemProcessor.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
public class PersonItemProcessor implements ItemProcessor<Person, Person> {
99

10-
private static final Logger log = LoggerFactory.getLogger(PersonItemProcessor.class);
10+
private static final Logger log = LoggerFactory.getLogger(PersonItemProcessor.class);
1111

12-
@Override
13-
public Person process(final Person person) throws Exception {
14-
final String firstName = person.getFirstName().toUpperCase();
15-
final String lastName = person.getLastName().toUpperCase();
12+
@Override
13+
public Person process(final Person person) throws Exception {
14+
final String firstName = person.getFirstName().toUpperCase();
15+
final String lastName = person.getLastName().toUpperCase();
1616

17-
final Person transformedPerson = new Person(firstName, lastName);
17+
final Person transformedPerson = new Person(firstName, lastName);
1818

19-
log.info("Converting (" + person + ") into (" + transformedPerson + ")");
19+
log.info("Converting (" + person + ") into (" + transformedPerson + ")");
2020

21-
return transformedPerson;
22-
}
21+
return transformedPerson;
22+
}
2323

2424
}

0 commit comments

Comments
 (0)