#315 Fix misspelling: replace Fond with Fund.

JavaMoney · Sep 12, 2019 · 7926947 · 7926947
1 parent d8eb163
commit 7926947
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/...vert/moneta-convert-base/src/main/java/org/javamoney/moneta/convert/ExchangeRateType.java b/...vert/moneta-convert-base/src/main/java/org/javamoney/moneta/convert/ExchangeRateType.java
@@ -36,15 +36,15 @@ public enum ExchangeRateType implements ExchangeRateProviderSupplier {
      */
     ECB("ECB", "Exchange rate to the European Central Bank."),
     /**
-     * Exchange rate to the International Monetary Fond. Uses the
+     * Exchange rate to the International Monetary Fund. Uses the
      * {@code IMFRateProvider} implementation.
      */
-    IMF("IMF", "Exchange rate to the International Monetary Fond."),
+    IMF("IMF", "Exchange rate to the International Monetary Fund."),
     /**
-     * Exchange rate to the International Monetary Fond from historic. Uses the
+     * Exchange rate to the International Monetary Fund from historic. Uses the
      * {@code IMFHistoricRateProvider} implementation.
      */
-    IMF_HIST("IMF-HIST", "Exchange rate to the International Monetary Fond that retrieve historical information on lazy way."),
+    IMF_HIST("IMF-HIST", "Exchange rate to the International Monetary Fund that retrieve historical information on lazy way."),
     /**
      * Exchange rate to European Central Bank (last 90 days). Uses the
      * {@code ECBHistoric90RateProvider} implementation.

diff --git a/...ert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProviderTest.java b/...ert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProviderTest.java
@@ -222,7 +222,7 @@ public void shouldSetTimeInLocalDateTime() {
 		LocalDate localDate = YearMonth.of(2014, Month.JANUARY).atDay(9);
 
 		ConversionQuery conversionQuery = ConversionQueryBuilder.of()
-				.setTermCurrency(EURO).set(localDate).build();
+                        .setTermCurrency(EURO).set(localDate).build();
 		CurrencyConversion currencyConversion = provider
 				.getCurrencyConversion(conversionQuery);
 		assertNotNull(currencyConversion);

diff --git a/...a-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFHistoricRateProvider.java b/...a-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFHistoricRateProvider.java
@@ -51,7 +51,7 @@ public class IMFHistoricRateProvider extends IMFAbstractRateProvider {
     private static final String DATA_ID = IMFHistoricRateProvider.class.getSimpleName();
 
 	private static final ProviderContext CONTEXT = ProviderContextBuilder.of("IMF-HIST", RateType.HISTORIC)
-	            .set("providerDescription", "Historic International Monetary Fond")
+	            .set("providerDescription", "Historic International Monetary Fund")
 			.set("days", 0)
 			.set("User-Agent", "Chrome/51.0.2704.103")
 			.build();

diff --git a/...rt/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFRateProvider.java b/...rt/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFRateProvider.java
@@ -49,7 +49,7 @@ public class IMFRateProvider extends IMFAbstractRateProvider {
      * The {@link ConversionContext} of this provider.
      */
     private static final ProviderContext CONTEXT = ProviderContextBuilder.of("IMF", RateType.DEFERRED)
-            .set("providerDescription", "International Monetary Fond")
+            .set("providerDescription", "International Monetary Fund")
             .set("days", 1)
             .set("User-Agent", "Chrome/51.0.2704.103")
             .build();

diff --git a/moneta-core/src/main/java/org/javamoney/moneta/Money.java b/moneta-core/src/main/java/org/javamoney/moneta/Money.java
@@ -667,7 +667,13 @@ public boolean equals(Object obj) {
      */
     @Override
     public String toString() {
-        return getCurrency().getCurrencyCode() + ' ' + number.toPlainString();
+        try {
+            MonetaryAmount amount = Monetary.getDefaultRounding().apply(this);
+            return getCurrency().getCurrencyCode() + ' ' + amount.getNumber().numberValue(BigDecimal.class)
+                    .toPlainString();
+        }catch(Exception e) {
+            return getCurrency().getCurrencyCode() + ' ' + number.toPlainString();
+        }
     }
 
     /*