Rebasing with feature/extensions

Signed-off-by: Sarat Vemulapalli <[email protected]>
opensearch-project · Sep 13, 2022 · 57d6e84 · 57d6e84
1 parent 7aba611
commit 57d6e84
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/server/src/main/java/org/opensearch/action/ActionModule.java b/server/src/main/java/org/opensearch/action/ActionModule.java
@@ -511,11 +511,11 @@ public ActionModule(
     }
 
     public static class ActionRegistry extends NamedRegistry<ActionHandler<?, ?>> {
-        ActionRegistry() {
+        public ActionRegistry() {
             super("action");
         }
 
-        ActionRegistry(Map<String, ActionHandler<?, ?>> actions) {
+        public ActionRegistry(Map<String, ActionHandler<?, ?>> actions) {
             super("action", actions);
         }
 
@@ -530,14 +530,6 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
         ) {
             register(new ActionHandler<>(action, transportAction, supportTransportActions));
         }
-
-        public <Request extends ActionRequest, Response extends ActionResponse> void register(
-            ActionType<Response> action,
-            Class<? extends TransportAction<Request, Response>> transportAction,
-            Class<?>... supportTransportActions
-        ) {
-            register(new ActionHandler<>(action, transportAction, supportTransportActions));
-        }
     }
 
     static Map<String, ActionHandler<?, ?>> setupActions(List<ActionPlugin> actionPlugins) {

diff --git a/server/src/main/java/org/opensearch/client/node/NodeClient.java b/server/src/main/java/org/opensearch/client/node/NodeClient.java
@@ -73,11 +73,13 @@ public NodeClient(Settings settings, ThreadPool threadPool) {
     }
 
     public void initialize(
+        Map<ActionType, TransportAction> actions,
         ActionModule.ActionRegistry actionsRegistry,
         Supplier<String> localNodeId,
         RemoteClusterService remoteClusterService,
         NamedWriteableRegistry namedWriteableRegistry
     ) {
+        this.actions = actions;
         this.actionsRegistry = actionsRegistry;
         this.localNodeId = localNodeId;
         this.remoteClusterService = remoteClusterService;

diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -36,6 +36,9 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.SetOnce;
+import org.opensearch.action.ActionType;
+import org.opensearch.action.support.TransportAction;
+import org.opensearch.common.inject.Key;
 import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.cluster.routing.allocation.AwarenessReplicaBalance;
 import org.opensearch.extensions.action.ExtensionsAction;
@@ -1018,8 +1021,8 @@ protected Node(
             resourcesToClose.addAll(pluginLifecycleComponents);
             resourcesToClose.add(injector.getInstance(PeerRecoverySourceService.class));
             this.pluginLifecycleComponents = Collections.unmodifiableList(pluginLifecycleComponents);
-            client.initialize(
-                injector.getInstance(ActionRegistry.class),
+            client.initialize(injector.getInstance(new Key<Map<ActionType, TransportAction>>() {
+                }), injector.getInstance(ActionRegistry.class),
                 () -> clusterService.localNode().getId(),
                 transportService.getRemoteClusterService(),
                 namedWriteableRegistry

diff --git a/server/src/test/java/org/opensearch/client/node/NodeClientHeadersTests.java b/server/src/test/java/org/opensearch/client/node/NodeClientHeadersTests.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.node;
 
+import org.opensearch.action.ActionModule;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRequest;
@@ -57,7 +58,7 @@ protected Client buildClient(Settings headersSettings, ActionType[] testedAction
         Settings settings = HEADER_SETTINGS;
         Actions actions = new Actions(settings, threadPool, testedActions);
         NodeClient client = new NodeClient(settings, threadPool);
-        client.initialize(actions, () -> "test", null, new NamedWriteableRegistry(Collections.emptyList()));
+        client.initialize(actions, null, () -> "test", null, new NamedWriteableRegistry(Collections.emptyList()));
         return client;
     }
 

diff --git a/.../src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java b/.../src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java
@@ -96,7 +96,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener listen
         final Map<ActionType, TransportAction> actions = new HashMap<>();
         actions.put(ValidateQueryAction.INSTANCE, transportAction);
 
-        client.initialize(actions, () -> "local", null, new NamedWriteableRegistry(Collections.emptyList()));
+        client.initialize(actions, null, () -> "local", null, new NamedWriteableRegistry(Collections.emptyList()));
         controller.registerHandler(action);
     }
 

diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
@@ -38,6 +38,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
+import org.opensearch.action.ActionModule;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.RequestValidators;
 import org.opensearch.action.StepListener;
@@ -2148,6 +2149,7 @@ public void onFailure(final Exception e) {
                 );
                 client.initialize(
                     actions,
+                    null,
                     () -> clusterService.localNode().getId(),
                     transportService.getRemoteClusterService(),
                     new NamedWriteableRegistry(Collections.emptyList())

diff --git a/test/framework/src/main/java/org/opensearch/test/client/NoOpNodeClient.java b/test/framework/src/main/java/org/opensearch/test/client/NoOpNodeClient.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
+import org.opensearch.action.ActionModule;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.action.ActionType;
@@ -87,6 +88,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
     @Override
     public void initialize(
         Map<ActionType, TransportAction> actions,
+        ActionModule.ActionRegistry actionRegistry,
         Supplier<String> localNodeId,
         RemoteClusterService remoteClusterService,
         NamedWriteableRegistry namedWriteableRegistry