src/main/kotlin/com/cubetiqs/money/MoneyConfig.kt

@@ -1,8 +1,5 @@
 package com.cubetiqs.money
 
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.ConcurrentMap
-
 /**
  * Default money config in static object.
  * Sample parse format: USD=1,KHR=4000,EUR=0.99
@@ -17,10 +14,10 @@ object MoneyConfig {
      * Key is the currency
      * Value is the rate
      */
-    private val config: ConcurrentMap<String, Double> = ConcurrentHashMap()
+    private val config: MutableMap<String, Double> = mutableMapOf()
 
     // use to format the money for each value, if have
-    private val configFormatter: ConcurrentMap<String, MoneyFormatProvider> = ConcurrentHashMap()
+    private val configFormatter: MutableMap<String, MoneyFormatProvider> = mutableMapOf()
 
     // use to identified for config dataset with prefix mode
     private var configPrefix: String = ""

src/main/kotlin/com/cubetiqs/money/MoneyExtension.kt

@@ -1,7 +1,5 @@
 package com.cubetiqs.money
 
-import java.util.*
-
 infix fun StdMoney.exchangeTo(currency: StdMoney.Currency): StdMoney {
     return MoneyExchangeUtils.exchange(this, currency)
 }
@@ -128,9 +126,4 @@ fun MoneyView.asStdMoney(): StdMoney {
             return this@asStdMoney.getValue()
         }
     }
-}
-
-// detect currency symbol, if needed
-fun StdMoney.Currency.findCurrency(): Currency? {
-    return Currency.getInstance(this.getCurrency())
 }

src/main/kotlin/com/cubetiqs/money/MoneyView.kt

@@ -4,12 +4,9 @@ open class MoneyView(
     private var value: Number? = null,
     private var currency: String? = null,
 ) : MoneyMixin {
-    private var _currency: StdMoney.Currency? = null
-
     constructor(money: StdMoney) : this() {
-        this._currency = money.getCurrency()
         this.value = money.getValue()
-        this.currency = this._currency?.getCurrency()
+        this.currency = money.getCurrency().getCurrency()
     }
 
     fun getValue(): Double {
@@ -20,10 +17,6 @@ open class MoneyView(
         return currency
     }
 
-    fun getSymbol(): String? {
-        return this._currency?.findCurrency()?.symbol
-    }
-
     fun getFormat(): String {
         return MoneyConfig
             .getFormatter(getCurrency())