fix 2.x build

Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho · Aug 2, 2023 · 156da68 · 156da68
1 parent 8db71c9
commit 156da68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt
@@ -20,7 +20,7 @@ import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.update.UpdateRequest
 import org.opensearch.client.Client
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.component.LifecycleListener
+import org.opensearch.common.lifecycle.LifecycleListener
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.xcontent.LoggingDeprecationHandler
 import org.opensearch.common.xcontent.XContentType

diff --git a/src/main/kotlin/org/opensearch/observability/index/ObservabilityIntegrationsIndex.kt b/src/main/kotlin/org/opensearch/observability/index/ObservabilityIntegrationsIndex.kt
@@ -12,8 +12,8 @@ import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.ComposableIndexTemplate
 import org.opensearch.cluster.metadata.Template
 import org.opensearch.cluster.service.ClusterService
-import org.opensearch.common.component.LifecycleListener
 import org.opensearch.common.compress.CompressedXContent
+import org.opensearch.common.lifecycle.LifecycleListener
 import org.opensearch.common.settings.Settings
 import org.opensearch.observability.ObservabilityPlugin.Companion.LOG_PREFIX
 import org.opensearch.observability.settings.PluginSettings

diff --git a/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt b/src/test/kotlin/org/opensearch/observability/PluginRestTestCase.kt
@@ -19,11 +19,11 @@ import org.opensearch.client.RestClient
 import org.opensearch.client.WarningsHandler
 import org.opensearch.common.io.PathUtils
 import org.opensearch.common.settings.Settings
-import org.opensearch.common.xcontent.XContentType
 import org.opensearch.commons.ConfigConstants
 import org.opensearch.commons.rest.SecureRestClientBuilder
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.DeprecationHandler
+import org.opensearch.core.xcontent.MediaType
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.rest.RestRequest
 import org.opensearch.test.rest.OpenSearchRestTestCase
@@ -76,7 +76,7 @@ abstract class PluginRestTestCase : OpenSearchRestTestCase() {
         }
         if (!preserveOpenSearchIndicesAfterTest()) {
             val response = client().performRequest(Request("GET", "/_cat/indices?format=json&expand_wildcards=all"))
-            val xContentType = XContentType.fromMediaType(response.entity.contentType.value)
+            val xContentType = MediaType.fromMediaType(response.entity.contentType.value)
             xContentType.xContent().createParser(
                 NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
                 response.entity.content