using MonetaryAmountFormat

Author: otaviojava

src/main/java/org/javamoney/moneta/FastMoney.java

@@ -15,12 +15,15 @@
  */
 package org.javamoney.moneta;
 
+import org.javamoney.moneta.ToStringMonetaryAmountFormat.ToStringMonetaryAmountFormatStyle;
 import org.javamoney.moneta.internal.FastMoneyAmountBuilder;
 import org.javamoney.moneta.spi.DefaultNumberValue;
 import org.javamoney.moneta.spi.MonetaryConfig;
 import org.javamoney.moneta.spi.MoneyUtils;
 
 import javax.money.*;
+import javax.money.format.MonetaryAmountFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -703,16 +706,28 @@ public static FastMoney from(MonetaryAmount amount){
 
 	/**
 	 * Obtains an instance of FastMoney from a text string such as 'EUR 25.25'.
-	 * @param text
+	 * @param text the text to parse not null
 	 * @return FastMoney instance
 	 * @throws NullPointerException
 	 * @throws NumberFormatException
 	 * @throws UnknownCurrencyException
 	 */
 	public static FastMoney parse(CharSequence text) {
-		return MonetaryAmountParser.parserFastMoney(text);
+		return parse(text, DEFAULT_FORMATTER);
+	}
+	/**
+	 * Obtains an instance of FastMoney from a text using specific formatter.
+	 * @param text  the text to parse not null
+	 * @param formatter the formatter to use not null
+	 * @return FastMoney instance
+	 */
+	public static FastMoney parse(CharSequence text, MonetaryAmountFormat formatter) {
+		return from(formatter.parse(text));
 	}
 
+	private static ToStringMonetaryAmountFormat DEFAULT_FORMATTER = ToStringMonetaryAmountFormat
+			.of(ToStringMonetaryAmountFormatStyle.FAST_MONEY);
+
     private BigDecimal getBigDecimal(){
         return BigDecimal.valueOf(this.number).movePointLeft(SCALE);
     }

src/main/java/org/javamoney/moneta/MonetaryAmountParser.java

@@ -15,18 +15,29 @@
  */
 package org.javamoney.moneta;
 
-import org.javamoney.moneta.internal.MoneyAmountBuilder;
-import org.javamoney.moneta.spi.MoneyUtils;
-import org.javamoney.moneta.spi.DefaultNumberValue;
-
-import javax.money.*;
-
-import java.io.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.util.Objects;
 
+import javax.money.CurrencyUnit;
+import javax.money.MonetaryAmount;
+import javax.money.MonetaryAmountFactory;
+import javax.money.MonetaryContext;
+import javax.money.MonetaryCurrencies;
+import javax.money.MonetaryException;
+import javax.money.MonetaryOperator;
+import javax.money.MonetaryQuery;
+import javax.money.NumberValue;
+import javax.money.UnknownCurrencyException;
+import javax.money.format.MonetaryAmountFormat;
+
+import org.javamoney.moneta.ToStringMonetaryAmountFormat.ToStringMonetaryAmountFormatStyle;
+import org.javamoney.moneta.internal.MoneyAmountBuilder;
+import org.javamoney.moneta.spi.DefaultNumberValue;
+import org.javamoney.moneta.spi.MoneyUtils;
+
 /**
  * Default immutable implementation of {@link MonetaryAmount} based
  * on {@link BigDecimal} as numeric representation.
@@ -793,6 +804,19 @@ public static Money from(MonetaryAmount amt){
 	 * @throws UnknownCurrencyException
 	 */
 	public static Money parse(CharSequence text) {
-		return MonetaryAmountParser.parserMoney(text);
+		return parse(text, DEFAULT_FORMATTER);
 	}
+
+	/**
+	 * Obtains an instance of Money from a text using specific formatter.
+	 * @param text  the text to parse not null
+	 * @param formatter the formatter to use not null
+	 * @return Money instance
+	 */
+	public static Money parse(CharSequence text, MonetaryAmountFormat formatter) {
+		return from(formatter.parse(text));
+	}
+
+	private static ToStringMonetaryAmountFormat DEFAULT_FORMATTER = ToStringMonetaryAmountFormat
+			.of(ToStringMonetaryAmountFormatStyle.MONEY);
 }

src/main/java/org/javamoney/moneta/Money.java

@@ -15,11 +15,13 @@
  */
 package org.javamoney.moneta;
 
+import org.javamoney.moneta.ToStringMonetaryAmountFormat.ToStringMonetaryAmountFormatStyle;
 import org.javamoney.moneta.internal.RoundedMoneyAmountBuilder;
 import org.javamoney.moneta.spi.DefaultNumberValue;
 import org.javamoney.moneta.spi.MoneyUtils;
 
 import javax.money.*;
