Skip to content

Commit c254aad

Browse files
authored
Merge pull request #748 from derek-ho/insights
fix from upstream import changes
2 parents 23c16c1 + ce1c03f commit c254aad

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package org.opensearch.reportsscheduler
77

88
import org.opensearch.action.ActionRequest
9-
import org.opensearch.action.ActionResponse
109
import org.opensearch.client.Client
1110
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
1211
import org.opensearch.cluster.node.DiscoveryNodes
@@ -16,6 +15,7 @@ import org.opensearch.common.settings.IndexScopedSettings
1615
import org.opensearch.common.settings.Setting
1716
import org.opensearch.common.settings.Settings
1817
import org.opensearch.common.settings.SettingsFilter
18+
import org.opensearch.core.action.ActionResponse
1919
import org.opensearch.core.common.io.stream.NamedWriteableRegistry
2020
import org.opensearch.core.xcontent.NamedXContentRegistry
2121
import org.opensearch.env.Environment

src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import kotlinx.coroutines.Dispatchers
1010
import kotlinx.coroutines.launch
1111
import org.opensearch.OpenSearchSecurityException
1212
import org.opensearch.OpenSearchStatusException
13-
import org.opensearch.action.ActionListener
1413
import org.opensearch.action.ActionRequest
15-
import org.opensearch.action.ActionResponse
1614
import org.opensearch.action.support.ActionFilters
1715
import org.opensearch.action.support.HandledTransportAction
1816
import org.opensearch.client.Client
1917
import org.opensearch.common.util.concurrent.ThreadContext
2018
import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
2119
import org.opensearch.commons.authuser.User
20+
import org.opensearch.core.action.ActionListener
21+
import org.opensearch.core.action.ActionResponse
2222
import org.opensearch.core.common.io.stream.Writeable
2323
import org.opensearch.core.rest.RestStatus
2424
import org.opensearch.index.IndexNotFoundException

src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package org.opensearch.reportsscheduler.model
77

8-
import org.opensearch.action.ActionResponse
98
import org.opensearch.common.xcontent.XContentFactory
9+
import org.opensearch.core.action.ActionResponse
1010
import org.opensearch.core.rest.RestStatus
1111
import org.opensearch.core.xcontent.ToXContent
1212
import org.opensearch.core.xcontent.ToXContentObject

src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55

66
package org.opensearch.reportsscheduler.util
77

8-
import org.opensearch.action.ActionFuture
9-
import org.opensearch.action.ActionListener
108
import org.opensearch.action.ActionRequest
11-
import org.opensearch.action.ActionResponse
129
import org.opensearch.action.ActionType
1310
import org.opensearch.action.bulk.BulkRequest
1411
import org.opensearch.action.bulk.BulkResponse
@@ -38,7 +35,10 @@ import org.opensearch.action.termvectors.TermVectorsResponse
3835
import org.opensearch.action.update.UpdateRequest
3936
import org.opensearch.action.update.UpdateResponse
4037
import org.opensearch.client.Client
38+
import org.opensearch.common.action.ActionFuture
4139
import org.opensearch.common.util.concurrent.ThreadContext
40+
import org.opensearch.core.action.ActionListener
41+
import org.opensearch.core.action.ActionResponse
4242

4343
/**
4444
* Wrapper class on [Client] with security context removed.

0 commit comments

Comments
 (0)