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

Remove the requirement for a Resource to be set

Browse Source 
This commit removes the requirement for a Resource to be configured at
build time. This requirement prevented the use of this builder along
with the MultiResourceItemWriter.

Resolves BATCH-2720
This commit is contained in:
Mahmoud Ben Hassine
2019-11-15 17:46:58 +01:00
parent 33f04a9435
commit 707b1bf986
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2018 the original author or authors.
* Copyright 2016-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.file.FlatFileFooterCallback;
import org.springframework.batch.item.file.FlatFileHeaderCallback;
import org.springframework.batch.item.file.FlatFileItemWriter;
@@ -44,6 +47,8 @@ import org.springframework.util.StringUtils;
*/
public class FlatFileItemWriterBuilder<T> {
protected Log logger = LogFactory.getLog(getClass());
private Resource resource;
private boolean forceSync = false;
@@ -489,12 +494,16 @@ public class FlatFileItemWriterBuilder<T> {
Assert.isTrue(this.lineAggregator != null || this.delimitedBuilder != null || this.formattedBuilder != null,
"A LineAggregator or a DelimitedBuilder or a FormattedBuilder is required");
Assert.notNull(this.resource, "A Resource is required");
if(this.saveState) {
Assert.hasText(this.name, "A name is required when saveState is true");
}
if(this.resource == null) {
logger.debug("The resource is null. This is only a valid scenario when " +
"injecting it later as in when using the MultiResourceItemWriter");
}
FlatFileItemWriter<T> writer = new FlatFileItemWriter<>();
writer.setName(this.name);