Merge pull request #56 from acelopezco/bp-marschall-search-by-currency-code

Backport of #310.

Author: keilw

src/main/java/org/javamoney/moneta/internal/ConfigurableCurrencyUnitProvider.java

@@ -31,6 +31,10 @@ public class ConfigurableCurrencyUnitProvider extends BaseCurrencyProviderSpi {
      * The currency units, identified by currency code.
      */
     private static final Map<String, CurrencyUnit> currencyUnits = new ConcurrentHashMap<>();
+    /**
+     * The currency units, identified by numeric code.
+     */
+    private static final Map<Integer, CurrencyUnit> currencyUnitsByNumericCode = new ConcurrentHashMap<>();
     /**
      * The currency units identified by Locale.
      */
@@ -65,23 +69,37 @@ public Set<CurrencyUnit> getCurrencies(CurrencyQuery currencyQuery) {
             }
             return result;
         }
+        if (!currencyQuery.getNumericCodes().isEmpty()) {
+            for (Integer numericCode : currencyQuery.getNumericCodes()) {
+                CurrencyUnit cu = currencyUnitsByNumericCode.get(numericCode);
+                if (cu != null) {
+                    result.add(cu);
+                }
+            }
+            return result;
+        }
         result.addAll(currencyUnits.values());
         return result;
     }
 
     /**
-     * Registers a bew currency unit under its currency code.
+     * Registers a new currency unit under its currency code and potentially numeric code.
      *
      * @param currencyUnit the new currency to be registered, not null.
      * @return any unit instance registered previously by this instance, or null.
      */
     public static CurrencyUnit registerCurrencyUnit(CurrencyUnit currencyUnit) {
         Objects.requireNonNull(currencyUnit);
-        return ConfigurableCurrencyUnitProvider.currencyUnits.put(currencyUnit.getCurrencyCode(), currencyUnit);
+        CurrencyUnit registered = ConfigurableCurrencyUnitProvider.currencyUnits.put(currencyUnit.getCurrencyCode(), currencyUnit);
+        int numericCode = currencyUnit.getNumericCode();
+        if (numericCode != -1) {
+            ConfigurableCurrencyUnitProvider.currencyUnitsByNumericCode.put(numericCode, currencyUnit);
+        }
+        return registered;
     }
 
     /**
-     * Registers a bew currency unit under the given Locale.
+     * Registers a new currency unit under the given Locale.
      *
      * @param currencyUnit the new currency to be registered, not null.
      * @param locale       the Locale, not null.
@@ -101,7 +119,14 @@ public static CurrencyUnit registerCurrencyUnit(CurrencyUnit currencyUnit, Local
      */
     public static CurrencyUnit removeCurrencyUnit(String currencyCode) {
         Objects.requireNonNull(currencyCode);
-        return ConfigurableCurrencyUnitProvider.currencyUnits.remove(currencyCode);
+        CurrencyUnit removed = ConfigurableCurrencyUnitProvider.currencyUnits.remove(currencyCode);
+        if (removed != null) {
+            int numericCode = removed.getNumericCode();
+            if (numericCode != -1) {
+                ConfigurableCurrencyUnitProvider.currencyUnitsByNumericCode.remove(numericCode);
+            }
+        }
+        return removed;
     }
 
     /**
@@ -122,8 +147,9 @@ public static CurrencyUnit removeCurrencyUnit(Locale locale) {
      */
     @Override
     public String toString() {
-        return "ConfigurableCurrencyUnitProvider [currencyUnits=" + currencyUnits + ", currencyUnitsByLocale=" +
-                currencyUnitsByLocale + ']';
+        return "ConfigurableCurrencyUnitProvider [currencyUnits=" + currencyUnits
+                + ", currencyUnitsByNumericCode=" + currencyUnitsByNumericCode
+                + ", currencyUnitsByLocale=" + currencyUnitsByLocale + ']';
     }
 
 }

src/test/java/org/javamoney/moneta/internal/ConfigurableCurrencyUnitProviderTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2012, 2014, Credit Suisse (Anatole Tresch), Werner Keil and others by the @author tag.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.javamoney.moneta.internal;
+
+import static org.testng.Assert.assertEquals;
+
+import javax.money.CurrencyQuery;
+import javax.money.CurrencyQueryBuilder;
+import javax.money.CurrencyUnit;
+import javax.money.Monetary;
+
+import org.javamoney.moneta.CurrencyUnitBuilder;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for ConfigurableCurrencyUnitProvider.
+ * @author Philippe Marschall
+ */
+public class ConfigurableCurrencyUnitProviderTest {
+
+    /**
+     * Tests that searching by numeric code is supported by {@link ConfigurableCurrencyUnitProvider}.
+     */
+    @Test
+    public void testSearchByNumericCurrencyCode() {
+        CurrencyUnit usd = CurrencyUnitBuilder.of("USD", "search-test")
+                .setNumericCode(840)
+                .setDefaultFractionDigits(2)
+                .build(false);
+        CurrencyUnit eur = CurrencyUnitBuilder.of("EUR", "search-test")
+                .setNumericCode(978)
+                .setDefaultFractionDigits(2)
+                .build(false);
+
+        ConfigurableCurrencyUnitProvider.registerCurrencyUnit(usd);
+        ConfigurableCurrencyUnitProvider.registerCurrencyUnit(eur);
+        try {
+            CurrencyQuery query = CurrencyQueryBuilder.of()
+                    .setProviderName(ConfigurableCurrencyUnitProvider.class.getSimpleName())
+                    .setNumericCodes(840)
+                    .build();
+            CurrencyUnit currency = Monetary.getCurrency(query);
+            assertEquals(usd, currency);
+        } finally {
+            ConfigurableCurrencyUnitProvider.removeCurrencyUnit(usd.getCurrencyCode());
+            ConfigurableCurrencyUnitProvider.removeCurrencyUnit(eur.getCurrencyCode());
+        }
+    }
+}