Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade spring-javaformat maven plugin to version 0.0.39

Browse Source
This commit is contained in:
Mahmoud Ben Hassine
2023-06-05 11:11:48 +02:00
parent bb5598e569
commit c25cd55901
264 changed files with 2551 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java
View File

@@ -69,7 +69,7 @@ public abstract class AssertFile {
lineCount++;
}
Assert.state(expectedLineCount == lineCount, String
.format("Line count of %d does not match expected count of %d", lineCount, expectedLineCount));
.format("Line count of %d does not match expected count of %d", lineCount, expectedLineCount));
}
finally {
expectedReader.close();

2
spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java
View File

@@ -121,7 +121,7 @@ public class MetaDataInstanceFactory {
public static JobExecution createJobExecution(String jobName, Long instanceId, Long executionId,
String jobParameters) {
JobParameters params = new DefaultJobParametersConverter()
.getJobParameters(PropertiesConverter.stringToProperties(jobParameters));
.getJobParameters(PropertiesConverter.stringToProperties(jobParameters));
return createJobExecution(jobName, instanceId, executionId, params);
}

4
spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java
View File

@@ -108,8 +108,8 @@ abstract class AbstractSampleJobTests {
private void verifyTasklet(int id) {
assertEquals(id,
jdbcTemplate
.queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet" + id + "'", Integer.class)
.intValue());
.queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet" + id + "'", Integer.class)
.intValue());
}
}

4
spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java
View File

@@ -109,7 +109,9 @@ class JobLauncherTestUtilsTests {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

2
spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java
View File

@@ -37,7 +37,7 @@ class MetaDataInstanceFactoryTests {
private final String jobParametersString = "foo=bar";
private final JobParameters jobParameters = new DefaultJobParametersConverter()
.getJobParameters(PropertiesConverter.stringToProperties(jobParametersString));
.getJobParameters(PropertiesConverter.stringToProperties(jobParametersString));
private final Long executionId = 4321L;

2
spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java
View File

@@ -64,7 +64,7 @@ class SampleStepTests implements ApplicationContextAware {
Step step = (Step) context.getBean("s2");
assertEquals(BatchStatus.COMPLETED, stepRunner.launchStep(step).getStatus());
assertEquals(2, jdbcTemplate.queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet2'", Integer.class)
.intValue());
.intValue());
}
@Override

11
spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java
View File

@@ -112,8 +112,9 @@ public class SpringBatchTestJUnit4Tests {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").build();
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
}
@Bean
@@ -135,9 +136,11 @@ public class SpringBatchTestJUnit4Tests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository)
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource()))
.build()).build();
.build())
.build();
}
}

11
spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java
View File

@@ -115,8 +115,9 @@ public class SpringBatchTestJUnit5Tests {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").build();
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
}
@Bean
@@ -138,9 +139,11 @@ public class SpringBatchTestJUnit5Tests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository)
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource()))
.build()).build();
.build())
.build();
}
}

10
spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java
View File

@@ -117,8 +117,9 @@ class StepScopeAnnotatedListenerIntegrationTests {
public DataSource dataSource() {
EmbeddedDatabaseBuilder embeddedDatabaseBuilder = new EmbeddedDatabaseBuilder();
return embeddedDatabaseBuilder.addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql")
.setType(EmbeddedDatabaseType.HSQL).build();
.addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql")
.setType(EmbeddedDatabaseType.HSQL)
.build();
}
@Bean
@@ -134,7 +135,10 @@ class StepScopeAnnotatedListenerIntegrationTests {
@Bean
public Step stepUnderTest(JobRepository jobRepository) {
return new StepBuilder("step-under-test", jobRepository).<String, String>chunk(1, this.transactionManager)
.reader(reader()).processor(processor()).writer(writer()).build();
.reader(reader())
.processor(processor())
.writer(writer())
.build();
}
@Bean

6
spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java
View File

@@ -99,8 +99,10 @@ class BatchTestContextBeanPostProcessorTests {
@Bean
DataSource dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build();
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
}
@Bean

15
spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java
View File

@@ -92,8 +92,9 @@ class ObservabilitySampleStepTests extends SampleTestRunner {
assertThat(bb.getFinishedSpans()).haveSameTraceId().hasASpanWithName("job").hasASpanWithName("step");
// and
MeterRegistryAssert.assertThat(meterRegistry).hasTimerWithName("spring.batch.job")
.hasTimerWithName("spring.batch.step");
MeterRegistryAssert.assertThat(meterRegistry)
.hasTimerWithName("spring.batch.job")
.hasTimerWithName("spring.batch.step");
};
}
@@ -105,14 +106,15 @@ class ObservabilitySampleStepTests extends SampleTestRunner {
public ObservationRegistry observationRegistry() {
ObservationRegistry observationRegistry = ObservationRegistry.create();
observationRegistry.observationConfig()
.observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry));
.observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry));
return observationRegistry;
}
@Bean
public Step step(JobRepository jobRepository, JdbcTransactionManager transactionManager) {
return new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build();
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager)
.build();
}
@Bean
@@ -123,8 +125,9 @@ class ObservabilitySampleStepTests extends SampleTestRunner {
@Bean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql").build();
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.build();
}
@Bean