Skip to content

Commit c353d68

Browse files
cppwfscppwfs
committed
Boot updated bom to use batch 5.x
Updated code to remove new deprecations Updated code to fix compilation errors. Updated code to add new bits for tests
1 parent 930d21f commit c353d68

File tree

15 files changed

+89
-77
lines changed

15 files changed

+89
-77
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
3535
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3636
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
37+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
3738
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3839
import org.springframework.context.annotation.Bean;
3940
import org.springframework.context.annotation.Configuration;
@@ -107,7 +108,8 @@ public void testSimpleConfiguration() {
107108
.withConfiguration(
108109
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
109110
BatchAutoConfiguration.class,
110-
SingleStepJobAutoConfiguration.class))
111+
SingleStepJobAutoConfiguration.class,
112+
DataSourceAutoConfiguration.class))
111113
.withPropertyValues("spring.batch.job.jobName=job",
112114
"spring.batch.job.stepName=step1",
113115
"spring.batch.job.chunkSize=5");
@@ -122,7 +124,8 @@ public void testSimpleConfigurationKabobStyle() {
122124
.withConfiguration(
123125
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
124126
BatchAutoConfiguration.class,
125-
SingleStepJobAutoConfiguration.class))
127+
SingleStepJobAutoConfiguration.class,
128+
DataSourceAutoConfiguration.class))
126129
.withPropertyValues("spring.batch.job.job-name=job",
127130
"spring.batch.job.step-name=step1",
128131
"spring.batch.job.chunk-size=5");

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
3939
import org.springframework.boot.autoconfigure.AutoConfigurations;
4040
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4141
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
42+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4243
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4344
import org.springframework.cloud.task.batch.autoconfigure.RangeConverter;
4445
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
@@ -79,7 +80,8 @@ public void testFullDelimitedConfiguration() {
7980
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
8081
BatchAutoConfiguration.class,
8182
SingleStepJobAutoConfiguration.class,
82-
FlatFileItemReaderAutoConfiguration.class))
83+
FlatFileItemReaderAutoConfiguration.class,
84+
DataSourceAutoConfiguration.class))
8385
.withPropertyValues("spring.batch.job.jobName=job",
8486
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
8587
"spring.batch.job.flatfileitemreader.savestate=true",
@@ -136,7 +138,8 @@ public void testFixedWidthConfiguration() {
136138
PropertyPlaceholderAutoConfiguration.class,
137139
BatchAutoConfiguration.class,
138140
SingleStepJobAutoConfiguration.class,
139-
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
141+
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class,
142+
DataSourceAutoConfiguration.class))
140143
.withPropertyValues("spring.batch.job.jobName=job",
141144
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
142145
"spring.batch.job.flatfileitemreader.savestate=true",
@@ -196,7 +199,8 @@ public void testCustomLineMapper() {
196199
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
197200
BatchAutoConfiguration.class,
198201
SingleStepJobAutoConfiguration.class,
199-
FlatFileItemReaderAutoConfiguration.class))
202+
FlatFileItemReaderAutoConfiguration.class,
203+
DataSourceAutoConfiguration.class))
200204
.withPropertyValues("spring.batch.job.jobName=job",
201205
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
202206
"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
@@ -236,7 +240,8 @@ public void testCustomRecordSeparatorAndSkippedLines() {
236240
PropertyPlaceholderAutoConfiguration.class,
237241
BatchAutoConfiguration.class,
238242
SingleStepJobAutoConfiguration.class,
239-
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
243+
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class,
244+
DataSourceAutoConfiguration.class))
240245
.withPropertyValues("spring.batch.job.jobName=job",
241246
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
242247
"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
@@ -281,7 +286,8 @@ public void testCustomMapping() {
281286
PropertyPlaceholderAutoConfiguration.class,
282287
BatchAutoConfiguration.class,
283288
SingleStepJobAutoConfiguration.class,
284-
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
289+
FlatFileItemReaderAutoConfiguration.class, RangeConverter.class,
290+
DataSourceAutoConfiguration.class))
285291
.withPropertyValues("spring.batch.job.jobName=job",
286292
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
287293
"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@
4444
import org.springframework.boot.autoconfigure.AutoConfigurations;
4545
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4646
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
47+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4748
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4849
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
4950
import org.springframework.context.annotation.Bean;
@@ -141,7 +142,7 @@ public void testDelimitedFileGeneration() {
141142
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
142143
BatchAutoConfiguration.class,
143144
SingleStepJobAutoConfiguration.class,
144-
FlatFileItemWriterAutoConfiguration.class))
145+
FlatFileItemWriterAutoConfiguration.class, DataSourceAutoConfiguration.class))
145146
.withPropertyValues("spring.batch.job.jobName=job",
146147
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
147148
"spring.batch.job.flatfileitemwriter.name=fooWriter",
@@ -197,7 +198,8 @@ public void testFormattedFileGeneration() {
197198
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
198199
BatchAutoConfiguration.class,
199200
SingleStepJobAutoConfiguration.class,
200-
FlatFileItemWriterAutoConfiguration.class))
201+
FlatFileItemWriterAutoConfiguration.class,
202+
DataSourceAutoConfiguration.class))
201203
.withPropertyValues("spring.batch.job.jobName=job",
202204
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=2",
203205
"spring.batch.job.flatfileitemwriter.name=fooWriter",
@@ -240,7 +242,8 @@ public void testFormattedFieldExtractorFileGeneration() {
240242
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
241243
BatchAutoConfiguration.class,
242244
SingleStepJobAutoConfiguration.class,
243-
FlatFileItemWriterAutoConfiguration.class))
245+
FlatFileItemWriterAutoConfiguration.class,
246+
DataSourceAutoConfiguration.class))
244247
.withPropertyValues("spring.batch.job.jobName=job",
245248
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
246249
"spring.batch.job.flatfileitemwriter.name=fooWriter",
@@ -281,7 +284,8 @@ public void testFieldExtractorFileGeneration() {
281284
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
282285
BatchAutoConfiguration.class,
283286
SingleStepJobAutoConfiguration.class,
284-
FlatFileItemWriterAutoConfiguration.class))
287+
FlatFileItemWriterAutoConfiguration.class,
288+
DataSourceAutoConfiguration.class))
285289
.withPropertyValues("spring.batch.job.jobName=job",
286290
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
287291
"spring.batch.job.flatfileitemwriter.name=fooWriter",
@@ -320,7 +324,8 @@ public void testCustomLineAggregatorFileGeneration() {
320324
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
321325
BatchAutoConfiguration.class,
322326
SingleStepJobAutoConfiguration.class,
323-
FlatFileItemWriterAutoConfiguration.class))
327+
FlatFileItemWriterAutoConfiguration.class,
328+
DataSourceAutoConfiguration.class))
324329
.withPropertyValues("spring.batch.job.jobName=job",
325330
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
326331
"spring.batch.job.flatfileitemwriter.name=fooWriter",
@@ -358,7 +363,8 @@ public void testHeaderFooterFileGeneration() {
358363
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
359364
BatchAutoConfiguration.class,
360365
SingleStepJobAutoConfiguration.class,
361-
FlatFileItemWriterAutoConfiguration.class))
366+
FlatFileItemWriterAutoConfiguration.class,
367+
DataSourceAutoConfiguration.class))
362368
.withPropertyValues("spring.batch.job.jobName=job",
363369
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
364370
"spring.batch.job.flatfileitemwriter.name=fooWriter",

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
3939
import org.springframework.boot.autoconfigure.AutoConfigurations;
4040
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4141
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
42+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4243
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4344
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
4445
import org.springframework.context.annotation.Bean;
@@ -75,7 +76,8 @@ public void testBaseKafkaItemReader() {
7576
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
7677
BatchAutoConfiguration.class,
7778
SingleStepJobAutoConfiguration.class,
78-
KafkaItemReaderAutoConfiguration.class))
79+
KafkaItemReaderAutoConfiguration.class,
80+
DataSourceAutoConfiguration.class))
7981
.withPropertyValues("spring.batch.job.jobName=job",
8082
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
8183
"spring.kafka.consumer.bootstrap-servers="
@@ -122,7 +124,8 @@ public void testBaseKafkaItemReaderMultiplePartitions() {
122124
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
123125
BatchAutoConfiguration.class,
124126
SingleStepJobAutoConfiguration.class,
125-
KafkaItemReaderAutoConfiguration.class))
127+
KafkaItemReaderAutoConfiguration.class,
128+
DataSourceAutoConfiguration.class))
126129
.withPropertyValues("spring.batch.job.jobName=job",
127130
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
128131
"spring.kafka.consumer.bootstrap-servers="
@@ -164,7 +167,8 @@ public void testBaseKafkaItemReaderPollTimeoutDefault() {
164167
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
165168
BatchAutoConfiguration.class,
166169
SingleStepJobAutoConfiguration.class,
167-
KafkaItemReaderAutoConfiguration.class))
170+
KafkaItemReaderAutoConfiguration.class,
171+
DataSourceAutoConfiguration.class))
168172
.withPropertyValues("spring.batch.job.jobName=job",
169173
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
170174
"spring.kafka.consumer.bootstrap-servers="

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
3737
import org.springframework.boot.autoconfigure.AutoConfigurations;
3838
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
3939
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
40+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4041
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4142
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
4243
import org.springframework.context.ApplicationContext;
@@ -71,7 +72,8 @@ public void testBaseKafkaItemWriter() {
7172
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
7273
BatchAutoConfiguration.class,
7374
SingleStepJobAutoConfiguration.class,
74-
KafkaItemWriterAutoConfiguration.class))
75+
KafkaItemWriterAutoConfiguration.class,
76+
DataSourceAutoConfiguration.class))
7577
.withPropertyValues("spring.batch.job.jobName=job",
7678
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
7779
"spring.kafka.producer.bootstrap-servers="

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
4747
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
4848
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
4949
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
50+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
5051
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
5152
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
5253
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
@@ -110,7 +111,8 @@ void basicTest() {
110111
BatchAutoConfiguration.class,
111112
SingleStepJobAutoConfiguration.class,
112113
AmqpItemReaderAutoConfiguration.class,
113-
RabbitAutoConfiguration.class))
114+
RabbitAutoConfiguration.class,
115+
DataSourceAutoConfiguration.class))
114116
.withPropertyValues("spring.batch.job.jobName=integrationJob",
115117
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
116118
"spring.batch.job.amqpitemreader.enabled=true",
@@ -140,7 +142,8 @@ void basicTestWithItemType() {
140142
BatchAutoConfiguration.class,
141143
SingleStepJobAutoConfiguration.class,
142144
AmqpItemReaderAutoConfiguration.class,
143-
RabbitAutoConfiguration.class))
145+
RabbitAutoConfiguration.class,
146+
DataSourceAutoConfiguration.class))
144147
.withPropertyValues("spring.batch.job.jobName=integrationJob",
145148
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
146149
"spring.batch.job.amqpitemreader.enabled=true",
@@ -168,7 +171,8 @@ void useAmqpTemplateTest() {
168171
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
169172
BatchAutoConfiguration.class,
170173
SingleStepJobAutoConfiguration.class,
171-
AmqpItemReaderAutoConfiguration.class))
174+
AmqpItemReaderAutoConfiguration.class,
175+
DataSourceAutoConfiguration.class))
172176
.withPropertyValues("spring.batch.job.jobName=integrationJob",
173177
"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
174178
"spring.batch.job.amqpitemreader.enabled=true",

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2020 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@
5151
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
5252
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
5353
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
54+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
5455
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
5556
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
5657
import org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration;
@@ -135,7 +136,8 @@ void basicTest() {
135136
BatchAutoConfiguration.class,
136137
SingleStepJobAutoConfiguration.class,
137138
AmqpItemWriterAutoConfiguration.class,
138-
RabbitAutoConfiguration.class))
139+
RabbitAutoConfiguration.class,
140+
DataSourceAutoConfiguration.class))
139141
.withPropertyValues(this.configurations);
140142

