fix actions components after core #9082 (opensearch-project#739)

* fix actions Signed-off-by: zhichao-aws <zhichaog@amazon.com> * fix test Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com>
Noir01 · Aug 16, 2023 · d36b9c0 · d36b9c0
1 parent 1cd4263
commit d36b9c0
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/...ications/notifications/src/main/kotlin/org/opensearch/notifications/NotificationPlugin.kt b/...ications/notifications/src/main/kotlin/org/opensearch/notifications/NotificationPlugin.kt
@@ -6,7 +6,6 @@
 package org.opensearch.notifications
 
 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
@@ -18,6 +17,7 @@ import org.opensearch.common.settings.Settings
 import org.opensearch.common.settings.SettingsFilter
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.logger
+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/...ons/src/main/kotlin/org/opensearch/notifications/action/CreateNotificationConfigAction.kt b/...ons/src/main/kotlin/org/opensearch/notifications/action/CreateNotificationConfigAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.CreateNotificationConfigReque
 import org.opensearch.commons.notifications.action.CreateNotificationConfigResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task

diff --git a/...ons/src/main/kotlin/org/opensearch/notifications/action/DeleteNotificationConfigAction.kt b/...ons/src/main/kotlin/org/opensearch/notifications/action/DeleteNotificationConfigAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.DeleteNotificationConfigReque
 import org.opensearch.commons.notifications.action.DeleteNotificationConfigResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task

diff --git a/...notifications/src/main/kotlin/org/opensearch/notifications/action/GetChannelListAction.kt b/...notifications/src/main/kotlin/org/opensearch/notifications/action/GetChannelListAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.GetChannelListRequest
 import org.opensearch.commons.notifications.action.GetChannelListResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task

diff --git a/...ations/src/main/kotlin/org/opensearch/notifications/action/GetNotificationConfigAction.kt b/...ations/src/main/kotlin/org/opensearch/notifications/action/GetNotificationConfigAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.GetNotificationConfigRequest
 import org.opensearch.commons.notifications.action.GetNotificationConfigResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task

diff --git a/...ifications/src/main/kotlin/org/opensearch/notifications/action/GetPluginFeaturesAction.kt b/...ifications/src/main/kotlin/org/opensearch/notifications/action/GetPluginFeaturesAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.GetPluginFeaturesRequest
 import org.opensearch.commons.notifications.action.GetPluginFeaturesResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.CoreProvider
 import org.opensearch.tasks.Task

diff --git a/...ons/notifications/src/main/kotlin/org/opensearch/notifications/action/PluginBaseAction.kt b/...ons/notifications/src/main/kotlin/org/opensearch/notifications/action/PluginBaseAction.kt
@@ -10,16 +10,16 @@ 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.commons.utils.logger
+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/...ications/src/main/kotlin/org/opensearch/notifications/action/PublishNotificationAction.kt b/...ications/src/main/kotlin/org/opensearch/notifications/action/PublishNotificationAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.LegacyPublishNotificationRequ
 import org.opensearch.commons.notifications.action.LegacyPublishNotificationResponse
 import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.send.SendMessageActionHelper
 import org.opensearch.tasks.Task

diff --git a/...tifications/src/main/kotlin/org/opensearch/notifications/action/SendNotificationAction.kt b/...tifications/src/main/kotlin/org/opensearch/notifications/action/SendNotificationAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.notifications.action.SendNotificationRequest
 import org.opensearch.commons.notifications.action.SendNotificationResponse
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.send.SendMessageActionHelper
 import org.opensearch.tasks.Task

diff --git a/...cations/src/main/kotlin/org/opensearch/notifications/action/SendTestNotificationAction.kt b/...cations/src/main/kotlin/org/opensearch/notifications/action/SendTestNotificationAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
@@ -15,6 +14,7 @@ import org.opensearch.common.inject.Inject
 import org.opensearch.commons.notifications.NotificationsPluginInterface
 import org.opensearch.commons.notifications.action.SendNotificationResponse
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.NotificationPlugin.Companion.LOG_PREFIX
 import org.opensearch.notifications.model.SendTestNotificationRequest

diff --git a/...ons/src/main/kotlin/org/opensearch/notifications/action/UpdateNotificationConfigAction.kt b/...ons/src/main/kotlin/org/opensearch/notifications/action/UpdateNotificationConfigAction.kt
@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.action
 
-import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
@@ -15,6 +14,7 @@ import org.opensearch.commons.notifications.action.NotificationsActions
 import org.opensearch.commons.notifications.action.UpdateNotificationConfigRequest
 import org.opensearch.commons.notifications.action.UpdateNotificationConfigResponse
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task

diff --git a/...ions/notifications/src/main/kotlin/org/opensearch/notifications/util/SecureIndexClient.kt b/...ions/notifications/src/main/kotlin/org/opensearch/notifications/util/SecureIndexClient.kt
@@ -5,10 +5,7 @@
 
 package org.opensearch.notifications.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.

diff --git a/...fications/notifications/src/main/kotlin/org/opensearch/notifications/util/SuspendUtils.kt b/...fications/notifications/src/main/kotlin/org/opensearch/notifications/util/SuspendUtils.kt
@@ -7,8 +7,8 @@ package org.opensearch.notifications.util
 
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeout
-import org.opensearch.action.ActionListener
 import org.opensearch.client.OpenSearchClient
+import org.opensearch.core.action.ActionListener
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 

diff --git a/...ns/notifications/src/test/kotlin/org/opensearch/notifications/action/PluginActionTests.kt b/...ns/notifications/src/test/kotlin/org/opensearch/notifications/action/PluginActionTests.kt
@@ -14,7 +14,6 @@ import org.mockito.Answers
 import org.mockito.Mock
 import org.mockito.Mockito.mock
 import org.mockito.junit.jupiter.MockitoExtension
-import org.opensearch.action.ActionListener
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.client.Client
 import org.opensearch.commons.destination.response.LegacyDestinationResponse
@@ -43,6 +42,7 @@ import org.opensearch.commons.notifications.model.EventStatus
 import org.opensearch.commons.notifications.model.NotificationConfigSearchResult
 import org.opensearch.commons.notifications.model.NotificationEvent
 import org.opensearch.commons.notifications.model.SeverityType
+import org.opensearch.core.action.ActionListener
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions