Skip to content

Commit 797167a

Browse files
committed
Polish "Migrate to Spring Batch 6"
See gh-46216
1 parent cb1d6b1 commit 797167a

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ protected ExecutionContextSerializer getExecutionContextSerializer() {
173173
: super.getExecutionContextSerializer();
174174
}
175175

176-
@SuppressWarnings("removal")
177176
@Override
177+
@Deprecated(since = "4.0.0", forRemoval = true)
178+
@SuppressWarnings("removal")
178179
protected JobParametersConverter getJobParametersConverter() {
179180
return (this.jobParametersConverter != null) ? this.jobParametersConverter
180181
: super.getJobParametersConverter();

spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
/**
2222
* Callback interface that can be implemented by beans wishing to customize the
23-
* {@link ConfigurableConversionService} that is used by the batch infrastructure
24-
* while retaining its default auto-configuration.
23+
* {@link ConfigurableConversionService} that is used by the batch infrastructure while
24+
* retaining its default auto-configuration.
2525
*
2626
* @author Claudio Nave
2727
* @since 4.0.0

spring-boot-project/spring-boot-batch/src/test/java/org/springframework/boot/batch/autoconfigure/BatchAutoConfigurationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,8 @@ void customJdbcPropertiesIsUsed() {
508508
}
509509

510510
@Test
511+
@Deprecated(since = "4.0.0", forRemoval = true)
512+
@SuppressWarnings("removal")
511513
void customJobParametersConverterIsUsed() {
512514
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
513515
.withBean(JobParametersConverter.class, JsonJobParametersConverter::new)
@@ -520,6 +522,8 @@ void customJobParametersConverterIsUsed() {
520522
}
521523

522524
@Test
525+
@Deprecated(since = "4.0.0", forRemoval = true)
526+
@SuppressWarnings("removal")
523527
void defaultJobParametersConverterIsUsed() {
524528
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class).run((context) -> {
525529
assertThat(context).doesNotHaveBean(JobParametersConverter.class);

0 commit comments

Comments
 (0)