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

Removed 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 MultiResourceItemReader.
This commit is contained in:
Michael Minella
2017-02-21 21:53:24 -06:00
parent dabd810c2d
commit 342d27bc1e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.batch.item.file.LineCallbackHandler;
import org.springframework.batch.item.file.LineMapper;
@@ -54,6 +57,8 @@ import org.springframework.util.StringUtils;
*/
public class FlatFileItemReaderBuilder<T> {
protected Log logger = LogFactory.getLog(getClass());
private String name;
private boolean strict = true;
@@ -382,7 +387,12 @@ public class FlatFileItemReaderBuilder<T> {
Assert.state(StringUtils.hasText(this.name),
"A name is required when saveSate is set to true.");
}
Assert.notNull(this.resource, "A resource is required.");
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 MultiResourceItemReader");
}
Assert.notNull(this.recordSeparatorPolicy, "A RecordSeparatorPolicy is required.");
int validatorValue = this.tokenizerValidator.intValue();
Assert.state(validatorValue == 1 || validatorValue == 2 || validatorValue == 4,