diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java index 6498351..00a1726 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java @@ -2,6 +2,6 @@ public interface ConvertableCurrency { default Double convert(CurrencyType currencyType) { - return Double.MAX_VALUE; + return currencyType.getRate() / CurrencyType.getTypeOfCurrency(this).getRate(); } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyConverter.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyConverter.java index 7e2fd38..779cf77 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyConverter.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyConverter.java @@ -1,6 +1,7 @@ package io.zipcoder.currencyconverterapplication; -public class CurrencyConverter { +public class CurrencyConverter implements ConvertableCurrency{ + public static Double convert(Double amountOfBaseCurrency, ConvertableCurrency sourceCurrencyType, CurrencyType targetCurrencyType) { return sourceCurrencyType.convert(targetCurrencyType) * amountOfBaseCurrency; } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java index 9acf5e8..f01c95b 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java @@ -1,6 +1,7 @@ package io.zipcoder.currencyconverterapplication; public enum CurrencyType { + AUSTRALIAN_DOLLAR(2.70), CANADIAN_DOLLAR(2.64), CHINESE_YR(13.84), @@ -25,6 +26,14 @@ public Double getRate() { } public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) { + + for(CurrencyType currencyType : CurrencyType.values()){ + String currencyTypeName = currencyType.name().replace("_", ""); + String convertableCurrencyName = currency.getClass().getSimpleName(); + if(currencyTypeName.equalsIgnoreCase(convertableCurrencyName)) { + return currencyType; + } + } return null; } } diff --git a/target/classes/META-INF/tc-money-converter.kotlin_module b/target/classes/META-INF/tc-money-converter.kotlin_module deleted file mode 100644 index 8fb6019..0000000 Binary files a/target/classes/META-INF/tc-money-converter.kotlin_module and /dev/null differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class b/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class index 0c98dc2..1d622e1 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class and b/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyConverter.class b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyConverter.class index 4fe7670..1807b0a 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyConverter.class and b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyConverter.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class index 8bd897e..d80625a 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class and b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class index 80c91bb..5ec3c05 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class index 9e2f557..8a07999 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class index 8a644a4..3200027 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class index f85fa55..1294cac 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Euro.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class index bc13e2a..b2a014b 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Franc.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class index 647e7d3..1b0c56d 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Pound.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class index da95811..0fb0af2 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Ringgit.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class index ae647fa..5129086 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Rupee.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class index e79707e..77151e0 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class index cc8a288..5042960 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/USDollar.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class index 0e1962b..0ce9e90 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.class differ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class index 67872df..88bbd25 100644 Binary files a/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class and b/target/classes/io/zipcoder/currencyconverterapplication/currencies/Yen.class differ diff --git a/target/test-classes/META-INF/tc-money-converter.kotlin_module b/target/test-classes/META-INF/tc-money-converter.kotlin_module deleted file mode 100644 index 8fb6019..0000000 Binary files a/target/test-classes/META-INF/tc-money-converter.kotlin_module and /dev/null differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/CurrencyTypeTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/CurrencyTypeTest.class index 8b17b9b..020fa37 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/CurrencyTypeTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/CurrencyTypeTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollarTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollarTest.class index 538f5e4..1a3f034 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollarTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/AustralianDollarTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CanadianTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CanadianTest.class index b764559..84eb835 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CanadianTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CanadianTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYRTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYRTest.class index 52d5771..7d79e5d 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYRTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/ChineseYRTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CurrencyTestInterface.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CurrencyTestInterface.class index 7c0c423..c2125e7 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CurrencyTestInterface.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/CurrencyTestInterface.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/EuroTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/EuroTest.class index 4b494dd..5c0cf4a 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/EuroTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/EuroTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/FrancTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/FrancTest.class index 17531a8..f0c8deb 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/FrancTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/FrancTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/PoundTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/PoundTest.class index f3f3469..2a3fcec 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/PoundTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/PoundTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RinggitTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RinggitTest.class index 4371dea..c787537 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RinggitTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RinggitTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RupeeTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RupeeTest.class index 39dfb80..bc10132 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RupeeTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/RupeeTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollarTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollarTest.class index cffabab..55b34ff 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollarTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollarTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/USDollarTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/USDollarTest.class index e1f30f2..2ac174f 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/USDollarTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/USDollarTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrencyTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrencyTest.class index 3c70277..a9cc70f 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrencyTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrencyTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/YenTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/YenTest.class index 61c071f..665a0f6 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/YenTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencies/YenTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/AustralianDollarCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/AustralianDollarCurrencyConverterTest.class index 65ed19e..9be7d1f 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/AustralianDollarCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/AustralianDollarCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/CanadianDollarCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/CanadianDollarCurrencyConverterTest.class index 1e63a5a..2cc8eed 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/CanadianDollarCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/CanadianDollarCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/ChineseYRCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/ChineseYRCurrencyConverterTest.class index 31dfee7..606ef0c 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/ChineseYRCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/ChineseYRCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/EuroCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/EuroCurrencyConverterTest.class index e1765f7..c65bcf2 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/EuroCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/EuroCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/FrancCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/FrancCurrencyConverterTest.class index 54d33c1..cb96649 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/FrancCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/FrancCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/PoundCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/PoundCurrencyConverterTest.class index e9db10a..dafe5aa 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/PoundCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/PoundCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RinggitCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RinggitCurrencyConverterTest.class index 1d3cdc6..743fb9f 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RinggitCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RinggitCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RupeeCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RupeeCurrencyConverterTest.class index f60edcc..a5f1122 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RupeeCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/RupeeCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/SingaporeDollarCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/SingaporeDollarCurrencyConverterTest.class index 94cac20..7692bde 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/SingaporeDollarCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/SingaporeDollarCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/USDollarTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/USDollarTest.class index 50e98c5..ae597a0 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/USDollarTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/USDollarTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/UniversalDollarCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/UniversalDollarCurrencyConverterTest.class index 0032cc5..13b86b2 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/UniversalDollarCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/UniversalDollarCurrencyConverterTest.class differ diff --git a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/YenCurrencyConverterTest.class b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/YenCurrencyConverterTest.class index e833664..d865e2d 100644 Binary files a/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/YenCurrencyConverterTest.class and b/target/test-classes/io/zipcoder/currencyconverterapplication/currencyconverter/YenCurrencyConverterTest.class differ