From ce1c03ff9b999493311e5d81955526451ae11471 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 14 Aug 2023 13:36:32 -0400 Subject: [PATCH] fix from upstream Signed-off-by: Derek Ho --- .../opensearch/reportsscheduler/ReportsSchedulerPlugin.kt | 2 +- .../opensearch/reportsscheduler/action/PluginBaseAction.kt | 4 ++-- .../org/opensearch/reportsscheduler/model/BaseResponse.kt | 2 +- .../opensearch/reportsscheduler/util/SecureIndexClient.kt | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt b/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt index 3062d8d3..9fb995fc 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt @@ -6,7 +6,6 @@ package org.opensearch.reportsscheduler import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.node.DiscoveryNodes @@ -16,6 +15,7 @@ import org.opensearch.common.settings.IndexScopedSettings import org.opensearch.common.settings.Setting import org.opensearch.common.settings.Settings import org.opensearch.common.settings.SettingsFilter +import org.opensearch.core.action.ActionResponse import org.opensearch.core.common.io.stream.NamedWriteableRegistry import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.env.Environment diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt index ca4315fa..a6486cbe 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt @@ -10,15 +10,15 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.opensearch.OpenSearchSecurityException import org.opensearch.OpenSearchStatusException -import org.opensearch.action.ActionListener import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.client.Client import org.opensearch.common.util.concurrent.ThreadContext import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT import org.opensearch.commons.authuser.User +import org.opensearch.core.action.ActionListener +import org.opensearch.core.action.ActionResponse import org.opensearch.core.common.io.stream.Writeable import org.opensearch.core.rest.RestStatus import org.opensearch.index.IndexNotFoundException diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt b/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt index 2bc10fe9..4236d1c6 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt @@ -5,8 +5,8 @@ package org.opensearch.reportsscheduler.model -import org.opensearch.action.ActionResponse import org.opensearch.common.xcontent.XContentFactory +import org.opensearch.core.action.ActionResponse import org.opensearch.core.rest.RestStatus import org.opensearch.core.xcontent.ToXContent import org.opensearch.core.xcontent.ToXContentObject diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt b/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt index f44e261a..daa100d3 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt @@ -5,10 +5,7 @@ package org.opensearch.reportsscheduler.util -import org.opensearch.action.ActionFuture -import org.opensearch.action.ActionListener import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.action.ActionType import org.opensearch.action.bulk.BulkRequest import org.opensearch.action.bulk.BulkResponse @@ -38,7 +35,10 @@ import org.opensearch.action.termvectors.TermVectorsResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client +import org.opensearch.common.action.ActionFuture import org.opensearch.common.util.concurrent.ThreadContext +import org.opensearch.core.action.ActionListener +import org.opensearch.core.action.ActionResponse /** * Wrapper class on [Client] with security context removed.