https://java.net/jira/browse/JAVAMONEY-75 :

Unified getCurrency/setCurrency method names.
Adapted to this change.

Author: atsticks

src/main/java/javax/money/CurrencyQuery.java

@@ -33,17 +33,17 @@ public final class CurrencyQuery extends AbstractQuery implements Serializable{
     /**
      * Key for storing a countries to be queried.
      */
-    public static final String KEY_QUERY_COUNTRIES = "Query.countries";
+    static final String KEY_QUERY_COUNTRIES = "Query.countries";
 
     /**
      * Key for storing a target literal currency codes to be queried.
      */
-    public static final String KEY_QUERY_CURRENCY_CODES = "Query.currencyCodes";
+    static final String KEY_QUERY_CURRENCY_CODES = "Query.currencyCodes";
 
     /**
      * Key for storing a target numeric currency codes to be queried.
      */
-    public static final String KEY_QUERY_NUMERIC_CODES = "Query.numericCodes";
+    static final String KEY_QUERY_NUMERIC_CODES = "Query.numericCodes";
 
     /**
      * Constructor, used from the Builder.

src/main/java/javax/money/MonetaryAmountFactoryQuery.java

@@ -30,17 +30,17 @@ public final class MonetaryAmountFactoryQuery extends AbstractQuery implements S
     /**
      * Key name for the context.
      */
-    public static final String KEY_PRECISION = "precision";
+    static final String KEY_PRECISION = "precision";
 
     /**
      * Key name for the currency provider.
      */
-    public static final String KEY_FIXED_SCALE = "fixedScale";
+    static final String KEY_FIXED_SCALE = "fixedScale";
 
     /**
      * Key name for the max scale.
      */
-    public static final String KEY_MAX_SCALE = "maxScale";
+    static final String KEY_MAX_SCALE = "maxScale";
 
     /**
      * Constructor, used from the {@link javax.money.MonetaryAmountFactoryQueryBuilder}.

src/main/java/javax/money/RoundingContext.java

@@ -26,9 +26,11 @@
  *
  * @author Anatole Tresch
  */
-public final class RoundingContext extends AbstractContext implements Serializable{
-    /** Attribute key used for the rounding name. */
-    public static final String KEY_ROUNDING_NAME = "roundingName";
+public final class RoundingContext extends AbstractContext implements Serializable, CurrencySupplier{
+    /**
+     * Attribute key used for the rounding name.
+     */
+    static final String KEY_ROUNDING_NAME = "roundingName";
 
     /**
      * Constructor, used from the {@link javax.money.RoundingContextBuilder}.
@@ -53,7 +55,7 @@ public String getRoundingName(){
      *
      * @return the target CurrencyUnit, or null.
      */
-    public CurrencyUnit getCurrencyUnit(){
+    public CurrencyUnit getCurrency(){
         return get(CurrencyUnit.class, (CurrencyUnit) null);
     }
 

src/main/java/javax/money/RoundingContextBuilder.java

@@ -49,7 +49,7 @@ private RoundingContextBuilder(RoundingContext roundingContext){
      *
      * @return the target CurrencyUnit, or null.
      */
-    public RoundingContextBuilder setCurrencyUnit(CurrencyUnit currencyUnit){
+    public RoundingContextBuilder setCurrency(CurrencyUnit currencyUnit){
         Objects.requireNonNull(currencyUnit);
         return set(currencyUnit, CurrencyUnit.class);
     }

src/main/java/javax/money/RoundingQuery.java

@@ -24,13 +24,17 @@
  * <p>
  * This class is immutable, thread-safe and serializable.
  */
-public final class RoundingQuery extends AbstractQuery{
+public final class RoundingQuery extends AbstractQuery implements CurrencySupplier{
 
-    /** Attribute key used for the rounding name attribute. */
-    public static final String KEY_QUERY_ROUNDING_NAME = "Query.roundingName";
+    /**
+     * Attribute key used for the rounding name attribute.
+     */
+    static final String KEY_QUERY_ROUNDING_NAME = "Query.roundingName";
 
-    /** Attribute key used for the scale attribute. */
-    public static final String KEY_QUERY_SCALE = "Query.scale";
+    /**
+     * Attribute key used for the scale attribute.
+     */
+    static final String KEY_QUERY_SCALE = "Query.scale";
 
     /**
      * Constructor, used from the {@link javax.money.RoundingQueryBuilder}.
@@ -64,15 +68,16 @@ public Integer getScale(){
         return getInt(KEY_QUERY_SCALE, null);
     }
 
+
     /**
-     * Sets the target CurrencyUnit. Typically this determines all other properties,
-     * such as scale and the concrete rounding algorithm. With
+     * Returns the target CurrencyUnit, or null.
+     * Typically this determines all other properties, such as scale and the concrete rounding algorithm. With
      * rounding names, depending on the implementation, additional sub-selections are possible. Similarly
      * additional attributes can be used to select special rounding instances, e.g. for cash rounding.
      *
      * @return the CurrencyUnit, or null.
      */
-    public CurrencyUnit getCurrencyUnit(){
+    public CurrencyUnit getCurrency(){
         return get(CurrencyUnit.class, (CurrencyUnit) null);
     }
 

src/main/java/javax/money/RoundingQueryBuilder.java

@@ -71,7 +71,7 @@ public RoundingQueryBuilder setScale(int scale){
      * @param currencyUnit the target {@link CurrencyUnit} not null.
      * @return this instance for chaining
      */
-    public RoundingQueryBuilder setCurrencyUnit(CurrencyUnit currencyUnit){
+    public RoundingQueryBuilder setCurrency(CurrencyUnit currencyUnit){
         Objects.requireNonNull(currencyUnit);
         set(CurrencyUnit.class, currencyUnit, CurrencyUnit.class);
         return this;

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

@@ -8,6 +8,7 @@
 package javax.money.convert;
 
 import javax.money.AbstractQuery;
+import javax.money.CurrencySupplier;
 import javax.money.CurrencyUnit;
 import java.util.*;
 
@@ -16,19 +17,27 @@
  * should returns the <i>default</i> currencies.<p/>
  * This class is immutable, serializable and thread-safe.
  */
-public final class ConversionQuery extends AbstractQuery{
-    /** serialVersionUID. */
-	private static final long serialVersionUID = -9147265628185601586L;
+public final class ConversionQuery extends AbstractQuery implements CurrencySupplier{
+    /**
+     * serialVersionUID.
+     */
+    private static final long serialVersionUID = -9147265628185601586L;
 
 
-    /** THe key used for the base currency attribute. */
-    public static final String KEY_BASE_CURRENCY = "Query.baseCurrency";
+    /**
+     * THe key used for the base currency attribute.
+     */
+    static final String KEY_BASE_CURRENCY = "Query.baseCurrency";
 
-    /** THe key used for the term currency attribute. */
-    public static final String KEY_TERM_CURRENCY = "Query.termCurrency";
+    /**
+     * THe key used for the term currency attribute.
+     */
+    static final String KEY_TERM_CURRENCY = "Query.termCurrency";
 
-    /** THe key used for the rate types attribute. */
-    public static final String KEY_RATE_TYPES = "Query.rateTypes";
+    /**
+     * THe key used for the rate types attribute.
+     */
+    static final String KEY_RATE_TYPES = "Query.rateTypes";
 
     /**
      * Constructor, used from the ConversionQueryBuilder.
@@ -68,7 +77,7 @@ public CurrencyUnit getBaseCurrency(){
      *
      * @return the terminating CurrencyUnit, or null.
      */
-    public CurrencyUnit getTermCurrency(){
+    public CurrencyUnit getCurrency(){
         return getAny(KEY_TERM_CURRENCY, CurrencyUnit.class, null);
     }
 
@@ -80,5 +89,5 @@ public CurrencyUnit getTermCurrency(){
     public ConversionQueryBuilder toBuilder(){
         return ConversionQueryBuilder.create(this);
     }
- 
+
 }

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

@@ -8,10 +8,7 @@
  */
 package javax.money.convert;
 
-import javax.money.CurrencyUnit;
-import javax.money.MonetaryAmount;
-import javax.money.MonetaryException;
-import javax.money.MonetaryOperator;
+import javax.money.*;
 
 /**
  * This interface defines a {@link CurrencyConversion} that is converting a {@link MonetaryAmount} to another
@@ -30,39 +27,33 @@
  *     MonetaryAmount amountInCHF = amount.with(conversion);
  * </pre>
  * <p>
+ * The terminating {@link CurrencyUnit} of this conversion instance can be
+ * accessed from {@code getCurrency()}, inherited from {@code CurrencySupplier}.
+ * <p>
  * Instances of this class are required to be thread-safe, but it is not a
  * requirement that they are serializable. In a EE context they can be
  * implemented using contextual beans.
- * 
+ *
  * @author Anatole Tresch
  * @author Werner Keil
  */
-public interface CurrencyConversion extends MonetaryOperator {
-
-	/**
-	 * Access the terminating {@link CurrencyUnit} of this conversion instance.
-	 * 
-	 * @return the terminating {@link CurrencyUnit} , never {@code null}.
-	 */
-    CurrencyUnit getTermCurrency();
+public interface CurrencyConversion extends MonetaryOperator, CurrencySupplier{
 
-	/**
-	 * Access the target {@link ConversionContext} of this conversion instance.
-	 * 
-	 * @return the target {@link ConversionContext}.
-	 */
+    /**
+     * Access the target {@link ConversionContext} of this conversion instance.
+     *
+     * @return the target {@link ConversionContext}.
+     */
     ConversionContext getConversionContext();
 
-	/**
-	 * Get the {@link ExchangeRate} applied for the given {@link MonetaryAmount}
-	 * .
-	 * 
-	 * @param sourceAmount
-	 *            the amount to be converted.
-	 * @return the {@link ExchangeRate} applied.
-	 * @throws MonetaryException
-	 *             if the amount can not be converted.
-	 */
+    /**
+     * Get the {@link ExchangeRate} applied for the given {@link MonetaryAmount}
+     * .
+     *
+     * @param sourceAmount the amount to be converted.
+     * @return the {@link ExchangeRate} applied.
+     * @throws MonetaryException if the amount can not be converted.
+     */
     ExchangeRate getExchangeRate(MonetaryAmount sourceAmount);
 
 }

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

@@ -111,17 +111,17 @@ public CurrencyConversionException(CurrencyUnit base, CurrencyUnit term,
 	 * 
 	 * @return the currency at fault, may be null
 	 */
-	public CurrencyUnit getBase() {
-		return base;
+    public CurrencyUnit getBaseCurrency(){
+        return base;
 	}
 
 	/**
 	 * Gets the second currency at fault.
 	 * 
 	 * @return the currency at fault, may be null
 	 */
-	public CurrencyUnit getTerm() {
-		return term;
+    public CurrencyUnit getTermCurrency(){
+        return term;
 	}
 
 	/**

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

@@ -10,6 +10,7 @@
  */
 package javax.money.convert;
 
+import javax.money.CurrencySupplier;
 import javax.money.CurrencyUnit;
 import javax.money.NumberValue;
 import java.io.Serializable;
@@ -73,20 +74,22 @@
  * <h3>Implementation Specification</h3>
  * <p>Implementations of this interface
  * <ul>
- *     <li>must be Comparable(with {@code ExchangeRate})</li>
- *     <li>must implement equals/hashCode considering #getBase, #getTerm, #getFactor and #getConversionContext.</li>
- *     <li>should be thread-safe</li>
- *     <li>should be serializable</li>
- *     <li>should provide a fluent builder API for constructing new rate instances easily.</li>
+ * <li>must be Comparable(with {@code ExchangeRate})</li>
+ * <li>must implement equals/hashCode considering #getBaseCurrency, #getCurrency,
+ * #getFactor and #getConversionContext.</li>
+ * <li>should be thread-safe</li>
+ * <li>should be serializable</li>
+ * <li>should provide a fluent builder API for constructing new rate instances easily.</li>
  * </ul>
  * </ul></p>
+ *
  * @author Werner Keil
  * @author Anatole Tresch
  * @see <a
  * href="https://en.wikipedia.org/wiki/Exchange_rate#Quotations">Wikipedia:
  * Exchange Rate (Quotations)</a>
  */
-public interface ExchangeRate{
+public interface ExchangeRate extends CurrencySupplier{
 
     /**
      * Access the {@link ConversionContext} of {@link ExchangeRate}.
@@ -100,14 +103,15 @@ public interface ExchangeRate{
      *
      * @return the base {@link CurrencyUnit}.
      */
-    CurrencyUnit getBase();
+    CurrencyUnit getBaseCurrency();
 
     /**
      * Get the term (target) {@link CurrencyUnit}.
      *
      * @return the term {@link CurrencyUnit}.
      */
-    CurrencyUnit getTerm();
+    @Override
+    CurrencyUnit getCurrency();
 
     /**
      * Access the rate's bid factor.
@@ -130,14 +134,14 @@ public interface ExchangeRate{
      * Derived exchange rates are defined by an ordered list of subconversions
      * with intermediate steps, whereas a direct conversion is possible in one
      * steps.
-     * <p/>
+     * <p>
      * This method always returns {@code true}, if the chain contains more than
      * one rate. Direct rates, have also a chain, but with exact one rate.
      *
      * @return true, if the exchange rate is derived.
      */
     default boolean isDerived(){
-        return getExchangeRateChain().size()>1;
+        return getExchangeRateChain().size() > 1;
     }
 
 }