[Release 3.0] Add alpha1 qualifier.

.github/workflows/notifications-test-and-build-workflow.yml

@@ -20,10 +20,13 @@ jobs:
       fail-fast: false
       matrix:
         java: [21, 23]
+        os:
+          - ubuntu-24.04-arm  # arm64-preview
+          - ubuntu-24.04  # x64
 
     # Job name
     name: Build Notifications with JDK ${{ matrix.java }} on linux
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
       # this image tag is subject to change as more dependencies and updates will arrive over time
@@ -43,7 +46,7 @@ jobs:
 
       # notifications
       - name: Checkout Notifications
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build with Gradle
         run: |
@@ -68,13 +71,13 @@ jobs:
       - name: Upload Artifacts for notifications plugin
         uses: actions/upload-artifact@v4
         with:
-          name: notifications-plugin-${{ matrix.os }}
+          name: notifications-plugin-${{ matrix.os }}-JDK${{ matrix.java }}
           path: notifications-build/notifications
 
       - name: Upload Artifacts for notifications-core plugin
         uses: actions/upload-artifact@v4
         with:
-          name: notifications-core-plugin-${{ matrix.os }}
+          name: notifications-core-plugin-${{ matrix.os }}-JDK${{ matrix.java }}
           path: notifications-build/notifications-core
 
   build-windows-macos:
@@ -101,14 +104,14 @@ jobs:
 
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: temurin # Temurin is a distribution of adoptium
           java-version: ${{ matrix.java }}
 
       # notifications
       - name: Checkout Notifications
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # This is a hack, but this step creates a link to the X: mounted drive, which makes the path
       # short enough to work on Windows
@@ -134,11 +137,11 @@ jobs:
       - name: Upload Artifacts for notifications plugin
         uses: actions/upload-artifact@v4
         with:
-          name: notifications-plugin-${{ matrix.os }}
+          name: notifications-plugin-${{ matrix.os }}-JDK${{ matrix.java }}
           path: notifications-build/notifications
 
       - name: Upload Artifacts for notifications-core plugin
         uses: actions/upload-artifact@v4
         with:
-          name: notifications-core-plugin-${{ matrix.os }}
+          name: notifications-core-plugin-${{ matrix.os }}-JDK${{ matrix.java }}
           path: notifications-build/notifications-core

.github/workflows/security-notifications-test-workflow.yml

@@ -17,19 +17,22 @@ jobs:
       fail-fast: false
       matrix:
         java: [21, 23]
+        os:
+          - ubuntu-24.04-arm  # arm64-preview
+          - ubuntu-24.04  # x64
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: temurin # Temurin is a distribution of adoptium
           java-version: ${{ matrix.java }}
 
       # notifications
       - name: Checkout Notifications
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Temporarily exclude tests which causing CI to fail. Tracking in #251
       - name: Build with Gradle

notifications/build.gradle

@@ -6,9 +6,9 @@
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'

notifications/core/src/main/kotlin/org/opensearch/notifications/core/NotificationCorePlugin.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.core
 
-import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.settings.Setting
@@ -25,6 +24,7 @@ import org.opensearch.plugins.ReloadablePlugin
 import org.opensearch.repositories.RepositoriesService
 import org.opensearch.script.ScriptService
 import org.opensearch.threadpool.ThreadPool
+import org.opensearch.transport.client.Client
 import org.opensearch.watcher.ResourceWatcherService
 import java.util.function.Supplier
 

notifications/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.client.Client
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver
 import org.opensearch.cluster.node.DiscoveryNodes
 import org.opensearch.cluster.service.ClusterService
@@ -51,6 +50,7 @@ import org.opensearch.rest.RestController
 import org.opensearch.rest.RestHandler
 import org.opensearch.script.ScriptService
 import org.opensearch.threadpool.ThreadPool
+import org.opensearch.transport.client.Client
 import org.opensearch.watcher.ResourceWatcherService
 import java.util.function.Supplier
 

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/CreateNotificationConfigAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.CreateNotificationConfigRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Create NotificationConfig transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/DeleteNotificationConfigAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.DeleteNotificationConfigRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Delete NotificationConfig transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/GetChannelListAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.GetChannelListRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get channel list transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/GetNotificationConfigAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.GetNotificationConfigRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get notification config transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/GetPluginFeaturesAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.GetPluginFeaturesRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.CoreProvider
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Get plugin features transport action

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

@@ -13,7 +13,6 @@ import org.opensearch.OpenSearchStatusException
 import org.opensearch.action.ActionRequest
 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
