JAVAMONEY-91: renamed getXXXContext() to getContext().

Author: atsticks

src/main/asciidoc/JavaMoneySpecification.adoc

@@ -2686,41 +2686,44 @@ customized logging Handler instances, so alternate logging backends can be used
 The implementation that implements the API’s SPI may use a different logging approach.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
 [[MetadataModeling]]
-== Meta-Data Modeling ==
+== Meta-Data Contexts and Query Models ==
 === Overview ===
 
-The JSR uses a unified meta-data model to support also more advanced use cases, which are not explicitly specified.
+The JSR uses a unified meta-data model to support more advanced use cases, which are not explicitly specified.
 Mostly reasons for not specifying these aspects is that these things are highly use case and organization dependent
 aspects. In general there are 2 flavors of meta-data used throughout the JSR:
 
 . _Contexts_ provide additional information on value types or services, such as currencies, amounts, conversions or
   formats. Contexts are accessible directly from the corresponding value types, by calling methods named
-  +getXXXContext()+.
-. _Queries_ models a generic and flexible way to configure services, such as currencies, amounts, conversions or formats
-  as needed. Queries can be passed to the different accessor singletons, and also are forwarded to the SPI
+  +getContext()+.
+. _Queries_ models a generic and flexible way to configure/parametrize services for accessing currencies, amounts,
+  conversions or formats. Queries can be passed to the different accessor singletons, and also are forwarded to the SPI
   implementations effectively providing the data/services required.
 
 Similarly there are two abstract base classes provided:
 
 . +AbstractContext+ models an abstract base type, which is extended by all context implementations within this JSR,
   such as +MonetaryContext, CurrencyContext, RoundingContext, ProviderContext, ConversionContext, AmountFormatContext+.
-. +AbstractQuery+ models an abstract base type, which is extended by all query implementations within this JSR,
+. +AbstractQuery+ models an abstract base query, which is extended by all query implementations within this JSR,
   such as +MonetaryAmountFactoryQuery, CurrencyQuery, RoundingQuery, ConversionQuery, AmountFormatQuery+.
 
 The following sections give further information on these concepts.
 
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
 [[AbstractContext]]
 === AbstractContext ===
 
