Bumps kotlin version to 1.6.1

Signed-off-by: Clay Downs <[email protected]>

build.gradle

@@ -19,7 +19,7 @@ buildscript {
         notification_version = System.getProperty("notification.version", opensearch_build)
         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
         job_scheduler_version = System.getProperty("job_scheduler_version.version", opensearch_build)
-        kotlin_version = System.getProperty("kotlin.version", "1.4.0")
+        kotlin_version = System.getProperty("kotlin.version", "1.6.10")
 
         opensearch_no_snapshot = opensearch_version.replace("-SNAPSHOT","")
         job_scheduler_no_snapshot = job_scheduler_version.replace("-SNAPSHOT","")

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/Step.kt

@@ -68,7 +68,7 @@ abstract class Step(val name: String, val isSafeToDisableOn: Boolean = true) {
 
         companion object {
             fun read(streamInput: StreamInput): StepStatus {
-                return valueOf(streamInput.readString().toUpperCase(Locale.ROOT))
+                return valueOf(streamInput.readString().uppercase(Locale.ROOT))
             }
         }
     }

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/ActionRetry.kt

@@ -72,7 +72,7 @@ data class ActionRetry(
 
                 when (fieldName) {
                     COUNT_FIELD -> count = xcp.longValue()
-                    BACKOFF_FIELD -> backoff = Backoff.valueOf(xcp.text().toUpperCase(Locale.ROOT))
+                    BACKOFF_FIELD -> backoff = Backoff.valueOf(xcp.text().uppercase(Locale.ROOT))
                     DELAY_FIELD -> delay = TimeValue.parseTimeValue(xcp.text(), DELAY_FIELD)
                 }
             }

spi/src/main/kotlin/org.opensearch.indexmanagement.spi/indexstatemanagement/model/StepMetaData.kt

@@ -90,7 +90,7 @@ data class StepMetaData(
                 when (fieldName) {
                     NAME -> name = xcp.text()
                     START_TIME -> startTime = xcp.longValue()
-                    STEP_STATUS -> stepStatus = Step.StepStatus.valueOf(xcp.text().toUpperCase(Locale.ROOT))
+                    STEP_STATUS -> stepStatus = Step.StepStatus.valueOf(xcp.text().uppercase(Locale.ROOT))
                 }
             }
 

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt

@@ -297,8 +297,8 @@ class ManagedIndexCoordinator(
             val managedIndices = getManagedIndices(event.indicesDeleted().map { it.uuid })
             val deletedIndices = event.indicesDeleted().map { it.name }
             val allIndicesUuid = indexMetadataProvider.getMultiTypeISMIndexMetadata(indexNames = deletedIndices).map { (_, metadataMapForType) ->
-                metadataMapForType.values
-            }
+                metadataMapForType.values.map { it.indexUuid }
+            }.flatten().toSet()
             // Check if the deleted index uuid is still part of any metadata service in the cluster and has an existing managed index job
             indicesToClean = event.indicesDeleted().filter { it.uuid in managedIndices.keys && !allIndicesUuid.contains(it.uuid) }
             removeManagedIndexReq = indicesToClean.map { deleteManagedIndexRequest(it.uuid) }

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/migration/MigrationServices.kt

@@ -254,7 +254,7 @@ class ISMTemplateService(
 
     private fun populateV2ISMTemplateMap(policyID: String, indexPatterns: List<String>, priority: Int) {
         var v1Increment = 0
-        val v1MaxOrder = v1orderToBucketIncrement.keys.max()
+        val v1MaxOrder = v1orderToBucketIncrement.keys.maxOrNull()
         if (v1MaxOrder != null) {
             v1Increment = v1MaxOrder + v1orderToBucketIncrement.values.sum()
         }