From a5edc6dd332a2b4538e80fa17e5cda86ad1ae359 Mon Sep 17 00:00:00 2001 From: MannyMb Date: Thu, 29 Jul 2021 18:52:09 -0400 Subject: [PATCH] fin --- .../ConvertableCurrency.java | 5 ++++- .../CurrencyType.java | 21 ++++++++++++++++++ .../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 -> 2885 bytes .../META-INF/tc-money-converter.kotlin_module | Bin 16 -> 0 bytes 7 files changed, 26 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..9a047a4 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java @@ -1,7 +1,10 @@ package io.zipcoder.currencyconverterapplication; +import io.zipcoder.currencyconverterapplication.currencies.UniversalCurrency; + 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..46cb383 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java @@ -1,5 +1,7 @@ package io.zipcoder.currencyconverterapplication; +import java.util.Locale; + public enum CurrencyType { AUSTRALIAN_DOLLAR(2.70), CANADIAN_DOLLAR(2.64), @@ -25,6 +27,25 @@ public Double getRate() { } public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) { + for (CurrencyType value : CurrencyType.values()) { + String name = value.name().replace("_", ""); + String currencyName = currency.getClass().getSimpleName(); + if (name.equalsIgnoreCase(currencyName)) { + return value; + } + } return null; } } + + +// CurrencyType[] name = CurrencyType.values(); +// for (int i = 0; i < name.length; i++) { +// if (currency.equals(name[i])) { +// return name[i]; +// } +// } +// return null; +// //return CurrencyType.valueOf(currency.getClass().getSimpleName()); +// } +//} 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&=k3H6#icF{*pY}M|=&FV$!BiZPTfxwS}Q2=0OXkG@vzz22p(0Sg0YiL0GuS z41#~Ch*7loi#p?u!NdtwM~3ld;|6!SapBrEj>C+_b57#m#ygYq-SfTgoO{l>H(y15 zjCB39^7T~!!?+lLieeB)v0z}vz+wD5#l$W>{WqoPx$!+q&X|~{tc}IQt0ppxubJ4by9GY2 z=T9bHH*mJrrQGs`_IO9~3bYem;do`e`diBb-1CfuH*ikDNadnGS@~HFl`ZVUn-(5L z#ljxkZ{RIv-nQ@{vKDeUuRuAd00!Q%@Gh1NT(IyS-Z$`pg%5Gw!bkX+;}2NaiftCg z*-Wt6&SnRjNj5v#OtIO;W|~dLV7nXJD%Z7Nw-}}TLcyD*vL|{n^WF(>px_nf2F4G0 zrEGrjc)mEBANxPPQr0^wH}&bVO-iqDY-+A}w3HwBj#0L@|7OcRTRL2v8|&Tg4${1M zs4Z@kO9u$4dO>PHka`fLHUy~?L25>j`Vpj-1gFc*O{R&|8yykm*#dSu=o-k^5#Rws z!CvyZ2zdpoQ0nkqga0yl3LYY>%Qubm`|xm6KMbF+!LXWKhIS1q>wThM_iw->L|F|P zUE_Wc&@GW{Z)M($l{t9}{AAnckO)Fp1CEK1f+HW3!g%sraom9pB+!W@*$6Te&h zyG#dni{C4L(x!kuA^L^5$EJt@AqIsQvMJKKxa*Wpip3(QHnuB9_hRRV1=Gql)fq&a9$0o3n}PCm?Q+fXESoKoy$_ z=p~O4gsMnqYf!%63CaCzq+#=;wq3fYPMYKfdf6_5^uGwv!?LhQf|E4y3R>|QY}BwC SKhVs5%?J1l3Y5TyBmV$UDGJ*F delta 1381 zcmYjQTWl0n82)Bwc4l^VXvf{@N-w)D3u(7qZA&G!Sty-Spj^tOEVT|+%TiagF0d_V zqCRYbpyCa2R4m@X#KZ@J+hj$JJa~E0_-3LnKKN{W#2Agm@0=2GlKsE)f9Jn^=Raq^ zO?;L}f4B7cH2~{yDFO{gEgVDHz&-^}MH=w(4XV`8g5v?P635YL(z)jedce|2`MQxMOY*rpHt zHCVp%lQk%aGbXm{-YOPg7Kw2@Z(@h;6>b%I!Ng8|=pUBIT>o0+yl7&KRhK_OykugR zz?V(z*1eMGmia>vXAQivm{e|r)csGCgAVPN=(srWJ{#xoYEU1}RVESGn8Ir|_F%7p z*KJJV4I6pvw{ZaH6)4jRVBk#~3%Fq5EgNs+9Ru&$cn{}oyf4fLxG0L;Z(|ciY-|>0 zi!fV-85L%mFx!RMAp*d>;`F%tX`{<+SYFP2M%nc{G%q+lRetHy(vo(g`~ zrz_DD$0o|<;`~VAcu|2~oO`TLI3g9Vt!CC z5&Ug5H{2sRP7x}1CULLa$(qd_|KIVsZ*vE*IQaXBAu&?giQtHt92T*4tN_H>!9^4e z5IG4(h|CA17O@g)R7{f%;UFs(a7cFi-fXPg>bO#7FLyL=W=AlC2SqG%KW2?EF?SV_ zvFx=$bz`#SBJRv4`*K>NR)ZCb#_Sqabk$H-LwyZS4Yw^oZ`7`wQk9Qx{HR=EwhGa) zn`(g;#4AWrc8beZv|$xiBaL?2PI^69gFfyIpyR)T#Ti%R!89QR58*KJVg5LXB}5FU zijw)0GEF>!*=6C%49CMyY5oG5AB(9j;-8{n5efPgKX$w3Vx=USWI%J+MT_)P(r?vW zv`IfL{ndtxHPUaFeuwEIBmFMvXB{ToA&G8D^f=7ul|-K;?sAy2P7;-V$=vNkTntDi zCyDirRWIEQ(j9c7E;dTSbL=m94z-Fz-q)&V%KPCeQh8smBAxe*D%$hDSw&agcSv;; z$n_CO_7fsivk@{6d)H@w);%_sIKO3V-8$iH)e^R@s0 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