Add mock DynamicRouteRegistry.class

Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · May 17, 2023 · 5a9c363 · 5a9c363
1 parent cb1244f
commit 5a9c363
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/action/ActionModule.java b/server/src/main/java/org/opensearch/action/ActionModule.java
@@ -1135,8 +1135,6 @@ public void registerDynamicRoute(RestHandler.Route route, RestSendToExtensionAct
             requireNonNull(action, "action is required");
             Optional<String> routeName = Optional.empty();
             if (route instanceof NamedRoute) {
-                for (ActionType actionType : dynamicActionRegistry.registry.keySet()) {
-                }
                 routeName = Optional.of(((NamedRoute) route).name());
                 if (dynamicActionRegistry.isActionRegistered(routeName.get()) || registeredRestActionNames.contains(routeName.get())) {
                     throw new IllegalArgumentException("route [" + route + "] already registered");

diff --git a/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java b/server/src/test/java/org/opensearch/extensions/ExtensionsManagerTests.java
@@ -41,6 +41,7 @@
 import org.junit.Before;
 import org.opensearch.Version;
 import org.opensearch.action.ActionModule;
+import org.opensearch.action.ActionModule.DynamicRouteRegistry;
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.ClusterSettingsResponse;
@@ -168,6 +169,7 @@ public void setup() throws Exception {
             new UsageService(),
             new IdentityService(Settings.EMPTY, List.of())
         );
+        when(actionModule.getDynamicRouteRegistry()).thenReturn(mock(DynamicRouteRegistry.class));
         when(actionModule.getRestController()).thenReturn(restController);
         settingsModule = new SettingsModule(Settings.EMPTY, emptyList(), emptyList(), emptySet());
         clusterService = createClusterService(threadPool);