Added additional tests.

Author: atsticks

src/main/java/javax/money/MonetaryCurrencies.java

@@ -13,8 +13,6 @@
 package javax.money;
 
 import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -32,12 +30,6 @@
  */
 public final class MonetaryCurrencies {
 
-	/**
-	 * Internal shared cache of {@link CustomCurrency} instances, registered
-	 * using {@link AbstractBuilder} instances.
-	 */
-	private static final Map<String, CurrencyUnit> REGISTERED = new ConcurrentHashMap<String, CurrencyUnit>();
-
 	/**
 	 * Required for deserialization only.
 	 */
@@ -81,9 +73,6 @@ public static CurrencyUnit getCurrency(String currencyCode) {
 								+ spi.getClass().getName(), e);
 			}
 		}
-		if (cu == null) {
-			cu = REGISTERED.get(currencyCode);
-		}
 		if (cu == null) {
 			throw new UnknownCurrencyException(currencyCode);
 		}
@@ -104,9 +93,7 @@ public static CurrencyUnit getCurrency(String currencyCode) {
 	 */
 	public static CurrencyUnit getCurrency(Locale locale) {
 		CurrencyUnit cu = null;
-		for (CurrencyProviderSpi spi : Bootstrap
-				.getServices(
-				CurrencyProviderSpi.class)) {
+		for (CurrencyProviderSpi spi : Bootstrap.getServices(CurrencyProviderSpi.class)) {
 			try {
 				cu = spi.getCurrencyUnit(locale);
 				if (cu != null) {

src/main/java/javax/money/MonetaryRoundings.java

@@ -260,7 +260,7 @@ public static MonetaryOperator getRounding(String customRoundingId) {
 	 * @return the set of custom rounding ids, never {@code null}.
 	 */
 	public static Set<String> getCustomRoundingIds() {
-		Set<String> result = new HashSet<String>();
+		Set<String> result = new HashSet<>();
 		for (RoundingProviderSpi prov : Bootstrap
 				.getServices(
 				RoundingProviderSpi.class)) {
@@ -278,7 +278,7 @@ public static Set<String> getCustomRoundingIds() {
 
 	/**
 	 * Default Rounding that rounds a {@link MonetaryAmount} based on the
-	 * amount's {@link CurrencyUnit} {@link Currency}.
+	 * amount's {@link CurrencyUnit}.
 	 * 
 	 * @author Anatole Tresch
 	 */

src/main/java/javax/money/convert/MonetaryConversions.java

@@ -10,11 +10,7 @@
  */
 package javax.money.convert;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.ServiceLoader;
+import java.util.*;
 import java.util.logging.Logger;
 
 import javax.money.CurrencyUnit;
@@ -158,9 +154,7 @@ public static CurrencyConversion getConversion(String termCurrencyCode,
 	 * Access an instance of {@link CurrencyConversion} using the given
 	 * providers as a provider chain. Use {@link #isProviderAvailable(String)}
 	 * to check, which are available.
-	 * 
-	 * @param conversionContext
-	 *            the {@link ConversionContext} required, not {@code null}.
+	 *
 	 * @return the exchange rate provider.
 	 * @throws IllegalArgumentException
 	 *             if no such {@link ExchangeRateProvider} is available.
@@ -172,7 +166,11 @@ public static ExchangeRateProvider getExchangeRateProvider(
 					.getExchangeRateProvider(getDefaultProviderChain().toArray(
 							new String[0]));
 		}
-		return MONETARY_CONVERSION_SPI.getExchangeRateProvider(providers);
+        ExchangeRateProvider provider = MONETARY_CONVERSION_SPI.getExchangeRateProvider(providers);
+        if(provider==null){
+            throw new MonetaryException("No such rate provider: " + Arrays.toString(providers));
+        }
+        return provider;
 	}
 
 	/**
@@ -204,7 +202,11 @@ public static Collection<String> getProviderNames() {
 	 *             if no such provider is registered.
 	 */
 	public static ProviderContext getProviderContext(String provider) {
-		return MONETARY_CONVERSION_SPI.getProviderContext(provider);
+        ProviderContext ctx = MONETARY_CONVERSION_SPI.getProviderContext(provider);
+        if(ctx==null){
+            throw new MonetaryException("No such rate provider: " + provider);
+        }
+        return ctx;
 	}
 
 	/**

src/main/java/javax/money/convert/ProviderContext.java

@@ -81,25 +81,6 @@ public Set<RateType> getRateTypes() {
 		return getNamedAttribute(Set.class, ProviderAttribute.RATE_TYPES);
 	}
 
-	/**
-	 * Add the given {@link RateType} to this context builder.
-	 * 
-	 * @param rateTypes
-	 *            the rate type, not {@code null}
-	 */
-	public void addRateTypes(RateType... rateTypes) {
-		Objects.requireNonNull(rateTypes);
-		Set<RateType> types = getNamedAttribute(Set.class,
-				ProviderAttribute.RATE_TYPES, null);
-		if (types == null) {
-			types = new HashSet<>();
-			set(types, ProviderAttribute.RATE_TYPES, Set.class);
-		}
-		for (RateType rateType : rateTypes) {
-			types.add(rateType);
-		}
-	}
-
 	/**
 	 * Returns the starting date/time this rate is valid. The result can also be
 	 * {@code null}, since it is possible, that an {@link ExchangeRate} does not
@@ -178,7 +159,7 @@ public Long getValidToMillis() {
 	public boolean isInScope(long timestamp) {
 		Long validTo = getValidTo(Long.class);
 		Long validFrom = getValidFrom(Long.class);
-		if (validTo != null && validTo.longValue() < timestamp) {
+		if (validTo != null && validTo.longValue() <= timestamp) {
 			return false;
 		}
 		if (validFrom != null && validFrom.longValue() > timestamp) {
@@ -368,7 +349,7 @@ public ProviderContext create() {
 	public static ProviderContext from(ConversionContext conversionContext) {
 		return new Builder(conversionContext.getProvider())
 				.setRateTypes(conversionContext.getRateType())
-				.setAll(conversionContext).create();
+				.setAll(conversionContext).setProviderName(conversionContext.getProvider()).create();
 	}
 
 }

src/main/java/javax/money/format/AmountStyle.java

@@ -248,7 +248,7 @@ public boolean equals(Object obj) {
 	 */
 	@Override
 	public String toString() {
-		return "FormatStyle [locale=" + locale + ", formatPattern="
+		return "AmountStyle [locale=" + locale + ", formatPattern="
 				+ pattern
 				+ ", currencyStyle="
 				+ currencyStyle

src/main/java/javax/money/format/MonetaryFormats.java

@@ -95,194 +95,4 @@ public static final Set<Locale> getAvailableLocales() {
 		return AmountStyle.getAvailableLocales();
 	}
 
-//	/**
-//	 * Builder for creating new instances of {@link MonetaryAmountFormat}.
-//	 */
-//	public static final class Builder {
-//		/** The default {@link CurrencyUnit}, may be null. */
-//		private CurrencyUnit defaultCurrency;
-//		/** The required {@link MonetaryContext}, may be null. */
-//		private MonetaryContext monetaryContext;
-//		/** The {@link AmountStyle} to be used, may be null, when an {@link Locale} is set. */
-//		private AmountStyle.Builder styleBuilder;
-//		/** The format's name (optional). */
-//		private String name;
-//
-//		/**
-//		 * Creates a new {@link Builder}, hereby the {@link AmountStyle} is determined by the
-//		 * {@link Locale} given.
-//		 * 
-//		 * @param locale
-//		 *            the target {@link Locale}.
-//		 */
-//		public Builder(Locale locale) {
-//			Objects.requireNonNull(locale, "Locale required.");
-//			this.styleBuilder = new AmountStyle.Builder(locale);
-//		}
-//
-//		/**
-//		 * Sets the format's name.
-//		 * 
-//		 * @param name
-//		 *            the name, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setName(String name) {
-//			this.name = name;
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the default {@link CurrencyUnit} to be used, when parsing amounts where no currency
-//		 * is available on the input.
-//		 * 
-//		 * @param defaultCurrency
-//		 *            the default {@link CurrencyUnit}
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setDefaultCurrency(CurrencyUnit defaultCurrency) {
-//			this.defaultCurrency = defaultCurrency;
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the {@link CurrencyStyle} to be used.
-//		 * 
-//		 * @param currencyFormat
-//		 *            the {@link CurrencyStyle}, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setCurrencyStyle(CurrencyStyle currencyStyle) {
-//			this.styleBuilder.setCurrencyStyle(currencyStyle);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the {@link CurrencyStyle} to be used.
-//		 * 
-//		 * @param currencyFormat
-//		 *            the {@link CurrencyStyle}, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setAmountStyle(AmountStyle style) {
-//			this.styleBuilder.setCurrencyStyle(style.getCurrencyStyle());
-//			this.styleBuilder
-//					.setDisplayConversion(style.getDisplayConversion());
-//			this.styleBuilder.setGroupingSizes(style.getGroupingSizes());
-//			this.styleBuilder.setParseConversion(style.getParseConversion());
-//			this.styleBuilder.setPattern(style.getPattern());
-//			this.styleBuilder.setSymbols(style.getSymbols());
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the {@link MonetaryOperator} to be used as display conversion before formatting the
-//		 * amount.
-//		 * 
-//		 * @param conversion
-//		 *            the {@link MonetaryOperator}, or null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setDisplayConversion(MonetaryOperator conversion) {
-//			this.styleBuilder.setDisplayConversion(conversion);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the {@link MonetaryOperator} to be used as parse conversion after parsing the
-//		 * amount.
-//		 * 
-//		 * @param conversion
-//		 *            the {@link MonetaryOperator}, or null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setParseConversion(MonetaryOperator conversion) {
-//			this.styleBuilder.setParseConversion(conversion);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the customized number group sizes to be used for formatting. Hereby each value in
-//		 * the array represents a group size, starting from the decimal point and going up the
-//		 * significant digits. The last entry in the array is used as a default group size for all
-//		 * subsequent groupings.
-//		 * 
-//		 * @param groupSizes
-//		 *            the group sizes, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setNumberGroupSizes(int... groupSizes) {
-//			this.styleBuilder.setGroupingSizes(groupSizes);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the formats pattern, similar as in {@link java.text.DecimalFormat}.
-//		 * 
-//		 * @param pattern
-//		 *            the pattern, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setPattern(String pattern) {
-//			this.styleBuilder.setPattern(pattern);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the formats {@link AmountFormatSymbols}, similar as in
-//		 * {@link java.text.DecimalFormatSymbols}.
-//		 * 
-//		 * @param symbols
-//		 *            the symbols, not null.
-//		 * @return the {@link Builder}, for chaining.
-//		 */
-//		public Builder setSymbols(AmountFormatSymbols symbols) {
-//			this.styleBuilder.setSymbols(symbols);
-//			return this;
-//		}
-//
-//		/**
-//		 * Sets the {@link MonetaryContext} that determines the amount implementation class returned
-//		 * from parsing.
-//		 * 
-//		 * @param monetaryContext
-//		 *            the {@link MonetaryContext} to be used, or {@code null} for using the default
-//		 *            amount type.
-//		 * @return the {@link Builder}, for chaining.
-//		 * @see javax.money.MonetaryAmounts#queryAmountType(MonetaryContext)
-//		 * @see javax.money.MonetaryAmounts#getDefaultAmountType()
-//		 * @see javax.money.MonetaryAmounts#getDefaultAmountFactory()
-//		 */
-//		public Builder setMonetaryContext(MonetaryContext monetaryContext) {
-//			this.monetaryContext = monetaryContext;
-//			return this;
-//		}
-//
-//		/**
-//		 * Access a new {@link MonetaryAmountFormat}, matching the properties set.
-//		 * 
-//		 * @return a new {@link MonetaryAmountFormat} instance, never {@code null}.
-//		 * @throws MonetaryException
-//		 *             if no registered {@link MonetaryAmountFormatProviderSpi} can provide a
-//		 *             corresponding {@link MonetaryAmountFormat} instance.
-//		 */
-//		public MonetaryAmountFormat create() {
-//			AmountStyle style = styleBuilder.build();
-//			for (MonetaryAmountFormatProviderSpi spi : Bootstrap
-//					.getServices(
-//					MonetaryAmountFormatProviderSpi.class)) {
-//				MonetaryAmountFormat f = spi.getFormat(style);
-//				if (f != null) {
-//					f.setMonetaryContext(monetaryContext);
-//					f.setDefaultCurrency(defaultCurrency);
-//					return f;
-//				}
-//			}
-//			throw new MonetaryException(
-//					"No MonetaryAmountFormat found for amountStyle=" + style
-//							+ ", defaultCurrency=" + defaultCurrency
-//							+ ", monetaryContext=" + monetaryContext);
-//		}
-//	}
-
 }

src/main/java/javax/money/format/MonetaryParseException.java

@@ -50,6 +50,9 @@ public class MonetaryParseException extends MonetaryException {
 	public MonetaryParseException(String message, CharSequence parsedData,
 			int errorIndex) {
 		super(message);
+        if(errorIndex > parsedData.length()){
+            throw new IllegalArgumentException("Invalid error index > input.length");
+        }
 		this.data = parsedData;
 		this.errorIndex = errorIndex;
 	}
@@ -66,6 +69,9 @@ public MonetaryParseException(String message, CharSequence parsedData,
 	public MonetaryParseException(CharSequence parsedData,
 			int errorIndex) {
 		super("Parse Error");
+        if(errorIndex > parsedData.length()){
+            throw new IllegalArgumentException("Invalid error index > input.length");
+        }
 		this.data = parsedData;
 		this.errorIndex = errorIndex;
 	}