adds inputs validation for create memory

Signed-off-by: Xun Zhang <[email protected]>
opensearch-project · Feb 6, 2024 · 24e30fb · 24e30fb
1 parent bf02c3a
commit 24e30fb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/...src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationRequest.java b/...src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationRequest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.util.Map;
 
+import org.opensearch.OpenSearchParseException;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -100,15 +101,18 @@ public static CreateConversationRequest fromRestRequest(RestRequest restRequest)
         if (!restRequest.hasContent()) {
             return new CreateConversationRequest();
         }
-        Map<String, String> body = restRequest.contentParser().mapStrings();
-        if (body.containsKey(ActionConstants.REQUEST_CONVERSATION_NAME_FIELD)) {
-            return new CreateConversationRequest(
-                body.get(ActionConstants.REQUEST_CONVERSATION_NAME_FIELD),
-                body.get(APPLICATION_TYPE_FIELD)
-            );
-        } else {
-            return new CreateConversationRequest();
+        try {
+            Map<String, String> body = restRequest.contentParser().mapStrings();
+            if (body.containsKey(ActionConstants.REQUEST_CONVERSATION_NAME_FIELD)) {
+                return new CreateConversationRequest(
+                    body.get(ActionConstants.REQUEST_CONVERSATION_NAME_FIELD),
+                    body.get(APPLICATION_TYPE_FIELD)
+                );
+            } else {
+                return new CreateConversationRequest();
+            }
+        } catch (Exception exception) {
+            throw new OpenSearchParseException(exception.getMessage());
         }
     }
-
 }
diff --git a/...est/java/org/opensearch/ml/memory/action/conversation/CreateConversationRequestTests.java b/...est/java/org/opensearch/ml/memory/action/conversation/CreateConversationRequestTests.java
@@ -23,6 +23,9 @@
 import java.util.Map;
 
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
+import org.opensearch.OpenSearchParseException;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.bytes.BytesReference;
@@ -41,6 +44,8 @@
 
 public class CreateConversationRequestTests extends OpenSearchTestCase {
 
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none();
     Gson gson;
 
     @Before
@@ -100,4 +105,13 @@ public void testNamedRestRequest_WithAppType() throws IOException {
         assert (request.getName().equals(name));
         assert (request.getApplicationType().equals(appType));
     }
+
+    public void testRestRequest_NullName() throws IOException {
+        exceptionRule.expect(OpenSearchParseException.class);
+        exceptionRule.expectMessage("Can't get text on a VALUE_NULL");
+        RestRequest req = new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY)
+            .withContent(new BytesArray("{\"name\":null}"), MediaTypeRegistry.JSON)
+            .build();
+        CreateConversationRequest.fromRestRequest(req);
+    }
 }