- Simplified/streamlined confusing AbstractContext API based on user feedback.

- Added some minor tweaks.

Author: atsticks

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

@@ -26,7 +26,7 @@
  * Builder for constructing new instances of {@link BuildableCurrencyUnit} using a fluent
  * API.
  */
-public final class CurrencyUnitBuilder{
+public final class CurrencyUnitBuilder {
     /**
      * The currency code.
      */
@@ -47,7 +47,7 @@ public final class CurrencyUnitBuilder{
     /**
      * Private constructor, use #of() methods.
      */
-    private CurrencyUnitBuilder(){
+    private CurrencyUnitBuilder() {
     }
 
     /**
@@ -56,7 +56,7 @@ private CurrencyUnitBuilder(){
      * @param currencyCode    the (unique) and identifying currency code, not null.
      * @param currencyContext The currency context to be used.
      */
-    public static CurrencyUnitBuilder of(String currencyCode, javax.money.CurrencyContext currencyContext){
+    public static CurrencyUnitBuilder of(String currencyCode, javax.money.CurrencyContext currencyContext) {
         return new CurrencyUnitBuilder(currencyCode, currencyContext);
     }
 
@@ -66,7 +66,7 @@ public static CurrencyUnitBuilder of(String currencyCode, javax.money.CurrencyCo
      * @param currencyCode the (unique) and identifying currency code, not null.
      * @param providerName the currency provider, not null.
      */
-    public static CurrencyUnitBuilder of(String currencyCode, String providerName){
+    public static CurrencyUnitBuilder of(String currencyCode, String providerName) {
         return new CurrencyUnitBuilder(currencyCode, CurrencyContextBuilder.of(providerName).build());
     }
 
@@ -75,21 +75,21 @@ public static CurrencyUnitBuilder of(String currencyCode, String providerName){
      *
      * @param currencyCode the (unique) and identifying currency code, not null.
      */
-    private CurrencyUnitBuilder(String currencyCode, javax.money.CurrencyContext currencyContext){
+    private CurrencyUnitBuilder(String currencyCode, javax.money.CurrencyContext currencyContext) {
         Objects.requireNonNull(currencyCode, "currencyCode required");
         this.currencyCode = currencyCode;
         Objects.requireNonNull(currencyContext, "currencyContext required");
         this.currencyContext = currencyContext;
     }
 
     /**
-     * Allows to set the currency code, for creating multiple instances, using one Builder.
+     * Allows to setTyped the currency code, for creating multiple instances, using one Builder.
      *
      * @param currencyCode the (unique) and identifying currency code, not null.
      * @return the Builder, for chaining.
      * @see javax.money.CurrencyUnit#getCurrencyCode()
      */
-    public CurrencyUnitBuilder setCurrencyCode(String currencyCode){
+    public CurrencyUnitBuilder setCurrencyCode(String currencyCode) {
         Objects.requireNonNull(currencyCode, "currencyCode required");
         this.currencyCode = currencyCode;
         this.currencyContext = CurrencyContextBuilder.of(getClass().getSimpleName()).build();
@@ -103,8 +103,8 @@ public CurrencyUnitBuilder setCurrencyCode(String currencyCode){
      * @return the Builder, for chaining.
      * @see javax.money.CurrencyUnit#getNumericCode()
      */
-    public CurrencyUnitBuilder setNumericCode(int numericCode){
-        if(numericCode < -1){
+    public CurrencyUnitBuilder setNumericCode(int numericCode) {
+        if (numericCode < -1) {
             throw new IllegalArgumentException("numericCode must be >= -1");
         }
         this.numericCode = numericCode;
@@ -118,8 +118,8 @@ public CurrencyUnitBuilder setNumericCode(int numericCode){
      * @return the Builder, for chaining.
      * @see javax.money.CurrencyUnit#getDefaultFractionDigits()
      */
-    public CurrencyUnitBuilder setDefaultFractionDigits(int defaultFractionDigits){
-        if(defaultFractionDigits < 0){
+    public CurrencyUnitBuilder setDefaultFractionDigits(int defaultFractionDigits) {
+        if (defaultFractionDigits < 0) {
             throw new IllegalArgumentException("defaultFractionDigits must be >= 0");
         }
         this.defaultFractionDigits = defaultFractionDigits;
@@ -132,7 +132,7 @@ public CurrencyUnitBuilder setDefaultFractionDigits(int defaultFractionDigits){
      * @return the new CurrencyUnit instance.
      * @throws javax.money.MonetaryException if creation fails
      */
-    public CurrencyUnit build(){
+    public CurrencyUnit build() {
         return build(false);
     }
 
@@ -145,9 +145,9 @@ public CurrencyUnit build(){
      * @return the new CurrencyUnit instance.
      * @see javax.money.MonetaryCurrencies#getCurrency(String, String...)
      */
-    public CurrencyUnit build(boolean register){
+    public CurrencyUnit build(boolean register) {
         BuildableCurrencyUnit cu = new BuildableCurrencyUnit(this);
-        if(register){
+        if (register) {
             ConfigurableCurrencyUnitProvider.registerCurrencyUnit(cu);
         }
         return cu;
@@ -164,9 +164,9 @@ public CurrencyUnit build(boolean register){
      * @see javax.money.MonetaryCurrencies#getCurrency(String, String...)
      * @see javax.money.MonetaryCurrencies#getCurrency(java.util.Locale, String...)
      */
-    public CurrencyUnit build(boolean register, Locale locale){
+    public CurrencyUnit build(boolean register, Locale locale) {
         BuildableCurrencyUnit cu = new BuildableCurrencyUnit(this);
-        if(register){
+        if (register) {
             ConfigurableCurrencyUnitProvider.registerCurrencyUnit(cu);
             ConfigurableCurrencyUnitProvider.registerCurrencyUnit(cu, locale);
         }

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

@@ -23,7 +23,7 @@
 /**
  * This class models an exchange rate, which defines the factor the numeric value of a base amount in some currency
  * 'A' must be multiplied
- * to get the corresponding amount in the terminating currency 'B'. Hereby
+ * to getTyped the corresponding amount in the terminating currency 'B'. Hereby
  * <ul>
  * <li>an exchange rate always models one rate from a base (source) to a term
  * (target) {@link javax.money.CurrencyUnit}.</li>
@@ -129,10 +129,10 @@ class DefaultExchangeRate implements ExchangeRate, Serializable, Comparable<Exch
     }
 
     /**
-     * Internal method to set the rate chain, which also ensure that the chain
+     * Internal method to setTyped the rate chain, which also ensure that the chain
      * passed, when not null, contains valid elements.
      *
-     * @param chain the chain to set.
+     * @param chain the chain to setTyped.
      */
     private void setExchangeRateChain(List<ExchangeRate> chain) {
         this.chain.clear();

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

@@ -45,7 +45,7 @@ public MonetaryContext getContext() {
         } catch (Exception e) {
             Logger.getLogger(DefaultMonetaryContextFactory.class.getName())
                     .log(Level.SEVERE, "Error evaluating default NumericContext, using default (NumericContext.NUM64).", e);
-            return MonetaryContextBuilder.of(Money.class).set(MathContext.DECIMAL64).build();
+            return MonetaryContextBuilder.of(Money.class).setTyped(MathContext.DECIMAL64).build();
         }
     }
 
@@ -57,32 +57,32 @@ private MonetaryContext createContextWithConfig(Map<String, String> config) {
                 case "DECIMAL32":
                     Logger.getLogger(Money.class.getName()).info(
                             "Using MathContext.DECIMAL32");
-                    builder.set(MathContext.DECIMAL32);
+                    builder.setTyped(MathContext.DECIMAL32);
                     break;
                 case "DECIMAL64":
                     Logger.getLogger(Money.class.getName()).info(
                             "Using MathContext.DECIMAL64");
-                    builder.set(MathContext.DECIMAL64);
+                    builder.setTyped(MathContext.DECIMAL64);
                     break;
                 case "DECIMAL128":
                     Logger.getLogger(Money.class.getName()).info(
                             "Using MathContext.DECIMAL128");
-                    builder.set(MathContext.DECIMAL128);
+                    builder.setTyped(MathContext.DECIMAL128);
                     break;
                 case "UNLIMITED":
                     Logger.getLogger(Money.class.getName()).info(
                             "Using MathContext.UNLIMITED");
-                    builder.set(MathContext.UNLIMITED);
+                    builder.setTyped(MathContext.UNLIMITED);
                     break;
                 default:
                     Logger.getLogger(Money.class.getName()).warning(
                             "Found invalid MathContext: " + value + ", using default MathContext.DECIMAL64");
-                    builder.set(MathContext.DECIMAL64);
+                    builder.setTyped(MathContext.DECIMAL64);
             }
         } else {
             Logger.getLogger(Money.class.getName()).info(
                     "Using default MathContext.DECIMAL64");
-            builder.set(MathContext.DECIMAL64);
+            builder.setTyped(MathContext.DECIMAL64);
         }
         return builder.build();
     }
@@ -91,7 +91,7 @@ private MonetaryContext createMonetaryContextNonNullConfig(Map<String, String> c
         String value = config.get("org.javamoney.moneta.Money.defaults.roundingMode");
         RoundingMode rm = Objects.nonNull(value) ? RoundingMode.valueOf(value
                 .toUpperCase(Locale.ENGLISH)) : RoundingMode.HALF_UP;
-        MonetaryContext mc = MonetaryContextBuilder.of(Money.class).setPrecision(prec).set(rm).set(Money.class).build();
+        MonetaryContext mc = MonetaryContextBuilder.of(Money.class).setPrecision(prec).setTyped(rm).setTyped(Money.class).build();
         Logger.getLogger(DefaultMonetaryContextFactory.class.getName()).info("Using custom MathContext: precision=" + prec
                 + ", roundingMode=" + rm);
         return mc;

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

@@ -73,7 +73,7 @@ public final class Money implements MonetaryAmount, Comparable<MonetaryAmount>,
     private static final long serialVersionUID = -7565813772046251748L;
 
     /**
-     * The default {@link MonetaryContext} applied, if not set explicitly on
+     * The default {@link MonetaryContext} applied, if not setTyped explicitly on
      * creation.
      */
     public static final MonetaryContext DEFAULT_MONETARY_CONTEXT = new DefaultMonetaryContextFactory().getContext();
@@ -93,12 +93,6 @@ public final class Money implements MonetaryAmount, Comparable<MonetaryAmount>,
      */
     private BigDecimal number;
 
-    /**
-     * The number value.
-     */
-    private transient NumberValue numberValue;
-
-
     /**
      * Creates a new instance os {@link Money}.
      *
@@ -164,10 +158,7 @@ public MonetaryContext getMonetaryContext(){
      */
     @Override
     public NumberValue getNumber(){
-        if(Objects.isNull(numberValue)){
-            numberValue = new DefaultNumberValue(this.number);
-        }
-        return numberValue;
+        return new DefaultNumberValue(number);
     }
 
     /**