SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Identified depracations and updated the code

Browse Source
This commit is contained in:
Glenn Renfro
2023-03-20 14:01:45 -04:00
parent afc1b2ea9e
commit 4f0b68bd0b
8 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,15 +80,16 @@ public class SingleStepJobAutoConfiguration {
public Job job(ItemReader<Map<String, Object>> itemReader, ItemWriter<Map<String, Object>> itemWriter) {
SimpleStepBuilder<Map<String, Object>, Map<String, Object>> stepBuilder = new StepBuilder(
this.properties.getStepName()).repository(this.jobRepository)
.<Map<String, Object>, Map<String, Object>>chunk(this.properties.getChunkSize())
this.properties.getStepName(), this.jobRepository)
.<Map<String, Object>, Map<String, Object>>chunk(this.properties.getChunkSize(),
this.transactionManager)
.reader(itemReader);
stepBuilder.processor(this.itemProcessor);
Step step = stepBuilder.writer(itemWriter).transactionManager(this.transactionManager).build();
Step step = stepBuilder.writer(itemWriter).build();
return new JobBuilder(this.properties.getJobName()).repository(this.jobRepository).start(step).build();
return new JobBuilder(this.properties.getJobName(), this.jobRepository).start(step).build();
}
}

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

@@ -18,11 +18,13 @@ package org.springframework.cloud.task.batch.autoconfigure.flatfile;
import java.io.File;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -40,7 +42,6 @@ import org.springframework.batch.item.file.transform.LineAggregator;
import org.springframework.batch.item.file.transform.PassThroughLineAggregator;
import org.springframework.batch.item.support.ListItemReader;
import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
import org.springframework.batch.test.AssertFile;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -166,9 +167,9 @@ public class FlatFileItemWriterAutoConfigurationTests {
FlatFileItemWriter writer = context.getBean(FlatFileItemWriter.class);
AssertFile.assertLineCount(3, this.outputFile);
AssertFile.assertFileEquals(new ClassPathResource("writerTestUTF16.txt"),
new FileSystemResource(this.outputFile));
assertThat(Assertions.linesOf(this.outputFile, StandardCharsets.UTF_16).size()).isEqualTo(3);
assertThat(Assertions.contentOf((new ClassPathResource("writerTestUTF16.txt")).getFile())
.equals(new FileSystemResource(this.outputFile)));
assertThat((Boolean) ReflectionTestUtils.getField(writer, "saveState")).isFalse();
assertThat((Boolean) ReflectionTestUtils.getField(writer, "append")).isTrue();
@@ -209,7 +210,7 @@ public class FlatFileItemWriterAutoConfigurationTests {
Thread.sleep(1000);
}
AssertFile.assertLineCount(2, this.outputFile);
assertThat(Assertions.linesOf(this.outputFile).size()).isEqualTo(2);
String results = FileCopyUtils
.copyToString(new InputStreamReader(new FileSystemResource(this.outputFile).getInputStream()));
@@ -246,7 +247,7 @@ public class FlatFileItemWriterAutoConfigurationTests {
Thread.sleep(1000);
}
AssertFile.assertLineCount(3, this.outputFile);
assertThat(Assertions.linesOf(this.outputFile).size()).isEqualTo(3);
String results = FileCopyUtils
.copyToString(new InputStreamReader(new FileSystemResource(this.outputFile).getInputStream()));
@@ -281,7 +282,7 @@ public class FlatFileItemWriterAutoConfigurationTests {
Thread.sleep(1000);
}
AssertFile.assertLineCount(3, this.outputFile);
assertThat(Assertions.linesOf(this.outputFile, StandardCharsets.UTF_8).size()).isEqualTo(3);
String results = FileCopyUtils
.copyToString(new InputStreamReader(new FileSystemResource(this.outputFile).getInputStream()));
@@ -315,7 +316,7 @@ public class FlatFileItemWriterAutoConfigurationTests {
Thread.sleep(1000);
}
AssertFile.assertLineCount(3, this.outputFile);
assertThat(Assertions.linesOf(this.outputFile, StandardCharsets.UTF_8).size()).isEqualTo(3);
String results = FileCopyUtils
.copyToString(new InputStreamReader(new FileSystemResource(this.outputFile).getInputStream()));
@@ -351,7 +352,7 @@ public class FlatFileItemWriterAutoConfigurationTests {
Thread.sleep(1000);
}
AssertFile.assertLineCount(5, this.outputFile);
assertThat(Assertions.linesOf(this.outputFile, StandardCharsets.UTF_8).size()).isEqualTo(5);
String results = FileCopyUtils
.copyToString(new InputStreamReader(new FileSystemResource(this.outputFile).getInputStream()));