From abc97747411fc52b30901164a305caeef192ae78 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 26 Jul 2021 14:08:43 -0400 Subject: [PATCH] passed tests --- .../ConvertableCurrency.java | 6 +++++- .../CurrencyType.java | 7 +++++++ .../currencies/AustralianDollar.java | 1 + .../META-INF/tc-money-converter.kotlin_module | Bin 16 -> 0 bytes .../ConvertableCurrency.class | Bin 587 -> 877 bytes .../CurrencyType.class | Bin 2873 -> 2922 bytes .../META-INF/tc-money-converter.kotlin_module | Bin 16 -> 0 bytes 7 files changed, 13 insertions(+), 1 deletion(-) delete mode 100644 target/classes/META-INF/tc-money-converter.kotlin_module delete mode 100644 target/test-classes/META-INF/tc-money-converter.kotlin_module diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java index 6498351..5961cb5 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java @@ -1,7 +1,11 @@ package io.zipcoder.currencyconverterapplication; public interface ConvertableCurrency { + + default Double convert(CurrencyType currencyType) { - return Double.MAX_VALUE; + //make this hoe call the currencyConverter? + return currencyType.getRate()/CurrencyType.getTypeOfCurrency(this).getRate(); + //return Double.MAX_VALUE; } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java index 9acf5e8..a8fd6cc 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java @@ -25,6 +25,13 @@ 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/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java index 7ff9427..7f0f1de 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java @@ -3,4 +3,5 @@ import io.zipcoder.currencyconverterapplication.ConvertableCurrency; public class AustralianDollar implements ConvertableCurrency { + } 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 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ diff --git a/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class b/target/classes/io/zipcoder/currencyconverterapplication/ConvertableCurrency.class index 0c98dc2c61aa7e012ac385dd2aa4c35b5610f467..f0b31f62fd9c1e1afa9b10b121b80f21b01b6b01 100644 GIT binary patch delta 272 zcmX@j@|I2I)W2Q(7#J8#7*x0zgcyXm7(^IEK`b#4OPrlSf}KHfqoO^dEIWe~4}&y= z3_F7?4}%l{(0+tL*%qa!xW7g1gVPp^lniEo4km{f2 zTv}9=nwMP3$WX2^aiblh=43`j%gJXLEv3B}SQwaqo)FXC#=y9Zfk|rz12cq`KUt7T hSe=7`8zc)+!@$G93*>?Ld<^^yj6f&=Dfa#zHM=NiSNw ztQYVCUPhzN;2Zeh8-uA6s*Vh!Z@%E0zWOT9%qTNf&pD}sFYZjvx8L`lbM|~^ck)g2 z_o)BV+PBvLY{#V#49r@X!>J%9f+$(YV4lMQpDbEf!V4DNy~tr%;k3d_7GB0H7G8yK z;WfO@^bLhQW+rffug^L4O)fv9Fhpwe>cq{nEi9Z>7&bGV{$=;{ZzGpkc}rohnO+m_ zvhcRTJ~M;%TR(hww1b6r6h_SS?bO^CzgQ_2-c{IdW)jqZs#rLuFluJJJ3Y=T95B;= zQHS%0pM0QjaAl(w)H|L0VyRRp=9edz=L(0slLZZ%^0URI zLTSM}Hd7c{Kjo8h)VLXbnD;ed<0E{mp|5;VPnLf+>RW6aM%l&__{7E`JQT#ItbAtU z5oB%T%K1Rs;6*+^YGV%uZ47Z3=CGH;J`N)s_H!8JaDc-Yhj9)EF<8D4_;q)%RG6Fb z@-*mh`}nlC(1+HPCS+(?jdx9fmV8o*W>g;RR`aL9!r7E(FPlAbAlaJA&j$aLix7A!8zt zH+n>bR|hzoL0cwnBEG%q(5k4r4*d!-4UbYZ>_#wIW7x z6@lw8IKNKvTmLP1oFu!Jh8&Ja0=*MkNz;jW-jc+_yQNq9{7=75VW z!u_}i&8CYM5fZ|;1zofXZxep6a&e#V4&h0M3OYsT65)P_D!N7J5uw+ik_SZS6JduF zaM`Fha3>T+o^Yvl7zHle@{O23L3LHqk>pA7pNef&6yP>vbkUdZP}cv zpd*`eNa`XWt%rcbK7vpMy9nq@9w4Z%Ae~)-_7!hP-p>wNHfX_4`A@5-q4rJ9;3R2v GDEd=6)zD5 zZ+LlFFN1HwgEKxbn2rH;;6dMfc1B-)R9_rtm~ou3dcMDmvNLGG=o>O>U;f#eB@S=s6@Un#( zUXk#uz^e*dOfPg%o=>FyHJNcvVJp?-_5Ht{?-t>_s$rYyWv;kqejd9b%IgZ-&EX{- zyCS@yFlKs4-TLsW5I1|CO&^{?W>d@Rq_3(_6^_>=NN^g`K8X`hUg+g6$+glg$85JGeH+CKt=~z`&&6qdHm-Y0V%8n3=*uInGbC4>b!*eGhKtZ zU|X;OD;AB}4cwJ(pt*sT2Al@&z6i4|c=cSs`0Sq_jH{dyfEXX3U7!>38oKB^$zwNq zuoA1#i#}pMqbycqkeMN@`R`_N)|Gj)Alq|z0>{Wt^5rI$5D6n-7^y$GF@>ivyKLN; z;ePlS9p4~WjKu;j;@8l+hy>$WF?LVT#R@I7>w=Du3+|c)Nga2aE_!s_tK(H+7pryL zr{gusMM}qM9cLUi+^2;BEo2>bJfMX^Ej;M3Wt|pk>$S4MiMSZjN=^$K9jir$n{=3W zqAoUT!E@{zyhospM4=e0qrFfJ)sZX|%{qDu#c&;cg`%n>T_`$~21wKfNfg(UB6Z|Q hRvnv2PP7iMun0rGDg%f7WHjHh{H;8V3biIY^Djh}=u-dy 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 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