Merge pull request #35 from SergKhram/bugfix/fixed-parallel-execution

Fixed parallel execution
SergKhram · Jun 18, 2021 · d286641 · d286641
2 parents d2e64ea + e3eef7f
commit d286641
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import java.net.URI
 
 group = "io.github.sergkhram"
-version = "1.1.2-RELEASE"
+version = "1.1.3-RELEASE"
 
 dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:2.12.3")

diff --git a/src/main/kotlin/io/github/sergkhram/enrich/CleanAllureEnrichService.kt b/src/main/kotlin/io/github/sergkhram/enrich/CleanAllureEnrichService.kt
@@ -18,12 +18,13 @@ import kotlinx.coroutines.newFixedThreadPoolContext
 import kotlinx.coroutines.runBlocking
 import java.io.File
 import kotlin.math.roundToInt
+import java.util.concurrent.ConcurrentHashMap
 
 class CleanAllureEnrichService(
     private val mapper: ObjectMapper,
     private val projectDirectory: String
 ) : EnrichService {
-    val devicesInfo = mutableMapOf<String, DeviceInfo?>()
+    val devicesInfo = ConcurrentHashMap<String, DeviceInfo?>()
 
     override fun iterableEnrich() {
         logger.info("Getting results from device")
@@ -42,7 +43,7 @@ class CleanAllureEnrichService(
                 filteredDevices.forEach {
                     val model = adb.getModel(it.serial)
                     val osVersion = adb.getOsVersion(it.serial)
-                    devicesInfo.put(it.serial, if(!model.isNullOrBlank() && !osVersion.isNullOrBlank()) DeviceInfo(model, osVersion) else null)
+                    devicesInfo[it.serial] = if(!model.isNullOrBlank() && !osVersion.isNullOrBlank()) DeviceInfo(model, osVersion) else null
                 }
                 filteredDevices.forEach { device ->
                     transferringFilesByDevice(this, adb, device)

diff --git a/src/main/kotlin/io/github/sergkhram/enrich/MarathonEnrichService.kt b/src/main/kotlin/io/github/sergkhram/enrich/MarathonEnrichService.kt
@@ -10,14 +10,15 @@ import kotlinx.coroutines.newFixedThreadPoolContext
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
 import java.io.File
+import java.util.concurrent.ConcurrentHashMap
 
 class MarathonEnrichService(
     private val marathonAllureResDirectory: File,
     private val mapper: ObjectMapper,
     private val projectDirectory: String,
     private val allureDeviceResDirectory: File
 ) : EnrichService {
-    val devicesInfo = mutableMapOf<String, DeviceInfo?>()
+    val devicesInfo = ConcurrentHashMap<String, DeviceInfo?>()
 
     override fun iterableEnrich() {
         logger.info("Getting results from Marathon")
@@ -162,7 +163,7 @@ class MarathonEnrichService(
                     logger.debug(e.message ?: e.localizedMessage)
                 }
             }
-            devicesInfo.put(serial, deviceInfo)
+            devicesInfo[serial] = deviceInfo
         }
     }
 }