apply corrections from pull request feedbacks

Author: Leopold-Cramer

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

@@ -601,12 +601,10 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
     datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource)
     var datasetStatus =
         datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
-    runBlocking {
-      while (datasetStatus == Dataset.Status.PENDING.value) {
-        delay(50L)
-        datasetStatus =
-            datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
-      }
+    while (datasetStatus == Dataset.Status.PENDING.value) {
+      Thread.sleep(50L)
+      datasetStatus =
+          datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
     }
     datasetApiService.createTwingraphEntities(
         organizationSaved.id!!,
@@ -623,12 +621,10 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
     datasetApiService.uploadTwingraph(organizationSaved.id!!, datasetSaved.id!!, resource)
     datasetStatus =
         datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
-    runBlocking {
-      while (datasetStatus == Dataset.Status.PENDING.value) {
-        delay(50L)
-        datasetStatus =
-            datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
-      }
+    while (datasetStatus == Dataset.Status.PENDING.value) {
+      Thread.sleep(50L)
+      datasetStatus =
+          datasetApiService.getDatasetTwingraphStatus(organizationSaved.id!!, datasetSaved.id!!)
     }
     queryResult =
         datasetApiService.twingraphQuery(

dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt

@@ -293,16 +293,16 @@ class DatasetServiceImpl(
         ?: throw CsmResourceNotFoundException("Dataset in use, cannot update. Retry later")
 
     datasetRepository.save(dataset.apply { status = Dataset.Status.PENDING })
-    var overriding = false
     GlobalScope.launch(SecurityCoroutineContext()) {
+      var safeReplace = false
       csmJedisPool.resource.use { jedis ->
         if (jedis.exists(dataset.twingraphId!!)) {
           jedis.eval(
               "redis.call('RENAME', KEYS[1], KEYS[2]);",
               2,
               dataset.twingraphId,
               "backupGraph-$datasetId")
-          overriding = true
+          safeReplace = true
         }
       }
       try {
@@ -326,14 +326,14 @@ class DatasetServiceImpl(
               }
             }
         queryBuffer.send()
-        if (overriding) {
+        if (safeReplace) {
           csmJedisPool.resource.use { jedis ->
             jedis.eval("redis.call('DEL', KEYS[1]);", 1, "backupGraph-$datasetId")
           }
         }
         datasetRepository.save(dataset.apply { status = Dataset.Status.READY })
       } catch (e: Exception) {
-        if (overriding) {
+        if (safeReplace) {
           csmJedisPool.resource.use { jedis ->
             jedis.eval(
                 "redis.call('RENAME', KEYS[2], KEYS[1]);",