Skip to content

Commit 7223f60

Browse files
cppwfsmminella
cppwfs
authored and
mminella
committed
Moved Flat File Autoconfigs, props and tests to the flatfile package
1 parent 7c23c31 commit 7223f60

File tree

8 files changed

+50
-47
lines changed

8 files changed

+50
-47
lines changed

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfiguration.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java‎

Lines changed: 1 addition & 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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

1919
import java.util.Map;
2020

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderProperties.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderProperties.java‎

Lines changed: 1 addition & 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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

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

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfiguration.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java‎

Lines changed: 1 addition & 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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

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

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterProperties.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterProperties.java‎

Lines changed: 1 addition & 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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

1919
import java.util.Locale;
2020

‎spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring-configuration-metadata.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
},
88
{
99
"name": "spring.batch.job.flatfilereader",
10-
"type": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
11-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
10+
"type": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
11+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
1212
},
1313
{
1414
"name": "spring.batch.job.flatfilewriter",
15-
"type": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
16-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
15+
"type": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
16+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
1717
}
1818
],
1919
"properties": [
@@ -25,194 +25,194 @@
2525
{
2626
"name": "spring.batch.job.flatfilereader.comments",
2727
"type": "java.util.List<java.lang.String>",
28-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
28+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
2929
},
3030
{
3131
"name": "spring.batch.job.flatfilereader.current-item-count",
3232
"type": "java.lang.Integer",
33-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
33+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
3434
"defaultValue": 0
3535
},
3636
{
3737
"name": "spring.batch.job.flatfilereader.delimited",
3838
"type": "java.lang.Boolean",
39-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
39+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
4040
"defaultValue": false
4141
},
4242
{
4343
"name": "spring.batch.job.flatfilereader.delimiter",
4444
"type": "java.lang.String",
45-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
45+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
4646
},
4747
{
4848
"name": "spring.batch.job.flatfilereader.encoding",
4949
"type": "java.lang.String",
50-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
50+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
5151
},
5252
{
5353
"name": "spring.batch.job.flatfilereader.fixed-length",
5454
"type": "java.lang.Boolean",
55-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
55+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
5656
"defaultValue": false
5757
},
5858
{
5959
"name": "spring.batch.job.flatfilereader.included-fields",
6060
"type": "java.util.List<java.lang.Integer>",
61-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
61+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
6262
},
6363
{
6464
"name": "spring.batch.job.flatfilereader.lines-to-skip",
6565
"type": "java.lang.Integer",
66-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
66+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
6767
"defaultValue": 0
6868
},
6969
{
7070
"name": "spring.batch.job.flatfilereader.max-item-count",
7171
"type": "java.lang.Integer",
72-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
72+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
7373
},
7474
{
7575
"name": "spring.batch.job.flatfilereader.name",
7676
"type": "java.lang.String",
77-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
77+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
7878
},
7979
{
8080
"name": "spring.batch.job.flatfilereader.names",
8181
"type": "java.lang.String[]",
82-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
82+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
8383
},
8484
{
8585
"name": "spring.batch.job.flatfilereader.parsing-strict",
8686
"type": "java.lang.Boolean",
87-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
87+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
8888
"defaultValue": true
8989
},
9090
{
9191
"name": "spring.batch.job.flatfilereader.quote-character",
9292
"type": "java.lang.Character",
93-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
93+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
9494
},
9595
{
9696
"name": "spring.batch.job.flatfilereader.ranges",
9797
"type": "java.util.List<org.springframework.batch.item.file.transform.Range>",
98-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
98+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
9999
},
100100
{
101101
"name": "spring.batch.job.flatfilereader.resource",
102102
"type": "org.springframework.core.io.Resource",
103-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties"
103+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties"
104104
},
105105
{
106106
"name": "spring.batch.job.flatfilereader.save-state",
107107
"type": "java.lang.Boolean",
108-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
108+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
109109
"defaultValue": true
110110
},
111111
{
112112
"name": "spring.batch.job.flatfilereader.strict",
113113
"type": "java.lang.Boolean",
114-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderProperties",
114+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderProperties",
115115
"defaultValue": true
116116
},
117117
{
118118
"name": "spring.batch.job.flatfilewriter.append",
119119
"type": "java.lang.Boolean",
120-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
120+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
121121
"defaultValue": false
122122
},
123123
{
124124
"name": "spring.batch.job.flatfilewriter.delimited",
125125
"type": "java.lang.Boolean",
126-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
126+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
127127
"defaultValue": false
128128
},
129129
{
130130
"name": "spring.batch.job.flatfilewriter.delimiter",
131131
"type": "java.lang.String",
132-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
132+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
133133
"defaultValue": ","
134134
},
135135
{
136136
"name": "spring.batch.job.flatfilewriter.encoding",
137137
"type": "java.lang.String",
138-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
138+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
139139
},
140140
{
141141
"name": "spring.batch.job.flatfilewriter.force-sync",
142142
"type": "java.lang.Boolean",
143-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
143+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
144144
"defaultValue": false
145145
},
146146
{
147147
"name": "spring.batch.job.flatfilewriter.format",
148148
"type": "java.lang.String",
149-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
149+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
150150
},
151151
{
152152
"name": "spring.batch.job.flatfilewriter.formatted",
153153
"type": "java.lang.Boolean",
154-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
154+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
155155
"defaultValue": false
156156
},
157157
{
158158
"name": "spring.batch.job.flatfilewriter.line-separator",
159159
"type": "java.lang.String",
160-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
160+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
161161
},
162162
{
163163
"name": "spring.batch.job.flatfilewriter.locale",
164164
"type": "java.util.Locale",
165-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
165+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
166166
},
167167
{
168168
"name": "spring.batch.job.flatfilewriter.maximum-length",
169169
"type": "java.lang.Integer",
170-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
170+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
171171
"defaultValue": 0
172172
},
173173
{
174174
"name": "spring.batch.job.flatfilewriter.minimum-length",
175175
"type": "java.lang.Integer",
176-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
176+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
177177
"defaultValue": 0
178178
},
179179
{
180180
"name": "spring.batch.job.flatfilewriter.name",
181181
"type": "java.lang.String",
182-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
182+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
183183
},
184184
{
185185
"name": "spring.batch.job.flatfilewriter.names",
186186
"type": "java.lang.String[]",
187-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
187+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
188188
},
189189
{
190190
"name": "spring.batch.job.flatfilewriter.resource",
191191
"type": "org.springframework.core.io.Resource",
192-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
192+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
193193
},
194194
{
195195
"name": "spring.batch.job.flatfilewriter.save-state",
196196
"type": "java.lang.Boolean",
197-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
197+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
198198
"defaultValue": true
199199
},
200200
{
201201
"name": "spring.batch.job.flatfilewriter.should-delete-if-empty",
202202
"type": "java.lang.Boolean",
203-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
203+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
204204
"defaultValue": false
205205
},
206206
{
207207
"name": "spring.batch.job.flatfilewriter.should-delete-if-exists",
208208
"type": "java.lang.Boolean",
209-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties",
209+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties",
210210
"defaultValue": true
211211
},
212212
{
213213
"name": "spring.batch.job.flatfilewriter.transactional",
214214
"type": "java.lang.Boolean",
215-
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterProperties"
215+
"sourceType": "org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterProperties"
216216
},
217217
{
218218
"name": "spring.batch.job.job-name",

‎spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring.factories‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.task.batch.autoconfigure.FlatFileItemReaderAutoConfiguration,\
1+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemReaderAutoConfiguration,\
22
org.springframework.cloud.task.batch.autoconfigure.RangeConverter,\
33
org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration,\
4-
org.springframework.cloud.task.batch.autoconfigure.FlatFileItemWriterAutoConfiguration, \
4+
org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterAutoConfiguration, \
55
org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcItemWriterAutoConfiguration, \
66
org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcCursorItemReaderAutoConfiguration

‎spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfigurationTests.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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

1919
import java.util.ArrayList;
2020
import java.util.HashMap;
@@ -44,6 +44,8 @@
4444
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4545
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4646
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
47+
import org.springframework.cloud.task.batch.autoconfigure.RangeConverter;
48+
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
4749
import org.springframework.context.annotation.Bean;
4850
import org.springframework.context.annotation.Configuration;
4951

‎spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java‎ renamed to ‎spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfigurationTests.java‎

Lines changed: 2 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.cloud.task.batch.autoconfigure;
17+
package org.springframework.cloud.task.batch.autoconfigure.flatfile;
1818

1919
import java.io.File;
2020
import java.io.InputStreamReader;
@@ -45,6 +45,7 @@
4545
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4646
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4747
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
48+
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
4849
import org.springframework.context.annotation.Bean;
4950
import org.springframework.context.annotation.Configuration;
5051
import org.springframework.core.io.ClassPathResource;

0 commit comments

Comments
 (0)