141143
applicationContextRunner.run((context) -> {
@@ -163,7 +165,8 @@ void useAmqpTemplateTest() {
163165
AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
164166
BatchAutoConfiguration.class,
165167
SingleStepJobAutoConfiguration.class,
166-
AmqpItemWriterAutoConfiguration.class))
168+
AmqpItemWriterAutoConfiguration.class,
169+
DataSourceAutoConfiguration.class))
167170
.withPropertyValues(this.configurations);
168171

169172
applicationContextRunner.run((context) -> {

‎spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2019 the original author or authors.
2+
* Copyright 2016-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
2020
import org.apache.commons.logging.LogFactory;
2121

2222
import org.springframework.batch.core.JobExecution;
23-
import org.springframework.batch.core.listener.JobExecutionListenerSupport;
23+
import org.springframework.batch.core.JobExecutionListener;
2424
import org.springframework.cloud.task.listener.annotation.BeforeTask;
2525
import org.springframework.cloud.task.repository.TaskExecution;
2626
import org.springframework.util.Assert;
@@ -31,7 +31,7 @@
3131
*
3232
* @author Michael Minella
3333
*/
34-
public class TaskBatchExecutionListener extends JobExecutionListenerSupport {
34+
public class TaskBatchExecutionListener implements JobExecutionListener {
3535

3636
private static final Log logger = LogFactory.getLog(TaskBatchExecutionListener.class);
3737

‎spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerCoreTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public class TaskJobLauncherApplicationRunnerCoreTests {
8383
@Autowired
8484
private JobExplorer jobExplorer;
8585

86-
@Autowired
8786
private PlatformTransactionManager transactionManager;
8887

8988
private TaskJobLauncherApplicationRunner runner;
@@ -98,6 +97,7 @@ public class TaskJobLauncherApplicationRunnerCoreTests {
9897

9998
@BeforeEach
10099
public void init() {
100+
this.transactionManager = new ResourcelessTransactionManager();
101101
this.jobs = new JobBuilderFactory(this.jobRepository);
102102
this.steps = new StepBuilderFactory(this.jobRepository, this.transactionManager);
103103
Tasklet tasklet = (contribution, chunkContext) -> RepeatStatus.FINISHED;

‎spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskMetrics.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2019 the original author or authors.
2+
* Copyright 2019-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -116,8 +116,7 @@ public void onTaskEnd(TaskExecution taskExecution) {
116116
(this.exception == null) ? "none"
117117
: this.exception.getClass().getSimpleName())
118118
.tag(TASK_STATUS_TAG,
119-
(this.exception == null) ? STATUS_SUCCESS : STATUS_FAILURE)
120-
.register(Metrics.globalRegistry));
119+
(this.exception == null) ? STATUS_SUCCESS : STATUS_FAILURE));
121120
this.taskSample = null;
122121
}
123122

0 commit comments

Comments
 (0)