diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java index 6498351..ef6b9ed 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/ConvertableCurrency.java @@ -2,6 +2,8 @@ public interface ConvertableCurrency { default Double convert(CurrencyType currencyType) { + return Double.MAX_VALUE; } + CurrencyType getType(); } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java b/src/main/java/io/zipcoder/currencyconverterapplication/CurrencyType.java index 9acf5e8..211ab59 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.Arrays; + public enum CurrencyType { AUSTRALIAN_DOLLAR(2.70), CANADIAN_DOLLAR(2.64), @@ -25,6 +27,11 @@ public Double getRate() { } public static CurrencyType getTypeOfCurrency(ConvertableCurrency currency) { - return null; + + return currency.getType(); + } + + + } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java index 7ff9427..e825ccf 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/AustralianDollar.java @@ -1,6 +1,20 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class AustralianDollar implements ConvertableCurrency { + private CurrencyType type = CurrencyType.AUSTRALIAN_DOLLAR; + @Override + public Double convert(CurrencyType currencyType) { + Double result= currencyType.getRate()/ CurrencyType.AUSTRALIAN_DOLLAR.getRate(); + return result; + + } + + @Override + public CurrencyType getType() { + return this.type; + } + } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java index 8d4ee7e..99af5a5 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/CanadianDollar.java @@ -1,6 +1,19 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class CanadianDollar implements ConvertableCurrency { + private CurrencyType type = CurrencyType.CANADIAN_DOLLAR; + + @Override + public Double convert(CurrencyType currencyType) { + Double result= currencyType.getRate()/ CurrencyType.CANADIAN_DOLLAR.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java index 475596f..1403a34 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/ChineseYR.java @@ -1,6 +1,20 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class ChineseYR implements ConvertableCurrency { + private CurrencyType type = CurrencyType.CHINESE_YR; + @Override + public Double convert(CurrencyType currencyType) { + Double result= currencyType.getRate()/ CurrencyType.CHINESE_YR.getRate(); + return result; + } + + + @Override + public CurrencyType getType() { + return this.type; + } + } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java index 7ad00b5..571e214 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Euro.java @@ -1,6 +1,19 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Euro implements ConvertableCurrency { + private CurrencyType type = CurrencyType.EURO; + + @Override + public Double convert(CurrencyType currencyType) { + Double result= currencyType.getRate()/ CurrencyType.EURO.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java index 502f0c3..ff52c6f 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Franc.java @@ -1,6 +1,18 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Franc implements ConvertableCurrency { + private CurrencyType type = CurrencyType.FRANC; + @Override + public Double convert(CurrencyType currencyType) { + Double result= currencyType.getRate()/ CurrencyType.FRANC.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java index 7879ab1..0b63508 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Pound.java @@ -1,6 +1,19 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Pound implements ConvertableCurrency { + private CurrencyType type = CurrencyType.POUND; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.POUND.getRate(); + return result; + } + + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java index d3c30d8..5c2405d 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Ringgit.java @@ -1,6 +1,19 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Ringgit implements ConvertableCurrency { + private CurrencyType type = CurrencyType.RINGGIT; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.RINGGIT.getRate(); + return result; + } + + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java index 2d05af5..9144d7a 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Rupee.java @@ -1,6 +1,19 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Rupee implements ConvertableCurrency { + private CurrencyType type = CurrencyType.RUPEE; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.RUPEE.getRate(); + return result; + } + + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java index 3b5489e..1be57be 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/SingaporeDollar.java @@ -1,6 +1,20 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class SingaporeDollar implements ConvertableCurrency { + private CurrencyType type = CurrencyType.SINGAPORE_DOLLAR; + + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.SINGAPORE_DOLLAR.getRate(); + return result; + } + + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java index 7d6253c..3e8fbf7 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/USDollar.java @@ -1,6 +1,18 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class USDollar implements ConvertableCurrency { + private CurrencyType type = CurrencyType.US_DOLLAR; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.US_DOLLAR.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java index 5d3b9f4..c8c39cc 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/UniversalCurrency.java @@ -1,6 +1,18 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class UniversalCurrency implements ConvertableCurrency { + private CurrencyType type = CurrencyType.UNIVERSAL_CURRENCY; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.UNIVERSAL_CURRENCY.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } diff --git a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java index b871937..ae107ac 100644 --- a/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java +++ b/src/main/java/io/zipcoder/currencyconverterapplication/currencies/Yen.java @@ -1,6 +1,18 @@ package io.zipcoder.currencyconverterapplication.currencies; import io.zipcoder.currencyconverterapplication.ConvertableCurrency; +import io.zipcoder.currencyconverterapplication.CurrencyType; public class Yen implements ConvertableCurrency { + private CurrencyType type = CurrencyType.YEN; + @Override + public Double convert(CurrencyType currencyType) { + Double result = currencyType.getRate() / CurrencyType.YEN.getRate(); + return result; + } + + @Override + public CurrencyType getType() { + return this.type; + } } 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..52840ed 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/CurrencyType.class b/target/classes/io/zipcoder/currencyconverterapplication/CurrencyType.class index 8bd897e..e7b6e24 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..a2529fd 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..d0e0de2 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..1cc320c 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..13e27d8 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..6ec46ce 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..a7be902 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..77fe117 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..7ddd860 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..a4c8278 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..cd355a4 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..3366de9 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..8097c21 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