3: Create new ExchangeRateProvider implementations for Bitcoin

Task-Url: http://github.com/JavaMoney/javamoney-shelter/issues/issue/3

Author: keilw

digital-currency/bitcoin/src/test/groovy/org/javamoney/shelter/bitcoin/provider/BitcoinCurrencyProviderSpec.groovy

@@ -9,7 +9,7 @@ import javax.money.CurrencyQuery
 import javax.money.CurrencyQueryBuilder
 import javax.money.CurrencyUnit
 import javax.money.MonetaryAmount
-import javax.money.MonetaryCurrencies
+import javax.money.Monetary
 import javax.money.UnknownCurrencyException
 
 /**
@@ -63,9 +63,9 @@ class BitcoinCurrencyProviderSpec extends Specification {
         currencies.size() == 0
     }
 
-    def "BTC can't be found via MonetaryCurrencies" () {
+    def "BTC can't be found via Monetary" () {
         when: "We try to get currency 'BTC' when BitcoinCurrencyProvider is not registered"
-        CurrencyUnit btc = MonetaryCurrencies.getCurrency("BTC")
+        CurrencyUnit btc = Monetary.getCurrency("BTC")
 
         then: "An UnknownCurrencyException is thrown"
         UnknownCurrencyException e = thrown()

digital-currency/bitcoin/src/test/java/org/javamoney/shelter/bitcoin/provider/BitcoinCurrencyProviderTest.java

@@ -1,19 +1,7 @@
 package org.javamoney.shelter.bitcoin.provider;
 
-import org.javamoney.moneta.CurrencyUnitBuilder;
-import org.javamoney.moneta.Money;
 import org.junit.Test;
 
-import javax.money.CurrencyQuery;
-import javax.money.CurrencyQueryBuilder;
-import javax.money.CurrencyUnit;
-import javax.money.MonetaryAmount;
-import javax.money.MonetaryCurrencies;
-import javax.money.UnknownCurrencyException;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**

digital-currency/bitcoin/src/test/java/org/javamoney/shelter/bitcoin/provider/BitcoinDeConversionDemo.java

@@ -15,7 +15,7 @@
 package org.javamoney.shelter.bitcoin.provider;
 
 import javax.money.CurrencyUnit;
-import javax.money.MonetaryCurrencies;
+import javax.money.Monetary;
 import javax.money.MonetaryException;
 import javax.money.convert.ExchangeRate;
 import org.javamoney.moneta.CurrencyUnitBuilder;
@@ -31,13 +31,13 @@ public static void main(String... arg) throws MonetaryException {
     	//MtGoxV2ConversionProvider provider = new MtGoxV2ConversionProvider("USD");
     	BitcoinDeRateProvider provider = new BitcoinDeRateProvider();
         provider.loadRate("USD", true);
-        ExchangeRate rate = provider.getExchangeRate(MonetaryCurrencies.getCurrency("USD"), btc);
+        ExchangeRate rate = provider.getExchangeRate(Monetary.getCurrency("USD"), btc);
         System.out.println("Rate: " + rate);
 
-        rate = provider.getExchangeRate(MonetaryCurrencies.getCurrency("EUR"), btc);
+        rate = provider.getExchangeRate(Monetary.getCurrency("EUR"), btc);
         System.out.println("Rate2: " + rate);
 
-        rate = provider.getExchangeRate(MonetaryCurrencies.getCurrency("CHF"), btc);
+        rate = provider.getExchangeRate(Monetary.getCurrency("CHF"), btc);
         System.out.println("Rate3: " + rate);
     }
 }

groovylang-support/groovy-money/src/main/groovy/com/msgilligan/moneta/NumberCategory.groovy

@@ -6,7 +6,7 @@ import org.javamoney.moneta.spi.DefaultNumberValue
 
 import javax.money.CurrencyUnit
 import javax.money.MonetaryAmount
-import javax.money.MonetaryCurrencies
+import javax.money.Monetary
 import javax.money.NumberValue
 
 /**
@@ -35,7 +35,7 @@ class NumberCategory {
      * @throws UnknownCurrencyException when currency code not found
      */
     MonetaryAmount get(String name) {
-        CurrencyUnit currency = MonetaryCurrencies.getCurrency(name.toUpperCase())
+        CurrencyUnit currency = Monetary.getCurrency(name.toUpperCase())
         return Money.of(this, currency)
     }
 

groovylang-support/groovy-money/src/test/groovy/JavaMoneySpec.groovy

@@ -14,7 +14,7 @@ import spock.util.mop.Use
 
 import javax.money.CurrencyUnit
 import javax.money.MonetaryAmount
-import javax.money.MonetaryCurrencies
+import javax.money.Monetary
 import javax.money.NumberValue
 
 /**
@@ -33,7 +33,7 @@ class JavaMoneySpec extends Specification {
 
     def "get currency unit" () {
         when:
-        CurrencyUnit usDollar = MonetaryCurrencies.getCurrency("USD")
+        CurrencyUnit usDollar = Monetary.getCurrency("USD")
 
         then:
         usDollar.currencyCode == "USD"

groovylang-support/groovy-money/src/test/groovy/NumberCategorySpec.groovy

@@ -8,7 +8,7 @@ import spock.util.mop.Use
 
 import javax.money.CurrencyUnit
 import javax.money.MonetaryAmount
-import javax.money.MonetaryCurrencies
+import javax.money.Monetary
 
 
 /**
@@ -23,7 +23,7 @@ class NumberCategorySpec extends Specification {
         then:
         aBuck instanceof MonetaryAmount
         aBuck.number == 1
-        aBuck.currency == MonetaryCurrencies.getCurrency("USD")
+        aBuck.currency == Monetary.getCurrency("USD")
     }
 
     def "can make EUR"() {
@@ -33,7 +33,7 @@ class NumberCategorySpec extends Specification {
         then:
         amount instanceof MonetaryAmount
         amount.number == 1
-        amount.currency == MonetaryCurrencies.getCurrency("EUR")
+        amount.currency == Monetary.getCurrency("EUR")
     }
 
     def "can make any supported currency via propertyMissing"() {
@@ -43,7 +43,7 @@ class NumberCategorySpec extends Specification {
         then:
         amount instanceof MonetaryAmount
         amount.number == 1
-        amount.currency == MonetaryCurrencies.getCurrency("JPY")
+        amount.currency == Monetary.getCurrency("JPY")
     }
 
     def "Undefined currency should throw UnknownCurrencyException"() {
@@ -62,7 +62,7 @@ class NumberCategorySpec extends Specification {
         then:
         amount instanceof MonetaryAmount
         amount.number == 0.99
-        amount.currency == MonetaryCurrencies.getCurrency("USD")
+        amount.currency == Monetary.getCurrency("USD")
     }
 
     @Unroll

pom.xml

@@ -21,7 +21,7 @@
 		<junit.version>4.8.2</junit.version>
 		<slf4j.version>1.6.1</slf4j.version>
 		<!-- JSR versions -->
-		<jsr.version>1.0-RC3</jsr.version>
+		<jsr.version>1.0</jsr.version>
 		<!--  javamoney.version>0.6-SNAPSHOT</javamoney.version -->
 	</properties>