@@ -29,6 +28,7 @@ import org.opensearch.notifications.NotificationPlugin.Companion.LOG_PREFIX
 import org.opensearch.notifications.metrics.Metrics
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 import java.io.IOException
 
 internal abstract class PluginBaseAction<Request : ActionRequest, Response : ActionResponse>(

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/PublishNotificationAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.LegacyPublishNotificationRequest
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.send.SendMessageActionHelper
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Publish Notification transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/SendNotificationAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.NotificationsActions
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.send.SendMessageActionHelper
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Send Notification transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/SendTestNotificationAction.kt

@@ -8,8 +8,6 @@ package org.opensearch.notifications.action
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
-import org.opensearch.client.Client
-import org.opensearch.client.node.NodeClient
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.notifications.NotificationsPluginInterface
 import org.opensearch.commons.notifications.action.SendNotificationResponse
@@ -21,6 +19,8 @@ import org.opensearch.notifications.model.SendTestNotificationRequest
 import org.opensearch.notifications.send.SendTestNotificationActionHelper
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Send Test Notification transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/action/UpdateNotificationConfigAction.kt

@@ -7,7 +7,6 @@ package org.opensearch.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.commons.notifications.action.NotificationsActions
@@ -19,6 +18,7 @@ import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.notifications.index.ConfigIndexingActions
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
+import org.opensearch.transport.client.Client
 
 /**
  * Update NotificationConfig transport action

notifications/notifications/src/main/kotlin/org/opensearch/notifications/index/NotificationConfigIndex.kt

@@ -22,8 +22,7 @@ import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.index.IndexResponse
 import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.action.support.master.AcknowledgedResponse
-import org.opensearch.client.Client
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse
 import org.opensearch.cluster.service.ClusterService
 import org.opensearch.common.unit.TimeValue
 import org.opensearch.common.util.concurrent.ThreadContext
@@ -54,6 +53,7 @@ import org.opensearch.script.Script
 import org.opensearch.search.SearchHit
 import org.opensearch.search.builder.SearchSourceBuilder
 import org.opensearch.search.sort.SortOrder
+import org.opensearch.transport.client.Client
 import java.lang.IllegalArgumentException
 import java.util.concurrent.TimeUnit
 

notifications/notifications/src/main/kotlin/org/opensearch/notifications/resthandler/NotificationChannelListRestHandler.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.commons.notifications.NotificationsPluginInterface
 import org.opensearch.commons.notifications.action.GetChannelListRequest
 import org.opensearch.core.rest.RestStatus
@@ -17,6 +16,7 @@ import org.opensearch.rest.RestHandler.Route
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestRequest.Method.GET
 import org.opensearch.rest.action.RestToXContentListener
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Rest handler for getting notification channels.

notifications/notifications/src/main/kotlin/org/opensearch/notifications/resthandler/NotificationConfigRestHandler.kt

@@ -4,7 +4,6 @@
  */
 package org.opensearch.notifications.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_LIST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.DEFAULT_MAX_ITEMS
@@ -34,6 +33,7 @@ import org.opensearch.rest.RestRequest.Method.POST
 import org.opensearch.rest.RestRequest.Method.PUT
 import org.opensearch.rest.action.RestToXContentListener
 import org.opensearch.search.sort.SortOrder
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Rest handler for notification configurations.

notifications/notifications/src/main/kotlin/org/opensearch/notifications/resthandler/NotificationFeaturesRestHandler.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.commons.notifications.NotificationsPluginInterface
 import org.opensearch.commons.notifications.action.GetPluginFeaturesRequest
 import org.opensearch.core.rest.RestStatus
@@ -17,6 +16,7 @@ import org.opensearch.rest.RestHandler.Route
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestRequest.Method.GET
 import org.opensearch.rest.action.RestToXContentListener
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Rest handler for getting notification features.

notifications/notifications/src/main/kotlin/org/opensearch/notifications/resthandler/NotificationStatsRestHandler.kt

@@ -5,7 +5,6 @@
 
 package org.opensearch.notifications.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.notifications.NotificationPlugin.Companion.PLUGIN_BASE_URI
 import org.opensearch.notifications.metrics.Metrics
@@ -15,6 +14,7 @@ import org.opensearch.rest.BytesRestResponse
 import org.opensearch.rest.RestHandler.Route
 import org.opensearch.rest.RestRequest
 import org.opensearch.rest.RestRequest.Method.GET
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Rest handler for getting notifications backend stats

notifications/notifications/src/main/kotlin/org/opensearch/notifications/resthandler/PluginBaseHandler.kt

@@ -4,10 +4,10 @@
  */
 package org.opensearch.notifications.resthandler
 
-import org.opensearch.client.node.NodeClient
 import org.opensearch.notifications.metrics.Metrics
 import org.opensearch.rest.BaseRestHandler
 import org.opensearch.rest.RestRequest
+import org.opensearch.transport.client.node.NodeClient
 
 /**
  * Base class for Rest handler for plugin.