Working test case!

Signed-off-by: Daniel Widdis <widdis@gmail.com>
opensearch-project · Mar 20, 2023 · 4201515 · 4201515
1 parent 2533e77
commit 4201515
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/org/opensearch/sdk/BaseExtension.java b/src/main/java/org/opensearch/sdk/BaseExtension.java
@@ -59,10 +59,10 @@ public void setExtensionsRunner(ExtensionsRunner runner) {
     }
 
     /**
-    * Gets the {@link ExtensionsRunner} of this extension.
-    *
-    * @return the extension runner.
-    */
+     * Gets the {@link ExtensionsRunner} of this extension.
+     *
+     * @return the extension runner.
+     */
     public ExtensionsRunner extensionsRunner() {
         return this.extensionsRunner;
     }

diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java
@@ -34,7 +34,7 @@
 import org.opensearch.sdk.handlers.ClusterSettingsResponseHandler;
 import org.opensearch.sdk.handlers.ClusterStateResponseHandler;
 import org.opensearch.sdk.handlers.EnvironmentSettingsResponseHandler;
-import org.opensearch.sdk.handlers.ExtensionsActionRequestHandler;
+import org.opensearch.sdk.handlers.ExtensionActionRequestHandler;
 import org.opensearch.sdk.action.SDKActionModule;
 import org.opensearch.sdk.handlers.AcknowledgedResponseHandler;
 import org.opensearch.sdk.handlers.ExtensionDependencyResponseHandler;
@@ -142,7 +142,7 @@ public class ExtensionsRunner {
     private ExtensionsIndicesModuleNameRequestHandler extensionsIndicesModuleNameRequestHandler =
         new ExtensionsIndicesModuleNameRequestHandler();
     private ExtensionsRestRequestHandler extensionsRestRequestHandler = new ExtensionsRestRequestHandler(extensionRestPathRegistry);
-    private ExtensionsActionRequestHandler extensionsActionRequestHandler;
+    private ExtensionActionRequestHandler extensionsActionRequestHandler;
 
     /**
      * Instantiates a new update settings request handler
@@ -214,7 +214,7 @@ protected ExtensionsRunner(Extension extension) throws IOException {
         // initialize SDKClient action map
         initializeSdkClient();
 
-        extensionsActionRequestHandler = new ExtensionsActionRequestHandler(getSdkClient(), getSdkActionModule());
+        extensionsActionRequestHandler = new ExtensionActionRequestHandler(getSdkClient(), getSdkActionModule());
 
         if (extension instanceof ActionExtension) {
             // store REST handlers in the registry

diff --git a/...dlers/ExtensionsActionRequestHandler.java → ...ndlers/ExtensionActionRequestHandler.java b/...dlers/ExtensionsActionRequestHandler.java → ...ndlers/ExtensionActionRequestHandler.java
@@ -36,8 +36,8 @@
 /**
  * This class handles a request from OpenSearch from another extension's {@link SDKTransportService#sendProxyActionRequest()} call.
  */
-public class ExtensionsActionRequestHandler {
-    private static final Logger logger = LogManager.getLogger(ExtensionsActionRequestHandler.class);
+public class ExtensionActionRequestHandler {
+    private static final Logger logger = LogManager.getLogger(ExtensionActionRequestHandler.class);
 
     final SDKActionModule sdkActionModule;
     final SDKClient client;
@@ -48,7 +48,7 @@ public class ExtensionsActionRequestHandler {
      * @param sdkClient An initialized SDKClient with the registered actions
      * @param sdkActionModule An initialized SDKActionModule with the registered actions
      */
-    public ExtensionsActionRequestHandler(SDKClient sdkClient, SDKActionModule sdkActionModule) {
+    public ExtensionActionRequestHandler(SDKClient sdkClient, SDKActionModule sdkActionModule) {
         this.sdkActionModule = sdkActionModule;
         this.client = sdkClient;
     }
@@ -86,11 +86,11 @@ public ExtensionActionResponse handleExtensionActionRequest(ExtensionActionReque
             Class<?> clazz = Class.forName(requestClassName);
             Constructor<?> constructor = clazz.getConstructor(StreamInput.class);
             StreamInput requestByteStream = StreamInput.wrap(
-                Arrays.copyOfRange(request.getRequestBytes(), nullPos + 1, request.getRequestBytes().length - nullPos)
+                Arrays.copyOfRange(request.getRequestBytes(), nullPos + 1, request.getRequestBytes().length)
             );
             actionRequest = (ActionRequest) constructor.newInstance(requestByteStream);
         } catch (Exception e) {
-            response.setResponseBytesAsString("No request class [" + requestClassName + "] is available.");
+            response.setResponseBytesAsString("No request class [" + requestClassName + "] is available: " + e.getMessage());
             return response;
         }