Fix build

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

Author: b4sjoo

common/src/main/java/org/opensearch/ml/common/transport/model/MLUpdateModelInput.java

@@ -134,12 +134,6 @@ public MLUpdateModelInput(StreamInput in) throws IOException {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject();
-        builder.endObject();
-        return builder;
-    }
-
-    public XContentBuilder toXContentForUpdateRequestDoc(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
         builder.field(MODEL_ID_FIELD, modelId);
         if (name != null) {

common/src/test/java/org/opensearch/ml/common/transport/model/MLUpdateModelInputTest.java

@@ -84,7 +84,7 @@ public class MLUpdateModelInputTest {
             "{\"model_type\":\"testModelType\",\"embedding_dimension\":100,\"framework_type\":\"SENTENCE_TRANSFORMERS\",\"all_config\":\""
             +
             "{\\\"field1\\\":\\\"value1\\\",\\\"field2\\\":\\\"value2\\\"}\"},\"connector_id\":" +
-            "\"test-connector_id\",\"interface\":{}}";
+            "\"test-connector_id\"}";
 
     @Rule
     public ExpectedException exceptionRule = ExpectedException.none();
@@ -166,30 +166,16 @@ public void readInputStreamSuccessWithNullFields() throws IOException {
     @Test
     public void testToXContent() throws Exception {
         String jsonStr = serializationWithToXContent(updateModelInput);
-        assertEquals("{}", jsonStr);
-    }
-
-    @Test
-    public void testToXContentForUpdateRequestDoc() throws Exception {
-        String jsonStr = serializationWithToXContentForUpdateRequestDoc(updateModelInput);
         assertEquals(expectedOutputStrForUpdateRequestDoc, jsonStr);
     }
 
-    @Test
-    public void testToXContenttForUpdateRequestDocIncomplete() throws Exception {
-        String expectedIncompleteInputStr = "{\"model_id\":\"test-model_id\"}";
-        updateModelInput = MLUpdateModelInput.builder()
-                .modelId("test-model_id").build();
-        String jsonStr = serializationWithToXContentForUpdateRequestDoc(updateModelInput);
-        assertEquals(expectedIncompleteInputStr, jsonStr);
-    }
-
     @Test
     public void testToXContentIncomplete() throws Exception {
+        String expectedIncompleteInputStr = "{\"model_id\":\"test-model_id\"}";
         updateModelInput = MLUpdateModelInput.builder()
                 .modelId("test-model_id").build();
         String jsonStr = serializationWithToXContent(updateModelInput);
-        assertEquals("{}", jsonStr);
+        assertEquals(expectedIncompleteInputStr, jsonStr);
     }
 
     @Test
@@ -238,7 +224,7 @@ public void parseWithIllegalFieldWithoutModel() throws Exception {
                 "\"test-connector_id\",\"connector\":{\"description\":\"updated description\",\"version\":\"1\"},\"last_updated_time\":1,\"illegal_field\":\"This field need to be skipped.\"}";
         testParseFromJsonString(expectedInputStrWithIllegalField, parsedInput -> {
             try {
-                assertEquals(expectedOutputStr, serializationWithToXContentForUpdateRequestDoc(parsedInput));
+                assertEquals(expectedOutputStr, serializationWithToXContent(parsedInput));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -268,10 +254,4 @@ private String serializationWithToXContent(MLUpdateModelInput input) throws IOEx
         return builder.toString();
     }
 
-    private String serializationWithToXContentForUpdateRequestDoc(MLUpdateModelInput input) throws IOException {
-        XContentBuilder builder = XContentFactory.jsonBuilder();
-        input.toXContentForUpdateRequestDoc(builder, ToXContent.EMPTY_PARAMS);
-        assertNotNull(builder);
-        return builder.toString();
-    }
 }

plugin/src/main/java/org/opensearch/ml/action/models/UpdateModelTransportAction.java

@@ -379,7 +379,7 @@ private void buildUpdateRequest(
     ) {
         try {
             updateModelInput.setLastUpdateTime(Instant.now());
-            updateRequest.doc(updateModelInput.toXContentForUpdateRequestDoc(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS));
+            updateRequest.doc(updateModelInput.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS));
             updateRequest.docAsUpsert(true);
             updateRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
             if (isUpdateModelCache) {
@@ -420,7 +420,7 @@ private void buildUpdateRequest(
             Integer.parseInt(updatedVersion)
         );
         try {
-            updateRequest.doc(updateModelInput.toXContentForUpdateRequestDoc(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS));
+            updateRequest.doc(updateModelInput.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS));
             updateRequest.docAsUpsert(true);
             updateRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
             if (isUpdateModelCache) {

plugin/src/main/java/org/opensearch/ml/action/prediction/TransportPredictionTaskAction.java

@@ -8,8 +8,6 @@
 import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_MODEL_AUTO_DEPLOY_ENABLE;
 import static org.opensearch.ml.utils.MLExceptionUtils.LOCAL_MODEL_DISABLED_ERR_MSG;
 
-import java.io.IOException;
-
 import org.opensearch.OpenSearchStatusException;
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.support.ActionFilters;
@@ -43,9 +41,6 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.log4j.Log4j2;
@@ -242,19 +237,15 @@ private void validateInputSchema(String modelId, MLInput mlInput) {
         if (modelCacheHelper.getModelInterface(modelId) != null && modelCacheHelper.getModelInterface(modelId).get("input") != null) {
             String inputSchemaString = modelCacheHelper.getModelInterface(modelId).get("input");
             try {
-                String parametersString = parametersObjectExtractor(mlInput);
-                MLNodeUtils.validateSchema(inputSchemaString, parametersString);
+                MLNodeUtils
+                    .validateSchema(
+                        inputSchemaString,
+                        mlInput.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS).toString()
+                    );
             } catch (Exception e) {
                 throw new IllegalArgumentException("Error validating input schema: " + e.getMessage());
             }
         }
     }
 
-    private static String parametersObjectExtractor(MLInput mlInput) throws IOException {
-        String mlInputString = mlInput.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS).toString();
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode mlInputObject = mapper.readTree(mlInputString);
-        return mlInputObject.get("parameters").asText();
-    }
-
 }

plugin/src/test/java/org/opensearch/ml/action/models/UpdateModelTransportActionTests.java

@@ -651,9 +651,7 @@ public void testUpdateRequestDocIOException() throws IOException {
         doReturn(FunctionName.TEXT_EMBEDDING).when(mockModel).getAlgorithm();
         doReturn(MLModelState.REGISTERED).when(mockModel).getModelState();
 
-        doThrow(new IOException("Exception occurred during building update request."))
-            .when(mockUpdateModelInput)
-            .toXContentForUpdateRequestDoc(any(), any());
+        doThrow(new IOException("Exception occurred during building update request.")).when(mockUpdateModelInput).toXContent(any(), any());
         transportUpdateModelAction.doExecute(task, mockUpdateModelRequest, actionListener);
         ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(IOException.class);
         verify(actionListener).onFailure(argumentCaptor.capture());
@@ -702,9 +700,7 @@ public void testUpdateRequestDocInRegisterToNewModelGroupIOException() throws IO
             return null;
         }).when(mlModelGroupManager).getModelGroupResponse(eq("mockUpdateModelGroupId"), isA(ActionListener.class));
 
-        doThrow(new IOException("Exception occurred during building update request."))
-            .when(mockUpdateModelInput)
-            .toXContentForUpdateRequestDoc(any(), any());
+        doThrow(new IOException("Exception occurred during building update request.")).when(mockUpdateModelInput).toXContent(any(), any());
         transportUpdateModelAction.doExecute(task, mockUpdateModelRequest, actionListener);
         ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(IOException.class);
         verify(actionListener).onFailure(argumentCaptor.capture());