Add more getters

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Feb 21, 2023 · afefeae · afefeae
1 parent b1f03c0
commit afefeae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java
@@ -120,6 +120,9 @@ public class ExtensionsRunner {
     private final TaskManager taskManager;
 
     private final SDKNamedXContentRegistry sdkNamedXContentRegistry;
+    private final SDKClient sdkClient = new SDKClient();
+    private final SDKClusterService sdkClusterService = new SDKClusterService(this);
+
     private ExtensionsInitRequestHandler extensionsInitRequestHandler = new ExtensionsInitRequestHandler(this);
     private ExtensionsIndicesModuleRequestHandler extensionsIndicesModuleRequestHandler = new ExtensionsIndicesModuleRequestHandler();
     private ExtensionsIndicesModuleNameRequestHandler extensionsIndicesModuleNameRequestHandler =
@@ -174,10 +177,10 @@ protected ExtensionsRunner(Extension extension) throws IOException {
 
             b.bind(SDKNamedXContentRegistry.class).toInstance(getNamedXContentRegistry());
             b.bind(ThreadPool.class).toInstance(getThreadPool());
-            b.bind(TaskManager.class).toInstance(taskManager);
+            b.bind(TaskManager.class).toInstance(getTaskManager());
 
-            b.bind(SDKClient.class);
-            b.bind(SDKClusterService.class).toInstance(new SDKClusterService(this));
+            b.bind(SDKClient.class).toInstance(getSdkClient());
+            b.bind(SDKClusterService.class).toInstance(getSdkClusterService());
         });
         // Bind the return values from create components
         modules.add(this::injectComponents);
@@ -568,6 +571,18 @@ public ThreadPool getThreadPool() {
         return threadPool;
     }
 
+    public TaskManager getTaskManager() {
+        return taskManager;
+    }
+
+    public SDKClient getSdkClient() {
+        return sdkClient;
+    }
+
+    public SDKClusterService getSdkClusterService() {
+        return sdkClusterService;
+    }
+
     public TransportService getExtensionTransportService() {
         return extensionTransportService;
     }

diff --git a/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java b/src/test/java/org/opensearch/sdk/TestExtensionsRunner.java
@@ -55,6 +55,7 @@
 import org.opensearch.sdk.handlers.EnvironmentSettingsResponseHandler;
 import org.opensearch.sdk.handlers.ExtensionsInitRequestHandler;
 import org.opensearch.sdk.handlers.ExtensionsRestRequestHandler;
+import org.opensearch.tasks.TaskManager;
 import org.opensearch.sdk.handlers.AcknowledgedResponseHandler;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ThreadPool;
@@ -225,6 +226,9 @@ public void testGettersAndSetters() throws IOException {
         assertTrue(extensionsRunner.getExtension() instanceof BaseExtension);
         assertEquals(extensionsRunner, ((BaseExtension) extensionsRunner.getExtension()).extensionsRunner());
         assertTrue(extensionsRunner.getThreadPool() instanceof ThreadPool);
+        assertTrue(extensionsRunner.getTaskManager() instanceof TaskManager);
+        assertTrue(extensionsRunner.getSdkClient() instanceof SDKClient);
+        assertTrue(extensionsRunner.getSdkClusterService() instanceof SDKClusterService);
 
         settings = extensionsRunner.getSettings();
         assertEquals(ExtensionsRunnerForTest.NODE_NAME, settings.get(ExtensionsRunner.NODE_NAME_SETTING));