Skip to content

Commit 63ab5b1

Browse files
cppwfscppwfs
committed
Update versions and update code format
1 parent 6c5656e commit 63ab5b1

95 files changed

Lines changed: 1224 additions & 1035 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
<properties>
111111

112112
<spring-cloud-stream.version>4.1.0-SNAPSHOT</spring-cloud-stream.version>
113-
<spring-cloud-deployer.version>2.8.3</spring-cloud-deployer.version>
114-
<spring-cloud-deployer-local.version>2.8.3
113+
<spring-cloud-deployer.version>2.9.0</spring-cloud-deployer.version>
114+
<spring-cloud-deployer-local.version>2.9.0
115115
</spring-cloud-deployer-local.version>
116116
<spring-cloud-stream-binder-rabbit.version>${spring-cloud-stream.version}
117117
</spring-cloud-stream-binder-rabbit.version>
@@ -127,7 +127,7 @@
127127
<maven-checkstyle-plugin.includeTestSourceDirectory>true
128128
</maven-checkstyle-plugin.includeTestSourceDirectory>
129129
<java.version>17</java.version>
130-
<spring-javaformat-maven-plugin.version>0.0.34</spring-javaformat-maven-plugin.version>
130+
<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
131131
</properties>
132132

133133
<build>

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/RangeConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ else if (columns.length == 2) {
4848
}
4949
else {
5050
throw new IllegalArgumentException(String
51-
.format("%s is in an illegal format. Ranges must be specified as startIndex-endIndex", source));
51+
.format("%s is in an illegal format. Ranges must be specified as startIndex-endIndex", source));
5252
}
5353
}
5454

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ public Job job(ItemReader<Map<String, Object>> itemReader, ItemWriter<Map<String
8181

8282
SimpleStepBuilder<Map<String, Object>, Map<String, Object>> stepBuilder = new StepBuilder(
8383
this.properties.getStepName(), this.jobRepository)
84-
.<Map<String, Object>, Map<String, Object>>chunk(this.properties.getChunkSize(),
85-
this.transactionManager)
86-
.reader(itemReader);
84+
.<Map<String, Object>, Map<String, Object>>chunk(this.properties.getChunkSize(), this.transactionManager)
85+
.reader(itemReader);
8786

8887
stepBuilder.processor(this.itemProcessor);
8988

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,15 @@ public FlatFileItemReader<Map<String, Object>> itemReader(@Autowired(required =
6767
@Autowired(required = false) LineCallbackHandler skippedLinesCallback,
6868
@Autowired(required = false) RecordSeparatorPolicy recordSeparatorPolicy) {
6969
FlatFileItemReaderBuilder<Map<String, Object>> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder<Map<String, Object>>()
70-
.name(this.properties.getName()).resource(this.properties.getResource())
71-
.saveState(this.properties.isSaveState()).maxItemCount(this.properties.getMaxItemCount())
72-
.currentItemCount(this.properties.getCurrentItemCount()).strict(this.properties.isStrict())
73-
.encoding(this.properties.getEncoding()).linesToSkip(this.properties.getLinesToSkip())
74-
.comments(this.properties.getComments().toArray(new String[this.properties.getComments().size()]));
70+
.name(this.properties.getName())
71+
.resource(this.properties.getResource())
72+
.saveState(this.properties.isSaveState())
73+
.maxItemCount(this.properties.getMaxItemCount())
74+
.currentItemCount(this.properties.getCurrentItemCount())
75+
.strict(this.properties.isStrict())
76+
.encoding(this.properties.getEncoding())
77+
.linesToSkip(this.properties.getLinesToSkip())
78+
.comments(this.properties.getComments().toArray(new String[this.properties.getComments().size()]));
7579

7680
mapFlatFileItemReaderBuilder.lineTokenizer(lineTokenizer);
7781
if (recordSeparatorPolicy != null) {
@@ -82,19 +86,23 @@ public FlatFileItemReader<Map<String, Object>> itemReader(@Autowired(required =
8286
mapFlatFileItemReaderBuilder.skippedLinesCallback(skippedLinesCallback);
8387

8488
if (this.properties.isDelimited()) {
85-
mapFlatFileItemReaderBuilder.delimited().quoteCharacter(this.properties.getQuoteCharacter())
86-
.delimiter(this.properties.getDelimiter())
87-
.includedFields(this.properties.getIncludedFields().toArray(new Integer[0]))
88-
.names(this.properties.getNames()).beanMapperStrict(this.properties.isParsingStrict())
89-
.fieldSetMapper(new MapFieldSetMapper());
89+
mapFlatFileItemReaderBuilder.delimited()
90+
.quoteCharacter(this.properties.getQuoteCharacter())
91+
.delimiter(this.properties.getDelimiter())
92+
.includedFields(this.properties.getIncludedFields().toArray(new Integer[0]))
93+
.names(this.properties.getNames())
94+
.beanMapperStrict(this.properties.isParsingStrict())
95+
.fieldSetMapper(new MapFieldSetMapper());
9096
}
9197
else if (this.properties.isFixedLength()) {
9298
RangeConverter rangeConverter = new RangeConverter();
9399
List<Range> ranges = new ArrayList<>();
94100
this.properties.getRanges().forEach(range -> ranges.add(rangeConverter.convert(range)));
95-
mapFlatFileItemReaderBuilder.fixedLength().columns(ranges.toArray(new Range[0]))
96-
.names(this.properties.getNames()).fieldSetMapper(new MapFieldSetMapper())
97-
.beanMapperStrict(this.properties.isParsingStrict());
101+
mapFlatFileItemReaderBuilder.fixedLength()
102+
.columns(ranges.toArray(new Range[0]))
103+
.names(this.properties.getNames())
104+
.fieldSetMapper(new MapFieldSetMapper())
105+
.beanMapperStrict(this.properties.isParsingStrict());
98106
}
99107

100108
return mapFlatFileItemReaderBuilder.build();

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,22 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited()) && thi
8080
}
8181

8282
FlatFileItemWriterBuilder<Map<String, Object>> builder = new FlatFileItemWriterBuilder<Map<String, Object>>()
83-
.name(this.properties.getName()).resource((WritableResource) this.properties.getResource())
84-
.append(this.properties.isAppend()).encoding(this.properties.getEncoding())
85-
.forceSync(this.properties.isForceSync()).lineSeparator(this.properties.getLineSeparator())
86-
.saveState(this.properties.isSaveState()).shouldDeleteIfEmpty(this.properties.isShouldDeleteIfEmpty())
87-
.shouldDeleteIfExists(this.properties.isShouldDeleteIfExists())
88-
.transactional(this.properties.isTransactional()).headerCallback(this.headerCallback)
89-
.footerCallback(this.footerCallback);
83+
.name(this.properties.getName())
84+
.resource((WritableResource) this.properties.getResource())
85+
.append(this.properties.isAppend())
86+
.encoding(this.properties.getEncoding())
87+
.forceSync(this.properties.isForceSync())
88+
.lineSeparator(this.properties.getLineSeparator())
89+
.saveState(this.properties.isSaveState())
90+
.shouldDeleteIfEmpty(this.properties.isShouldDeleteIfEmpty())
91+
.shouldDeleteIfExists(this.properties.isShouldDeleteIfExists())
92+
.transactional(this.properties.isTransactional())
93+
.headerCallback(this.headerCallback)
94+
.footerCallback(this.footerCallback);
9095

9196
if (this.properties.isDelimited()) {
9297
FlatFileItemWriterBuilder.DelimitedBuilder<Map<String, Object>> delimitedBuilder = builder.delimited()
93-
.delimiter(this.properties.getDelimiter());
98+
.delimiter(this.properties.getDelimiter());
9499

95100
if (this.fieldExtractor != null) {
96101
delimitedBuilder.fieldExtractor(this.fieldExtractor);
@@ -101,9 +106,10 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited()) && thi
101106
}
102107
else if (this.properties.isFormatted()) {
103108
FlatFileItemWriterBuilder.FormattedBuilder<Map<String, Object>> formattedBuilder = builder.formatted()
104-
.format(this.properties.getFormat()).locale(this.properties.getLocale())
105-
.maximumLength(this.properties.getMaximumLength())
106-
.minimumLength(this.properties.getMinimumLength());
109+
.format(this.properties.getFormat())
110+
.locale(this.properties.getLocale())
111+
.maximumLength(this.properties.getMaximumLength())
112+
.minimumLength(this.properties.getMinimumLength());
107113

108114
if (this.fieldExtractor != null) {
109115
formattedBuilder.fieldExtractor(this.fieldExtractor);

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public JdbcBatchItemWriter<Map<String, Object>> itemWriter() {
8787
}
8888

8989
JdbcBatchItemWriterBuilder<Map<String, Object>> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder<Map<String, Object>>()
90-
.dataSource(writerDataSource).sql(this.properties.getSql());
90+
.dataSource(writerDataSource)
91+
.sql(this.properties.getSql());
9192
if (this.itemPreparedStatementSetter != null) {
9293
jdbcBatchItemWriterBuilder.itemPreparedStatementSetter(this.itemPreparedStatementSetter);
9394
}

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,21 @@ public JdbcCursorItemReader<Map<String, Object>> itemReader(
8585

8686
}
8787
return new JdbcCursorItemReaderBuilder<Map<String, Object>>().name(this.properties.getName())
88-
.currentItemCount(this.properties.getCurrentItemCount()).dataSource(readerDataSource)
89-
.driverSupportsAbsolute(this.properties.isDriverSupportsAbsolute())
90-
.fetchSize(this.properties.getFetchSize()).ignoreWarnings(this.properties.isIgnoreWarnings())
91-
.maxItemCount(this.properties.getMaxItemCount()).maxRows(this.properties.getMaxRows())
92-
.queryTimeout(this.properties.getQueryTimeout()).saveState(this.properties.isSaveState())
93-
.sql(this.properties.getSql()).rowMapper(rowMapper).preparedStatementSetter(preparedStatementSetter)
94-
.verifyCursorPosition(this.properties.isVerifyCursorPosition())
95-
.useSharedExtendedConnection(this.properties.isUseSharedExtendedConnection()).build();
88+
.currentItemCount(this.properties.getCurrentItemCount())
89+
.dataSource(readerDataSource)
90+
.driverSupportsAbsolute(this.properties.isDriverSupportsAbsolute())
91+
.fetchSize(this.properties.getFetchSize())
92+
.ignoreWarnings(this.properties.isIgnoreWarnings())
93+
.maxItemCount(this.properties.getMaxItemCount())
94+
.maxRows(this.properties.getMaxRows())
95+
.queryTimeout(this.properties.getQueryTimeout())
96+
.saveState(this.properties.isSaveState())
97+
.sql(this.properties.getSql())
98+
.rowMapper(rowMapper)
99+
.preparedStatementSetter(preparedStatementSetter)
100+
.verifyCursorPosition(this.properties.isVerifyCursorPosition())
101+
.useSharedExtendedConnection(this.properties.isUseSharedExtendedConnection())
102+
.build();
96103
}
97104

98105
@Bean

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,13 @@ public KafkaItemReader<Object, Map<String, Object>> kafkaItemReader(
6464
kafkaItemReaderProperties.getPartitions().add(0);
6565
}
6666
return new KafkaItemReaderBuilder<Object, Map<String, Object>>()
67-
.partitions(kafkaItemReaderProperties.getPartitions()).consumerProperties(consumerProperties)
68-
.name(kafkaItemReaderProperties.getName())
69-
.pollTimeout(Duration.ofSeconds(kafkaItemReaderProperties.getPollTimeOutInSeconds()))
70-
.saveState(kafkaItemReaderProperties.isSaveState()).topic(kafkaItemReaderProperties.getTopic()).build();
67+
.partitions(kafkaItemReaderProperties.getPartitions())
68+
.consumerProperties(consumerProperties)
69+
.name(kafkaItemReaderProperties.getName())
70+
.pollTimeout(Duration.ofSeconds(kafkaItemReaderProperties.getPollTimeOutInSeconds()))
71+
.saveState(kafkaItemReaderProperties.isSaveState())
72+
.topic(kafkaItemReaderProperties.getTopic())
73+
.build();
7174
}
7275

7376
private void validateProperties(KafkaItemReaderProperties kafkaItemReaderProperties) {

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ public KafkaItemWriter<Object, Map<String, Object>> kafkaItemWriter(
6666
KafkaTemplate template = new KafkaTemplate(producerFactory);
6767
template.setDefaultTopic(kafkaItemWriterProperties.getTopic());
6868
return new KafkaItemWriterBuilder<Object, Map<String, Object>>().delete(kafkaItemWriterProperties.isDelete())
69-
.kafkaTemplate(template).itemKeyMapper(itemKeyMapper).build();
69+
.kafkaTemplate(template)
70+
.itemKeyMapper(itemKeyMapper)
71+
.build();
7072
}
7173

7274
@Bean

‎spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public AmqpItemReaderProperties amqpItemReaderProperties() {
5757
public AmqpItemReader<Map<String, Object>> amqpItemReader(AmqpTemplate amqpTemplate,
5858
@Autowired(required = false) Class itemType) {
5959
AmqpItemReaderBuilder<Map<String, Object>> builder = new AmqpItemReaderBuilder<Map<String, Object>>()
60-
.amqpTemplate(amqpTemplate);
60+
.amqpTemplate(amqpTemplate);
6161
if (itemType != null) {
6262
builder.itemType(itemType);
6363
}

0 commit comments

Comments
 (0)