From 0b56e42c65d1682894b94e59978d2ca1944449b2 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 29 Jul 2021 18:51:13 -0400 Subject: [PATCH] thanks Dee --- .../ConvertableCurrency.java | 3 ++- .../CurrencyType.java | 8 ++++++++ .../META-INF/tc-money-converter.kotlin_module | Bin 16 -> 0 bytes .../ConvertableCurrency.class | Bin 587 -> 877 bytes .../CurrencyType.class | Bin 2873 -> 2894 bytes .../META-INF/tc-money-converter.kotlin_module | Bin 16 -> 0 bytes 6 files changed, 10 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..4da2fbb 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java @@ -2,6 +2,7 @@ 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/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java index 9acf5e8..993696d 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java @@ -25,6 +25,14 @@ public Double getRate() { } public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) { + for(CurrencyType type : CurrencyType.values()){ + String original = type.name().replace("_",""); + String newCurrency = currency.getClass().getSimpleName(); + if(original.equalsIgnoreCase(newCurrency)){ + + return type; + } + } 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 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..b0e7300446072c81c6554ab76bc8613637722721 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=c58zc)+!@$G93*>?Ld<^^yj6f&=k3H6#ib`%gfEnBYnizYG~7vLbXk&c3LS6Ej6Jjl+vQsAR5G<7-MLSX-QiU z{CSF?;_qnG8Qg&jcMPUZs5&x??p%mF-8rsZGo#E{J?EqjZoD%&-~GOO&bjBD`zBwt z{Mh3Cu=e#;0NZde2m|vL7H}+pnE)ylQdnfO#3#!Zj^l(yyXV=QR5+#Zf`u3Hl7*My zS$GAnGCi%Z+f4b-^ZJxsU*qsI3TaZ?S7&}d+rh$Fg>f_0>s@kB{WfulmDd&an8`Ka zE(>oc>@`#9zVY4rM|xOzQ(?kP-W*-{>}P9~g>wq~%v78bP!tPqDNLHF+^rmME9^Iu ze^G|+8{f0XI|@^jw6TH+8+cb?nor(SIIyx&3+SzCzA{^!E$2!aLgm7V^m3(ADCbXV zFqW#F#;@TAcs?^WKEQ_>hN>6zMD-^l)M4Wgsx}_QM>g)m{Q-Q;$|p7+M8-z8n)i2& zUEuR0Hg;poMw-nyn>}pyvYBABkIf{T{cNV#OtU$FvFdgIFS`Pj!a^yRFK8I=o}SAc z&-Isb>xSydc#tNG%9b7lPD?AoU_h?Fdpwf>Yl5h8h!rdZQ~MJUYPH z1e!8&6G5IIG#n(>Nyy8pL94@e4f9vu0Y6wW&?UB~03`tSs0 zd=k0!LIz3U(pBP11XiJLmC>l;4$0W4Lak>E;wj{zdD8g`B@R%6`&AYuA^z#jQXQy9nN`}QRDI%UHkm+>l)vyOZ)ATu8n$% zA&zz=&_VwKaqK`FMzK}uNzl8;J!bNxhUQGxs3Drk`fG?~vStnOOg2zMS0<}!=*eUqlKKcp x8z3NYh#*+QP6GOpM+ibSBr_|}zTgST`)sFSg9hwW|Fj008sAh2&ynUs`5%E%2Fw5e delta 1426 zcmYjPU2qds6#h25*}d7U>6&gM{Y#->NfT`(R_p{qw-jiB0zyDcMQex=t+5Shi-JGv z4=DIMy8aBl2@lTrz+kGO%E&PK=7Ud;`sVoTGmhho)pKq$;+@I)_WSO+=YHqp{t){r z=6%2X^)xEO+l856Up8aQC!xQP+eILz_Ryom*zFzM@Q4$laj6gXw#Sv+UrdAwl4 z!;4H`;_$M-R^1Jr=k+n?zrr<63v44bzO?`MGd(Pv5gxYdZt9YA>bJ2=th_3)Lmyt2 z++pE0fic}h;>Ne{9O-A_tiZTF{8z4e@n%u?_AXkAp_*1{p;jx;lujP>2ee-!`*|h@EWC^N z6x`#xTGF3V!aWua!?$n*?_1c1`wV=*%7+&6IA~$gpAFtV_K}58aDkH^val7S7PfKN z&S3|KF%IJ#c5>LoVK;{f4tqH4#i;*N@Rx{LD_1MUQhB6OQ846hP+R>@J?{UZPkG__ z*+bQ8xi(syD=W~;#}|r~IR$NriRt2rV!BeCIhNjcbh=!c-_$?pZlGpIsQHN7&Yl25 zvL%t6NhEU;$)7~BD3M%BB%>0^E8tN9@+$?hERkH(6;YlHV0VCqNL;6h(|DlZ5V2lD zUS=Ii1A*&MFB4O6KSf>csg!>h4>a=!5s<1G)sjmHUWdl{0eJsEP$0=#Ny8)_lnFF` zO5-cXp(4l`$yC=B=*j*sVSFxgxJHC_`C;gA5JnrgR*X(^#fN1>{KYM)m?AZRN9d-a zhoeo08Irgsk^BP262ywXoAy@8k}LK^vt$S*JlZ_}S<_y2389J9wVb-8yXyk(Om%0n zTD#VO84X9R25w0<5NV*L0lR@)&wJ3@wacef<*G>PCuH?GC~GaMM?ZgQxtdt(`?+M zKdnSVqos6Sg;t10RR^tC(6)$}RNg*qRO}5!0>1IiD zcG$rdDY&-v4Yi@x5z7~}Iy&-&U>)&%L9e4XUoh(E%NIl)$$Y^kDLp_)Vupa!jRc`O ivIO+9Hxq>GaPx~$_@&YF_5