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

Compatibility with JSR-354 final (and its new Monetary singleton)

Browse Source 
Includes support for currency detection with @NumberFormat.

Issue: SPR-12209
This commit is contained in:
Juergen Hoeller
2015-05-20 15:15:29 +02:00
parent b4095c3e1d
commit de893ada2b
4 changed files with 111 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/format/number/money/CurrencyUnitFormatter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.format.number.money;
import java.util.Locale;
import javax.money.CurrencyUnit;
import javax.money.MonetaryCurrencies;
import javax.money.Monetary;
import org.springframework.format.Formatter;
@@ -38,7 +38,7 @@ public class CurrencyUnitFormatter implements Formatter<CurrencyUnit> {
@Override
public CurrencyUnit parse(String text, Locale locale) {
return MonetaryCurrencies.getCurrency(text);
return Monetary.getCurrency(text);
}
}

92
spring-context/src/main/java/org/springframework/format/number/money/Jsr354NumberFormatAnnotationFormatterFactory.java
View File

@@ -22,9 +22,8 @@ import java.util.Currency;
import java.util.Locale;
import java.util.Set;
import javax.money.CurrencyUnit;
import javax.money.Monetary;
import javax.money.MonetaryAmount;
import javax.money.MonetaryAmounts;
import javax.money.MonetaryCurrencies;
import org.springframework.context.support.EmbeddedValueResolutionSupport;
import org.springframework.format.AnnotationFormatterFactory;
@@ -49,6 +48,9 @@ import org.springframework.util.StringUtils;
public class Jsr354NumberFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport
implements AnnotationFormatterFactory<NumberFormat> {
private static final String CURRENCY_CODE_PATTERN = "\u00A4\u00A4";
@Override
@SuppressWarnings("unchecked")
public Set<Class<?>> getFieldTypes() {
@@ -68,18 +70,18 @@ public class Jsr354NumberFormatAnnotationFormatterFactory extends EmbeddedValueR
private Formatter<MonetaryAmount> configureFormatterFrom(NumberFormat annotation) {
if (StringUtils.hasLength(annotation.pattern())) {
return new NumberDecoratingFormatter(null, resolveEmbeddedValue(annotation.pattern()));
return new PatternDecoratingFormatter(resolveEmbeddedValue(annotation.pattern()));
}
else {
Style style = annotation.style();
if (style == Style.PERCENT) {
return new NumberDecoratingFormatter(new PercentStyleFormatter(), null);
if (style == Style.NUMBER) {
return new NumberDecoratingFormatter(new NumberStyleFormatter());
}
else if (style == Style.NUMBER) {
return new NumberDecoratingFormatter(new NumberStyleFormatter(), null);
else if (style == Style.PERCENT) {
return new NumberDecoratingFormatter(new PercentStyleFormatter());
}
else {
return new NumberDecoratingFormatter(null, null);
return new NumberDecoratingFormatter(new CurrencyStyleFormatter());
}
}
}
@@ -89,38 +91,72 @@ public class Jsr354NumberFormatAnnotationFormatterFactory extends EmbeddedValueR
private final Formatter<Number> numberFormatter;
public NumberDecoratingFormatter(Formatter<Number> numberFormatter) {
this.numberFormatter = numberFormatter;
}
@Override
public String print(MonetaryAmount object, Locale locale) {
return this.numberFormatter.print(object.getNumber(), locale);
}
@Override
public MonetaryAmount parse(String text, Locale locale) throws ParseException {
CurrencyUnit currencyUnit = Monetary.getCurrency(locale);
Number numberValue = this.numberFormatter.parse(text, locale);
return Monetary.getDefaultAmountFactory().setNumber(numberValue).setCurrency(currencyUnit).create();
}
}
private static class PatternDecoratingFormatter implements Formatter<MonetaryAmount> {
private final String pattern;
public NumberDecoratingFormatter(Formatter<Number> numberFormatter, String pattern) {
this.numberFormatter = numberFormatter;
public PatternDecoratingFormatter(String pattern) {
this.pattern = pattern;
}
@Override
public String print(MonetaryAmount object, Locale locale) {
Formatter<Number> formatterToUse = this.numberFormatter;
if (formatterToUse == null) {
CurrencyStyleFormatter formatter = new CurrencyStyleFormatter();
formatter.setCurrency(Currency.getInstance(object.getCurrency().getCurrencyCode()));
formatter.setPattern(this.pattern);
formatterToUse = formatter;
}
return formatterToUse.print(object.getNumber(), locale);
CurrencyStyleFormatter formatter = new CurrencyStyleFormatter();
formatter.setCurrency(Currency.getInstance(object.getCurrency().getCurrencyCode()));
formatter.setPattern(this.pattern);
return formatter.print(object.getNumber(), locale);
}
@Override
public MonetaryAmount parse(String text, Locale locale) throws ParseException {
Currency currency = Currency.getInstance(locale);
Formatter<Number> formatterToUse = this.numberFormatter;
if (formatterToUse == null) {
CurrencyStyleFormatter formatter = new CurrencyStyleFormatter();
formatter.setCurrency(currency);
formatter.setPattern(this.pattern);
formatterToUse = formatter;
CurrencyStyleFormatter formatter = new CurrencyStyleFormatter();
Currency currency = determineCurrency(text, locale);
CurrencyUnit currencyUnit = Monetary.getCurrency(currency.getCurrencyCode());
formatter.setCurrency(currency);
formatter.setPattern(this.pattern);
Number numberValue = formatter.parse(text, locale);
return Monetary.getDefaultAmountFactory().setNumber(numberValue).setCurrency(currencyUnit).create();
}
private Currency determineCurrency(String text, Locale locale) {
try {
if (text.length() < 3) {
// Could not possibly contain a currency code ->
// try with locale and likely let it fail on parse.
return Currency.getInstance(locale);
}
else if (this.pattern.startsWith(CURRENCY_CODE_PATTERN)) {
return Currency.getInstance(text.substring(0, 3));
}
else if (this.pattern.endsWith(CURRENCY_CODE_PATTERN)) {
return Currency.getInstance(text.substring(text.length() - 3));
}
else {
// A pattern without a currency code...
return Currency.getInstance(locale);
}
}
catch (IllegalArgumentException ex) {
throw new IllegalArgumentException("Cannot determine currency for number value [" + text + "]", ex);
}
Number numberValue = formatterToUse.parse(text, locale);
CurrencyUnit currencyUnit = MonetaryCurrencies.getCurrency(currency.getCurrencyCode());
return MonetaryAmounts.getDefaultAmountFactory().setNumber(numberValue).setCurrency(currencyUnit).create();
}
}