+import javax.money.format.MonetaryAmountFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -648,8 +650,20 @@ public static RoundedMoney from(MonetaryAmount amt){
 	 * @throws UnknownCurrencyException
 	 */
 	public static RoundedMoney parse(CharSequence text) {
-		return MonetaryAmountParser.parserRoundedMoney(text);
+		return parse(text, DEFAULT_FORMATTER);
 	}
+	/**
+	 * Obtains an instance of FastMoney from a text using specific formatter.
+	 * @param text  the text to parse not null
+	 * @param formatter the formatter to use not null
+	 * @return RoundedMoney instance
+	 */
+	public static RoundedMoney parse(CharSequence text, MonetaryAmountFormat formatter) {
+		return from(formatter.parse(text));
+	}
+
+	private static ToStringMonetaryAmountFormat DEFAULT_FORMATTER = ToStringMonetaryAmountFormat
+			.of(ToStringMonetaryAmountFormatStyle.ROUNDED_MONEY);
     /*
      * }(non-Javadoc)
      * @see javax.money.MonetaryAmount#adjust(javax.money.AmountAdjuster)

src/main/java/org/javamoney/moneta/RoundedMoney.java

@@ -0,0 +1,103 @@
+package org.javamoney.moneta;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.money.CurrencyUnit;
+import javax.money.MonetaryAmount;
+import javax.money.MonetaryCurrencies;
+import javax.money.format.AmountFormatContext;
+import javax.money.format.MonetaryAmountFormat;
+import javax.money.format.MonetaryParseException;
+
+/**
+ * class to format and parse a text string such as 'EUR 25.25' or vice versa.
+ * @author otaviojava
+ */
+class ToStringMonetaryAmountFormat implements MonetaryAmountFormat {
+
+	private ToStringMonetaryAmountFormatStyle style;
+
+	private ToStringMonetaryAmountFormat(ToStringMonetaryAmountFormatStyle style) {
+		this.style = Objects.requireNonNull(style);
+	}
+
+	public static ToStringMonetaryAmountFormat of(
+			ToStringMonetaryAmountFormatStyle style) {
+		return new ToStringMonetaryAmountFormat(style);
+	}
+
+	@Override
+	public String queryFrom(MonetaryAmount amount) {
+		if (Objects.isNull(amount)) {
+			return null;
+		}
+		return amount.toString();
+	}
+
+	@Override
+	public AmountFormatContext getAmountFormatContext() {
+		throw new UnsupportedOperationException(
+				"ToStringMonetaryAmountFormat does not the method suport getAmountFormatContext()");
+	}
+
+	@Override
+	public void print(Appendable appendable, MonetaryAmount amount)
+			throws IOException {
+		appendable.append(Optional.ofNullable(amount)
+				.map(MonetaryAmount::toString).orElse("null"));
+
+	}
+
+	@Override
+	public MonetaryAmount parse(CharSequence text)
+			throws MonetaryParseException {
+		ParserMonetaryAmount amount = parserMonetaryAmount(text);
+		return style.to(amount);
+	}
+
+	private ParserMonetaryAmount parserMonetaryAmount(CharSequence text) {
+		String[] array = Objects.requireNonNull(text).toString().split(" ");
+		CurrencyUnit currencyUnit = MonetaryCurrencies.getCurrency(array[0]);
+		BigDecimal number = new BigDecimal(array[1]);
+		return new ParserMonetaryAmount(currencyUnit, number);
+	}
+	private class ParserMonetaryAmount {
+		public ParserMonetaryAmount(CurrencyUnit currencyUnit, BigDecimal number) {
+			this.currencyUnit = currencyUnit;
+			this.number = number;
+		}
+
+		private CurrencyUnit currencyUnit;
+		private BigDecimal number;
+	}
+
+	/**
+	 * indicates with implementation will used to format or parser in
+	 * ToStringMonetaryAmountFormat
+	 */
+	enum ToStringMonetaryAmountFormatStyle {
+		MONEY {
+			@Override
+			MonetaryAmount to(ParserMonetaryAmount amount) {
+				return Money.of(amount.number, amount.currencyUnit);
+			}
+		},
+		FAST_MONEY {
+			@Override
+			MonetaryAmount to(ParserMonetaryAmount amount) {
+				return FastMoney.of(amount.number, amount.currencyUnit);
+			}
+		},
+		ROUNDED_MONEY {
+			@Override
+			MonetaryAmount to(ParserMonetaryAmount amount) {
+				return RoundedMoney.of(amount.number, amount.currencyUnit);
+			}
+		};
+		abstract MonetaryAmount to(ParserMonetaryAmount amount);
+	}
+
+}