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

BATCH-1262: number format for BigDecimal

Browse Source
This commit is contained in:
dsyer
2009-06-02 11:00:42 +00:00
parent 690f822bc1
commit dee9a7e8c5
2 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
View File

@@ -18,6 +18,7 @@ package org.springframework.batch.item.file.transform;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -48,6 +49,8 @@ public class DefaultFieldSet implements FieldSet {
}
private NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
private String grouping = ",";
private String decimal = ".";
/**
* The fields wrapped by this '<code>FieldSet</code>' instance.
@@ -63,6 +66,10 @@ public class DefaultFieldSet implements FieldSet {
*/
public void setNumberFormat(NumberFormat numberFormat) {
this.numberFormat = numberFormat;
if (numberFormat instanceof DecimalFormat) {
grouping = ""+((DecimalFormat)numberFormat).getDecimalFormatSymbols().getGroupingSeparator();
decimal = ""+((DecimalFormat)numberFormat).getDecimalFormatSymbols().getDecimalSeparator();
}
}
/**
@@ -76,6 +83,7 @@ public class DefaultFieldSet implements FieldSet {
public DefaultFieldSet(String[] tokens) {
this.tokens = tokens == null ? null : (String[]) tokens.clone();
setNumberFormat(NumberFormat.getInstance(Locale.US));
}
public DefaultFieldSet(String[] tokens, String[] names) {
@@ -87,6 +95,7 @@ public class DefaultFieldSet implements FieldSet {
}
this.tokens = (String[]) tokens.clone();
this.names = Arrays.asList(names);
setNumberFormat(NumberFormat.getInstance(Locale.US));
}
/*
@@ -429,15 +438,24 @@ public class DefaultFieldSet implements FieldSet {
*/
public BigDecimal readBigDecimal(int index, BigDecimal defaultValue) {
String candidate = readAndTrim(index);
if (!StringUtils.hasText(candidate)) {
return defaultValue;
}
try {
return (StringUtils.hasText(candidate)) ? new BigDecimal(candidate) : defaultValue;
String result = removeSeparators(candidate);
return new BigDecimal(result);
}
catch (NumberFormatException e) {
throw new NumberFormatException("Unparseable number: " + candidate);
}
}
private String removeSeparators(String candidate) {
return candidate.replace(grouping, "").replace(decimal, ".");
}
/*
* (non-Javadoc)
*