Merge pull request #384 from HandyMenny/drop-weak-concurrent-hashmap

Drop WeakConcurrentHashMap
handymenny · Jan 13, 2024 · 3715050 · 3715050
2 parents 5eb0e90 + 57e8ef1
commit 3715050
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 131 deletions.
diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/importer/Import0xB0CDBin.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/importer/Import0xB0CDBin.kt
@@ -16,15 +16,12 @@ import it.smartphonecombo.uecapabilityparser.model.component.ComponentLte
 import it.smartphonecombo.uecapabilityparser.model.modulation.Modulation
 import it.smartphonecombo.uecapabilityparser.model.modulation.ModulationOrder
 import it.smartphonecombo.uecapabilityparser.util.ImportQcHelpers
-import it.smartphonecombo.uecapabilityparser.util.WeakConcurrentHashMap
 import java.io.BufferedInputStream
 import java.io.IOException
 import java.io.InputStream
 
 object Import0xB0CDBin : ImportCapabilities {
 
-    private val cacheQamIndex = WeakConcurrentHashMap<Int, Modulation>()
-
     /**
      * This parser take as [input] a [InputSource] of a 0xB0CD (binary)
      *
@@ -157,11 +154,6 @@ object Import0xB0CDBin : ImportCapabilities {
      * The sequence generator is guessed, so it can be wrong or incomplete.
      */
     fun getQamFromIndex(index: Int): Modulation {
-        val cachedResult = cacheQamIndex[index]
-        if (cachedResult != null) {
-            return cachedResult
-        }
-
         /*
             Some examples:
             0 -> INVALID
@@ -187,7 +179,6 @@ object Import0xB0CDBin : ImportCapabilities {
         }
 
         val resultQam = Modulation.from(result.toList())
-        cacheQamIndex[index] = resultQam
 
         return resultQam
     }

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/model/BCS.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/model/BCS.kt
@@ -1,7 +1,6 @@
 package it.smartphonecombo.uecapabilityparser.model
 
 import it.smartphonecombo.uecapabilityparser.extension.mutableListWithCapacity
-import it.smartphonecombo.uecapabilityparser.util.WeakConcurrentHashMap
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -11,11 +10,6 @@ sealed interface BCS : Comparable<BCS> {
     fun toCompactStr(): String
 
     companion object {
-        // Cache used by fromBinaryString
-        private val cacheBinary = WeakConcurrentHashMap<String, BCS>()
-        // Cache used by fromQualcommCP
-        private val cacheCP = WeakConcurrentHashMap<String, BCS>()
-
         /**
          * Converts the given binaryString to an instance of [BCS]
          * - If binaryString has no bit with value 1 return [EmptyBCS]
@@ -24,11 +18,6 @@ sealed interface BCS : Comparable<BCS> {
          * - otherwise it returns a [MultiBCS]
          */
         fun fromBinaryString(binaryString: String): BCS {
-            val cachedResult = cacheBinary[binaryString]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val bcsList = mutableListWithCapacity<Int>(binaryString.length)
             for (x in binaryString.indices) {
                 if (binaryString[x] == '1') {
@@ -43,7 +32,6 @@ sealed interface BCS : Comparable<BCS> {
                     32 -> AllBCS
                     else -> MultiBCS(bcsList.toIntArray())
                 }
-            cacheBinary[binaryString] = result
             return result
         }
 
@@ -56,11 +44,6 @@ sealed interface BCS : Comparable<BCS> {
          */
         @Throws(NumberFormatException::class)
         fun fromQualcommCP(bcsString: String): BCS {
-            val cachedResult = cacheCP[bcsString]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 when {
                     bcsString.isEmpty() -> EmptyBCS
@@ -72,7 +55,6 @@ sealed interface BCS : Comparable<BCS> {
                     }
                     else -> SingleBCS(bcsString.toInt())
                 }
-            cacheCP[bcsString] = result
             return result
         }
     }

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/model/Mimo.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/model/Mimo.kt
@@ -1,7 +1,6 @@
 package it.smartphonecombo.uecapabilityparser.model
 
 import it.smartphonecombo.uecapabilityparser.extension.indexOfMin
-import it.smartphonecombo.uecapabilityparser.util.WeakConcurrentHashMap
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,16 +13,7 @@ sealed interface Mimo : Comparable<Mimo> {
     override fun compareTo(other: Mimo): Int = average().compareTo(other.average())
 
     companion object {
-        private val cacheInt = WeakConcurrentHashMap<Int, Mimo>()
-        private val cacheIntArray = WeakConcurrentHashMap<List<Int>, Mimo>()
-        private val cacheQcIndex = WeakConcurrentHashMap<Int, Mimo>()
-
         fun from(int: Int): Mimo {
-            val cachedResult = cacheInt[int]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 if (int == 0) {
                     EmptyMimo
@@ -33,16 +23,10 @@ sealed interface Mimo : Comparable<Mimo> {
                     SingleMimo(int)
                 }
 
-            cacheInt[int] = result
             return result
         }
 
         fun from(list: List<Int>): Mimo {
-            val cachedResult = cacheIntArray[list]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 if (list.isEmpty()) {
                     EmptyMimo
@@ -52,7 +36,6 @@ sealed interface Mimo : Comparable<Mimo> {
                     MixedMimo(list.sortedDescending())
                 }
 
-            cacheIntArray[list] = result
             return result
         }
 
@@ -62,11 +45,6 @@ sealed interface Mimo : Comparable<Mimo> {
          * The sequence generator is guessed, so it can be wrong or incomplete.
          */
         fun fromQcIndex(index: Int): Mimo {
-            val cachedResult = cacheQcIndex[index]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             /*
                 Some examples:
                 0 -> 0
@@ -94,8 +72,6 @@ sealed interface Mimo : Comparable<Mimo> {
             }
 
             val resultMimo = from(result.toList())
-            cacheQcIndex[index] = resultMimo
-
             return resultMimo
         }
     }

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/model/bandwidth/Bandwidth.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/model/bandwidth/Bandwidth.kt
@@ -1,6 +1,5 @@
 package it.smartphonecombo.uecapabilityparser.model.bandwidth
 
-import it.smartphonecombo.uecapabilityparser.util.WeakConcurrentHashMap
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -13,32 +12,18 @@ sealed interface Bandwidth : Comparable<Bandwidth> {
     override fun compareTo(other: Bandwidth): Int = average().compareTo(other.average())
 
     companion object {
-        private val cacheInt = WeakConcurrentHashMap<Int, Bandwidth>()
-        private val cacheIntList = WeakConcurrentHashMap<List<Int>, Bandwidth>()
-
         fun from(int: Int): Bandwidth {
-            val cachedResult = cacheInt[int]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 if (int == 0) {
                     EmptyBandwidth
                 } else {
                     SingleBandwidth(int)
                 }
 
-            cacheInt[int] = result
             return result
         }
 
         fun from(list: List<Int>): Bandwidth {
-            val cachedResult = cacheIntList[list]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 if (list.isEmpty()) {
                     EmptyBandwidth
@@ -48,7 +33,6 @@ sealed interface Bandwidth : Comparable<Bandwidth> {
                     MixedBandwidth(list.sortedDescending())
                 }
 
-            cacheIntList[list] = result
             return result
         }
     }

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/model/modulation/Modulation.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/model/modulation/Modulation.kt
@@ -1,6 +1,5 @@
 package it.smartphonecombo.uecapabilityparser.model.modulation
 
-import it.smartphonecombo.uecapabilityparser.util.WeakConcurrentHashMap
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -23,17 +22,10 @@ sealed interface Modulation : Comparable<Modulation> {
                     SingleModulation(it)
                 }
             }
-        private val cacheModulationArray =
-            WeakConcurrentHashMap<List<ModulationOrder>, Modulation>()
 
         fun from(modulationOrder: ModulationOrder) = singleModulations[modulationOrder.ordinal]
 
         fun from(modulationList: List<ModulationOrder>): Modulation {
-            val cachedResult = cacheModulationArray[modulationList]
-            if (cachedResult != null) {
-                return cachedResult
-            }
-
             val result =
                 if (modulationList.isEmpty()) {
                     EmptyModulation
@@ -43,7 +35,6 @@ sealed interface Modulation : Comparable<Modulation> {
                     MixedModulation(modulationList.sortedDescending())
                 }
 
-            cacheModulationArray[modulationList] = result
             return result
         }
     }

diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/util/WeakConcurrentHashMap.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/util/WeakConcurrentHashMap.kt