Small optimizations

Author: blootsvoets

src/integrationTest/java/org/radarbase/output/RestructureS3IntegrationTest.kt

@@ -100,16 +100,15 @@ class RestructureS3IntegrationTest {
                 assertEquals(csvContents, targetContent.toString(UTF_8))
             }
 
-            withContext(Dispatchers.IO) {
+            return@coroutineScope withContext(Dispatchers.IO) {
                 targetClient.listObjects(
                     ListObjectsArgs.Builder().bucketBuild(targetConfig.bucket) {
                         prefix("output")
                         recursive(true)
                         useUrlEncodingType(false)
                     }
                 )
-                    .map { it.get().objectName() }
-                    .toHashSet()
+                    .mapTo(HashSet()) { it.get().objectName() }
             }
         }
 

src/main/java/org/radarbase/output/format/CsvAvroConverterFactory.kt

@@ -38,10 +38,12 @@ class CsvAvroConverterFactory : RecordConverterFactory {
                 if (header == null) return false
                 val fields = fieldIndexes(header, distinctFields, ignoreFields)
                 var count = 0
-                val lineMap = lines
-                    .onEach { count += 1 }
-                    .mapIndexed { idx, line -> Pair(ArrayWrapper(line.byIndex(fields)), idx) }
-                    .toMap(HashMap())
+                val lineMap = buildMap {
+                    lines.forEachIndexed { idx, line ->
+                        count += 1
+                        put(ArrayWrapper(line.byIndex(fields)), idx)
+                    }
+                }
 
                 if (lineMap.size == count) {
                     logger.debug("File {} is already deduplicated. Skipping.", fileName)

src/main/java/org/radarbase/output/path/PathFormatter.kt

@@ -29,8 +29,7 @@ class PathFormatter(
     init {
         val foundParameters = "\\$\\{([^}]*)}".toRegex()
             .findAll(format)
-            .map { it.groupValues[1] }
-            .toSet()
+            .mapTo(HashSet()) { it.groupValues[1] }
 
         parameterLookups = buildMap {
             plugins.forEach { plugin ->