ImmutableOpenMap removal compile fix

build-tools/coverage.gradle

@@ -51,8 +51,8 @@ jacocoTestReport {
     sourceDirectories.from = "src/main/kotlin"
     classDirectories.from = sourceSets.main.output
     reports {
-        html.enabled = true // human readable
-        xml.enabled = true // for coverlay
+        html.required = true // human readable
+        xml.required = true // for coverlay
     }
 }
 

build-tools/pkgbuild.gradle

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
 afterEvaluate {
@@ -44,9 +44,8 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${archiveVersion}.rpm"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
     buildDeb {
@@ -56,9 +55,8 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
-            doLast { delete file("$buildDir/distributions/$archiveName") }
+            rename "$archiveFileName", "${packageName}-${archiveVersion}.deb"
+            doLast { delete file("$buildDir/distributions/$archiveFileName") }
         }
     }
 }

build.gradle

@@ -85,7 +85,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.ospackage' version "8.3.0"
+    id 'com.netflix.nebula.ospackage' version "11.0.0"
     id "com.dorongold.task-tree" version "2.1.1"
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spi/build.gradle

@@ -25,13 +25,13 @@ ext {
 
 jacoco {
     toolVersion = '0.8.7'
-    reportsDir = file("$buildDir/JacocoReport")
+    reportsDirectory = file("$buildDir/JacocoReport")
 }
 
 jacocoTestReport {
     reports {
-        xml.enabled false
-        csv.enabled false
+        xml.required = false
+        csv.required = false
         html.destination file("${buildDir}/jacoco/")
     }
 }
@@ -70,7 +70,7 @@ idea.module {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
@@ -84,12 +84,11 @@ test {
 }
 
 task integTest(type: RestIntegTestTask) {
-    description 'Run integ test with opensearch test framework'
-    group 'verification'
-    systemProperty 'tests.security.manager', 'false'
-    dependsOn test
+    description = "Run integration tests against integTest cluster"
+    testClassesDirs = sourceSets.test.output.classesDirs
+    classpath = sourceSets.test.runtimeClasspath
 }
-check.dependsOn integTest
+tasks.named("check").configure { dependsOn(integTest) }
 
 testClusters.javaRestTest {
     testDistribution = 'INTEG_TEST'

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

@@ -176,7 +176,7 @@ class IndexStateManagementHistory(
             clusterStateRequest,
             object : ActionListener<ClusterStateResponse> {
                 override fun onResponse(clusterStateResponse: ClusterStateResponse) {
-                    if (!clusterStateResponse.state.metadata.indices.isEmpty) {
+                    if (clusterStateResponse.state.metadata.indices.isNotEmpty()) {
                         val indicesToDelete = getIndicesToDelete(clusterStateResponse)
                         logger.info("Deleting old history indices viz $indicesToDelete")
                         deleteAllOldHistoryIndices(indicesToDelete)
@@ -199,7 +199,7 @@ class IndexStateManagementHistory(
             val creationTime = indexMetaData.creationDate
 
             if ((Instant.now().toEpochMilli() - creationTime) > historyRetentionPeriod.millis) {
-                val alias = indexMetaData.aliases.firstOrNull { IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias }
+                val alias = indexMetaData.aliases.entries.firstOrNull { IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias }
                 if (alias != null && historyEnabled) {
                     // If index has write alias and history is enable, don't delete the index.
                     continue

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

@@ -846,7 +846,7 @@ object ManagedIndexRunner :
 
             val response: ClusterStateResponse = client.admin().cluster().suspendUntil { state(clusterStateRequest, it) }
 
-            indexMetaData = response.state.metadata.indices.firstOrNull()?.value
+            indexMetaData = response.state.metadata.indices.entries.firstOrNull()?.value
         } catch (e: Exception) {
             logger.error("Failed to get IndexMetaData from cluster manager cluster state for index=$index", e)
         }

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

@@ -111,7 +111,7 @@ class MetadataService(
             val indexUuidMap = mutableMapOf<IndexUuid, IndexName>()
             clusterStateManagedIndexMetadata.forEach { (indexName, metadata) ->
                 val indexMetadata = indicesMetadata[indexName]
-                val currentIndexUuid = indexMetadata.indexUUID
+                val currentIndexUuid = indexMetadata!!.indexUUID
                 if (currentIndexUuid != metadata?.indexUuid) {
                     corruptManagedIndices.add(indexMetadata.index)
                 } else {

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/opensearchapi/OpenSearchExtensions.kt

@@ -199,7 +199,7 @@ fun XContentBuilder.buildMetadata(name: String, metadata: ToXContentFragment, pa
 
 // Get the oldest rollover time or null if index was never rolled over
 fun IndexMetadata.getOldestRolloverTime(): Instant? {
-    return this.rolloverInfos.values()
+    return this.rolloverInfos.entries
         .map { it.value.time }
         .minOrNull() // oldest should be min as its epoch time
         ?.let { Instant.ofEpochMilli(it) }

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/AttemptMoveShardsStep.kt

@@ -84,7 +84,7 @@ class AttemptMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name,
         val (statsStore, statsDocs, shardStats) = getIndexStats(indexName, client) ?: return this
         val indexSize = statsStore.sizeInBytes
         // Get stats of current and target shards
-        val numOriginalShards = context.clusterService.state().metadata.indices[indexName].numberOfShards
+        val numOriginalShards = context.clusterService.state().metadata.indices[indexName]!!.numberOfShards
         val numTargetShards = getNumTargetShards(numOriginalShards, indexSize)
 
         if (shouldFailTooManyDocuments(statsDocs, numTargetShards)) return this
@@ -215,7 +215,7 @@ class AttemptMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name,
     private fun shouldFailUnsafe(clusterService: ClusterService, indexName: String): Boolean {
         // If forceUnsafe is set and is true, then we don't even need to check the number of replicas
         if (action.forceUnsafe == true) return false
-        val numReplicas = clusterService.state().metadata.indices[indexName].numberOfReplicas
+        val numReplicas = clusterService.state().metadata.indices.get(indexName)!!.numberOfReplicas
         val shouldFailForceUnsafeCheck = numReplicas == 0
         if (shouldFailForceUnsafeCheck) {
             logger.info(UNSAFE_FAILURE_MESSAGE)

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForMoveShardsStep.kt

@@ -33,7 +33,7 @@ class WaitForMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name,
         val numShardsInSync = getNumShardsInSync(shardStats, context.clusterService.state(), indexName)
         val nodeToMoveOnto = localShrinkActionProperties.nodeName
         val numShardsOnNode = getNumShardsWithCopyOnNode(shardStats, context.clusterService.state(), nodeToMoveOnto)
-        val numPrimaryShards = context.clusterService.state().metadata.indices[indexName].numberOfShards
+        val numPrimaryShards = context.clusterService.state().metadata.indices[indexName]!!.numberOfShards
 
         // If a copy of each shard is on the node, and all shards are in sync, move on
         if (numShardsOnNode >= numPrimaryShards && numShardsInSync >= numPrimaryShards) {
@@ -49,16 +49,16 @@ class WaitForMoveShardsStep(private val action: ShrinkAction) : ShrinkStep(name,
 
     // Returns the number of shard IDs where all primary and replicas are in sync
     private fun getNumShardsInSync(shardStats: Array<ShardStats>, state: ClusterState, indexName: String): Int {
-        val numReplicas = state.metadata.indices[indexName].numberOfReplicas
-        val inSyncAllocations = state.metadata.indices[indexName].inSyncAllocationIds
+        val numReplicas = state.metadata.indices[indexName]!!.numberOfReplicas
+        val inSyncAllocations = state.metadata.indices[indexName]!!.inSyncAllocationIds
         var numShardsInSync = 0
         for (shard: ShardStats in shardStats) {
             val routingInfo = shard.shardRouting
             // Only check primaries so that we only check once for each shardID
             if (routingInfo.primary()) {
                 // All shards must be in sync as it isn't known which shard (replica or primary) will be
                 // moved to the target node and used in the shrink.
-                if (inSyncAllocations[routingInfo.id].size == (numReplicas + 1)) {
+                if (inSyncAllocations[routingInfo.id]!!.size == (numReplicas + 1)) {
                     numShardsInSync++
                 }
             }

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/shrink/WaitForShrinkStep.kt

@@ -54,7 +54,7 @@ class WaitForShrinkStep(private val action: ShrinkAction) : ShrinkStep(name, tru
 
     private suspend fun shrinkNotDone(targetIndex: String, targetNumShards: Int, client: Client, clusterService: ClusterService): Boolean {
         val numPrimaryShardsStarted = getNumPrimaryShardsStarted(client, targetIndex)
-        val numPrimaryShards = clusterService.state().metadata.indices[targetIndex].numberOfShards
+        val numPrimaryShards = clusterService.state().metadata.indices[targetIndex]!!.numberOfShards
         return numPrimaryShards != targetNumShards || numPrimaryShardsStarted != targetNumShards
     }
 

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt

@@ -269,7 +269,7 @@ class TransportExplainAction @Inject constructor(
                     clusterStateRequest,
                     object : ActionListener<ClusterStateResponse> {
                         override fun onResponse(response: ClusterStateResponse) {
-                            val clusterStateIndexMetadatas = response.state.metadata.indices.associate { it.key to it.value }
+                            val clusterStateIndexMetadatas = response.state.metadata.indices.entries.associate { it.key to it.value }
                             getMetadataMap(clusterStateIndexMetadatas, threadContext)
                         }
 

src/main/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperService.kt

@@ -343,7 +343,7 @@ class RollupMapperService(
                 return RollupJobValidationResult.Failure(getMappingsResult.message, getMappingsResult.cause)
         }
 
-        val indexMapping: MappingMetadata = res.mappings[targetIndexResolvedName]
+        val indexMapping: MappingMetadata = res.mappings[targetIndexResolvedName]!!
 
         return if (((indexMapping.sourceAsMap?.get(_META) as Map<*, *>?)?.get(ROLLUPS) as Map<*, *>?)?.containsKey(rollup.id) == true) {
             RollupJobValidationResult.Valid

src/main/kotlin/org/opensearch/indexmanagement/rollup/util/RollupFieldValueExpressionResolver.kt

@@ -59,7 +59,7 @@ object RollupFieldValueExpressionResolver {
         open fun hasAlias(index: String): Boolean {
             val aliases = this.clusterService.state().metadata().indices.get(index)?.aliases
             if (aliases != null) {
-                return aliases.size() > 0
+                return aliases.isNotEmpty()
             }
             return false
         }

src/main/kotlin/org/opensearch/indexmanagement/util/IndexUtils.kt

@@ -134,7 +134,7 @@ class IndexUtils {
             actionListener: ActionListener<AcknowledgedResponse>
         ) {
             if (clusterState.metadata.indices.containsKey(index)) {
-                if (shouldUpdateIndex(clusterState.metadata.indices[index], schemaVersion)) {
+                if (shouldUpdateIndex(clusterState.metadata.indices[index]!!, schemaVersion)) {
                     val putMappingRequest: PutMappingRequest = PutMappingRequest(index).source(mapping, XContentType.JSON)
                     client.putMapping(putMappingRequest, actionListener)
                 } else {

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementIntegTestCase.kt

@@ -113,7 +113,7 @@ abstract class IndexStateManagementIntegTestCase : OpenSearchIntegTestCase() {
         return client().admin().cluster().prepareState()
             .setIndices(indexName)
             .setMetadata(true).get()
-            .state.metadata.indices[indexName]
+            .state.metadata.indices[indexName]!!
     }
 
     // reuse utility fun from RestTestCase

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataServiceTests.kt

@@ -22,7 +22,6 @@ import org.opensearch.client.ClusterAdminClient
 import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.metadata.Metadata
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.collect.ImmutableOpenMap
 import org.opensearch.indexmanagement.IndexManagementIndices
 import org.opensearch.test.OpenSearchTestCase
 import kotlin.test.assertFailsWith
@@ -40,7 +39,7 @@ class MetadataServiceTests : OpenSearchTestCase() {
     fun setup() {
         whenever(clusterService.state()).doReturn(clusterState)
         whenever(clusterState.metadata).doReturn(metadata)
-        whenever(metadata.indices).doReturn(ImmutableOpenMap.of())
+        whenever(metadata.indices).doReturn(mutableMapOf())
     }
 
     fun `test config index not exists`() = runBlocking {

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt

@@ -23,7 +23,6 @@ import org.opensearch.cluster.ClusterState
 import org.opensearch.cluster.metadata.IndexMetadata
 import org.opensearch.cluster.metadata.Metadata
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.collect.ImmutableOpenMap
 import org.opensearch.common.settings.ClusterSettings
 import org.opensearch.common.settings.Settings
 import org.opensearch.index.shard.DocsStats
@@ -50,7 +49,7 @@ class AttemptTransitionStepTests : OpenSearchTestCase() {
     private val indexUUID: String = "indexUuid"
     @Suppress("UNCHECKED_CAST")
     private val indexMetadata: IndexMetadata = mock {
-        on { rolloverInfos } doReturn ImmutableOpenMap.builder<String, RolloverInfo>().build()
+        on { rolloverInfos } doReturn mutableMapOf<String, RolloverInfo>()
         on { indexUUID } doReturn indexUUID
     }
     private val metadata: Metadata = mock {

src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupMapperServiceTests.kt

@@ -21,7 +21,6 @@ import org.opensearch.client.IndicesAdminClient
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.metadata.MappingMetadata
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.collect.ImmutableOpenMap
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.indexmanagement.rollup.model.RollupJobValidationResult
 import org.opensearch.test.OpenSearchTestCase
@@ -292,16 +291,14 @@ class RollupMapperServiceTests : OpenSearchTestCase() {
 
     private fun getMappingResponse(indexName: String, emptyMapping: Boolean = false): GetMappingsResponse {
         val mappings = if (emptyMapping) {
-            ImmutableOpenMap.Builder<String, MappingMetadata>().build()
+            mutableMapOf()
         } else {
             val mappingSourceMap = createParser(
                 XContentType.JSON.xContent(),
                 javaClass.classLoader.getResource("mappings/kibana-sample-data.json").readText()
             ).map()
             val mappingMetadata = MappingMetadata("_doc", mappingSourceMap) // it seems it still expects a type, i.e. _doc now
-            ImmutableOpenMap.Builder<String, MappingMetadata>()
-                .fPut(indexName, mappingMetadata)
-                .build()
+            mutableMapOf(indexName to mappingMetadata)
         }
 
         return GetMappingsResponse(mappings)

src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/TestUtils.kt

@@ -14,17 +14,16 @@ import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse
 import org.opensearch.action.index.IndexResponse
 import org.opensearch.cluster.SnapshotsInProgress
 import org.opensearch.common.UUIDs
-import org.opensearch.common.collect.ImmutableOpenMap
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
+import org.opensearch.common.xcontent.XContentFactory
+import org.opensearch.common.xcontent.XContentType
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
-import org.opensearch.common.xcontent.XContentFactory
 import org.opensearch.core.xcontent.XContentParser
-import org.opensearch.common.xcontent.XContentType
-import org.opensearch.indexmanagement.opensearchapi.string
 import org.opensearch.index.seqno.SequenceNumbers
 import org.opensearch.indexmanagement.indexstatemanagement.randomChannel
+import org.opensearch.indexmanagement.opensearchapi.string
 import org.opensearch.indexmanagement.opensearchapi.toMap
 import org.opensearch.indexmanagement.randomCronSchedule
 import org.opensearch.indexmanagement.randomInstant
@@ -39,9 +38,9 @@ import org.opensearch.snapshots.Snapshot
 import org.opensearch.snapshots.SnapshotId
 import org.opensearch.snapshots.SnapshotInfo
 import org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength
-import org.opensearch.test.OpenSearchTestCase.randomBoolean
-import org.opensearch.test.OpenSearchTestCase.randomIntBetween
 import org.opensearch.test.OpenSearchTestCase.randomNonNegativeLong
+import org.opensearch.test.OpenSearchTestCase.randomIntBetween
+import org.opensearch.test.OpenSearchTestCase.randomBoolean
 import org.opensearch.test.rest.OpenSearchRestTestCase
 import java.time.Instant
 import java.time.temporal.ChronoUnit
@@ -242,7 +241,7 @@ fun mockInProgressSnapshotInfo(
         emptyList(),
         randomNonNegativeLong(),
         randomNonNegativeLong(),
-        ImmutableOpenMap.of(),
+        mapOf(),
         "",
         mapOf("sm_policy" to "daily-snapshot"),
         Version.CURRENT,