@@ -2737,9 +2740,8 @@ implements Serializable{
   ...
   public String getProviderName();
   public Long getTimestampMillis();
-  public TemporalAccessor getTimestamp();
+  public LocalDateTime getTimestamp();
 
-  public boolean isEmpty();
   public Boolean getBoolean(String key);
   public Integer getInt(String key);
   public Long getLong(String key);
@@ -2748,19 +2750,23 @@ implements Serializable{
   public String getText(String key);
   public <T> T get(Class<T> type);
   public <T> T get(String key, Class<T> type);
+
+  public boolean isEmpty();
+  public Class<?> getType(String key);
   public Set<String> getKeys(Class<?> type)
-  public <T> Map<String,T> getValues(Class<T> type)
 }
 -------------------------------------------------------------------------------
 
 Hereby
 
 * each context instance is related to a provider, that created the context, accessible from +getProviderName()+.
-* each context instance can have an (optional) timestamp.
+* each context instance can have an (optional) timestamp, e.g. usable for historic data.
 * additional attributes can be set, which models a type safe interface for adding properties, without
   duplicating artifacts or creating non portable dependencies.
   ** identified by the attribute’s type.
   ** identified an arbitrary literal key
+* the +getXXX, get+ methods only return values of the resulting type is assignment compatible, so no class cast
+  exceptions do occur.
 
 The classes extending this class hereby are thread-safe and immutable:
 
@@ -2797,26 +2803,20 @@ public abstract class AbstractContextBuilder<B extends AbstractContextBuilder, C
 implements Serializable{
   public B setProviderName(String provider);
   public B setTimestampMillis(long timestamp);
-  public B setTimestamp(TemporalAccessor timestamp);
+  public B setTimestamp(LocalDateTime timestamp);
 
   public B set(Object value);
   public <T> B set(T value, Class<? extends T> type);
   public B set(String key, Object value);
   public <T> B set(String key, T value, Class<? extends T> type)
-  public B set(int value);
   public B set(String key, int value);
-  public B set(long value);
   public B set(String key, long value);
-  public B set(float value);
   public B set(String key, float value);
-  public B set(double value);
   public B set(String key, double value);
-  public B set(String key, String value);
 
   public B importContext(AbstractContext context, boolean overwriteDuplicates);
   public B importContext(AbstractContext context);
-  public B removeAttributes(Class<?> type, String... keys);
-  public B removeAll(Class<?> type);
+  public B removeAttributes(String... keys);
 
   public abstract C build();
 

src/main/java/javax/money/CurrencyContextBuilder.java

@@ -18,7 +18,7 @@
  * <p>
  * Note this class is NOT thread-safe.
  *
- * @see javax.money.CurrencyUnit#getCurrencyContext()
+ * @see javax.money.CurrencyUnit#getContext()
  */
 public final class CurrencyContextBuilder extends AbstractContextBuilder<CurrencyContextBuilder, CurrencyContext> {
 

src/main/java/javax/money/CurrencyUnit.java

@@ -95,6 +95,6 @@ public interface CurrencyUnit extends Comparable<CurrencyUnit>{
      * on the type and capabilities of a CurrencyUnit, e.g. its provider and more.
      * @return the currency's context, never null.
      */
-    CurrencyContext getCurrencyContext();
+    CurrencyContext getContext();
 
 }

src/main/java/javax/money/MonetaryAmount.java

@@ -104,7 +104,7 @@ public interface MonetaryAmount extends CurrencySupplier, NumberSupplier, Compar
      *
      * @return the {@link MonetaryContext} of this {@code MonetaryAmount}, never {@code null} .
      */
-    MonetaryContext getMonetaryContext();
+    MonetaryContext getContext();
 
     /**
      * Queries this monetary amount for a value.

src/main/java/javax/money/MonetaryAmountFactory.java

@@ -143,13 +143,13 @@ default MonetaryAmountFactory<T> setCurrency(String currencyCode) {
      *
      * @param amount the amount to be used, not {@code null}.
      * @return this factory instance, for chaining.
-     * @throws MonetaryException when the {@link MonetaryContext} implied by {@code amount.getMonetaryContext()}
+     * @throws MonetaryException when the {@link MonetaryContext} implied by {@code amount.getContext()}
      *                           exceeds the capabilities supported by this factory type.
      */
     default MonetaryAmountFactory<T> setAmount(MonetaryAmount amount) {
         setCurrency(amount.getCurrency());
         setNumber(amount.getNumber());
-        setContext(amount.getMonetaryContext());
+        setContext(amount.getContext());
         return this;
     }
 

src/main/java/javax/money/MonetaryContext.java

@@ -103,7 +103,7 @@ public int getMaxScale() {
      * Get the MonetaryAmount implementation class.
      *
      * @return the implementation class of the containing amount instance, never null.
-     * @see MonetaryAmount#getMonetaryContext()
+     * @see MonetaryAmount#getContext()
      */
     public Class<? extends MonetaryAmount> getAmountType() {
         Class<?> clazz = get(AMOUNT_TYPE, Class.class);

src/main/java/javax/money/MonetaryContextBuilder.java

@@ -15,7 +15,7 @@
  * <p>
  * Note this class is NOT thread-safe.
  *
- * @see javax.money.MonetaryAmount#getMonetaryContext()
+ * @see javax.money.MonetaryAmount#getContext()
  */
 public final class MonetaryContextBuilder extends AbstractContextBuilder<MonetaryContextBuilder, MonetaryContext> {
 
@@ -69,7 +69,7 @@ public MonetaryContextBuilder setFixedScale(boolean fixedScale) {
      * Set the MonetaryAmount implementation class.
      *
      * @return the implementation class of the containing amount instance, never null.
-     * @see javax.money.MonetaryAmount#getMonetaryContext()
+     * @see javax.money.MonetaryAmount#getContext()
      */
     public MonetaryContextBuilder setAmountType(Class<? extends MonetaryAmount> amountType) {
         return set(MonetaryContext.AMOUNT_TYPE, amountType);

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

@@ -46,7 +46,7 @@ public interface CurrencyConversion extends MonetaryOperator, CurrencySupplier {
      *
      * @return the target {@link ConversionContext}.
      */
-    ConversionContext getConversionContext();
+    ConversionContext getContext();
 
     /**
      * Get the {@link ExchangeRate} applied for the given {@link MonetaryAmount}

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

@@ -76,7 +76,7 @@
  * <ul>
  * <li>must be Comparable(with {@code ExchangeRate})</li>
  * <li>must implement equals/hashCode considering #getBaseCurrency, #getCurrency,
- * #getFactor and #getConversionContext.</li>
+ * #getFactor and #getContext.</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>
@@ -96,7 +96,7 @@ public interface ExchangeRate extends CurrencySupplier {
      *
      * @return the conversion context, never null.
      */
-    ConversionContext getConversionContext();
+    ConversionContext getContext();
 
     /**
      * Get the base (source) {@link CurrencyUnit}.

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

@@ -46,7 +46,7 @@ public interface ExchangeRateProvider{
      *
      * @return the exchange rate type, never {@code null}.
      */
-    ProviderContext getProviderContext();
+    ProviderContext getContext();
 
     /**
      * Access a {@link ExchangeRate} using the given currencies. The
@@ -88,7 +88,7 @@ default boolean isAvailable(ConversionQuery conversionQuery){
         Objects.requireNonNull(conversionQuery);
         try{
             return conversionQuery.getProviderNames().isEmpty() ||
-                    conversionQuery.getProviderNames().contains(getProviderContext().getProviderName());
+                    conversionQuery.getProviderNames().contains(getContext().getProviderName());
         }
         catch(Exception e){
             return false;
@@ -182,7 +182,7 @@ default ExchangeRate getExchangeRate(String baseCode, String termCode){
      * the rate cannot be reversed.
      */
     default ExchangeRate getReversed(ExchangeRate rate){
-        ConversionQuery reverseQuery = rate.getConversionContext().toQueryBuilder().setBaseCurrency(rate.getCurrency())
+        ConversionQuery reverseQuery = rate.getContext().toQueryBuilder().setBaseCurrency(rate.getCurrency())
                 .setTermCurrency(rate.getBaseCurrency()).build();
         if(isAvailable(reverseQuery)){
             return getExchangeRate(reverseQuery);