Revert change back to json string

Signed-off-by: Derek Ho <[email protected]>
opensearch-project · Sep 27, 2023 · 03aba02 · 03aba02
1 parent 9c5ffb8
commit 03aba02
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 31 deletions.
diff --git a/...rc/main/java/org/opensearch/sql/datasources/transport/CreateUpdateDatasourceResponse.java b/...rc/main/java/org/opensearch/sql/datasources/transport/CreateUpdateDatasourceResponse.java
diff --git a/...c/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java b/...c/main/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceAction.java
@@ -60,14 +60,12 @@ protected void doExecute(
       DataSourceMetadata dataSourceMetadata = request.getDataSourceMetadata();
       dataSourceService.createDataSource(dataSourceMetadata);
       String responseContent =
-          new JsonResponseFormatter<CreateUpdateDatasourceResponse>(PRETTY) {
+          new JsonResponseFormatter<String>(PRETTY) {
             @Override
-            protected Object buildJsonObject(CreateUpdateDatasourceResponse response) {
+            protected Object buildJsonObject(String response) {
               return response;
             }
-          }.format(
-              new CreateUpdateDatasourceResponse(
-                  "Created DataSource with name " + dataSourceMetadata.getName()));
+          }.format("Created DataSource with name " + dataSourceMetadata.getName());
       actionListener.onResponse(new CreateDataSourceActionResponse(responseContent));
     } catch (Exception e) {
       actionListener.onFailure(e);

diff --git a/...c/main/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceAction.java b/...c/main/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceAction.java
@@ -59,14 +59,12 @@ protected void doExecute(
     try {
       dataSourceService.updateDataSource(request.getDataSourceMetadata());
       String responseContent =
-          new JsonResponseFormatter<CreateUpdateDatasourceResponse>(PRETTY) {
+          new JsonResponseFormatter<String>(PRETTY) {
             @Override
-            protected Object buildJsonObject(CreateUpdateDatasourceResponse response) {
+            protected Object buildJsonObject(String response) {
               return response;
             }
-          }.format(
-              new CreateUpdateDatasourceResponse(
-                  "Updated DataSource with name " + request.getDataSourceMetadata().getName()));
+          }.format("Updated DataSource with name " + request.getDataSourceMetadata().getName());
       actionListener.onResponse(new UpdateDataSourceActionResponse(responseContent));
     } catch (Exception e) {
       actionListener.onFailure(e);

diff --git a/...st/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java b/...st/java/org/opensearch/sql/datasources/transport/TransportCreateDataSourceActionTest.java
@@ -60,16 +60,15 @@ public void testDoExecute() {
         .onResponse(createDataSourceActionResponseArgumentCaptor.capture());
     CreateDataSourceActionResponse createDataSourceActionResponse =
         createDataSourceActionResponseArgumentCaptor.getValue();
-    JsonResponseFormatter<CreateUpdateDatasourceResponse> jsonResponseFormatter =
+    JsonResponseFormatter<String> jsonResponseFormatter =
         new JsonResponseFormatter<>(JsonResponseFormatter.Style.PRETTY) {
           @Override
-          protected Object buildJsonObject(CreateUpdateDatasourceResponse response) {
+          protected Object buildJsonObject(String response) {
             return response;
           }
         };
     Assertions.assertEquals(
-        jsonResponseFormatter.format(
-            new CreateUpdateDatasourceResponse("Created DataSource with name test_datasource")),
+        jsonResponseFormatter.format("Created DataSource with name test_datasource"),
         createDataSourceActionResponse.getResult());
   }
 

diff --git a/...st/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceActionTest.java b/...st/java/org/opensearch/sql/datasources/transport/TransportUpdateDataSourceActionTest.java
@@ -60,17 +60,16 @@ public void testDoExecute() {
         .onResponse(updateDataSourceActionResponseArgumentCaptor.capture());
     UpdateDataSourceActionResponse updateDataSourceActionResponse =
         updateDataSourceActionResponseArgumentCaptor.getValue();
-
-    JsonResponseFormatter<CreateUpdateDatasourceResponse> jsonResponseFormatter =
+    JsonResponseFormatter<String> jsonResponseFormatter =
         new JsonResponseFormatter<>(JsonResponseFormatter.Style.PRETTY) {
           @Override
-          protected Object buildJsonObject(CreateUpdateDatasourceResponse response) {
+          protected Object buildJsonObject(String response) {
             return response;
           }
         };
+
     Assertions.assertEquals(
-        jsonResponseFormatter.format(
-            new CreateUpdateDatasourceResponse("Updated DataSource with name test_datasource")),
+        jsonResponseFormatter.format("Updated DataSource with name test_datasource"),
         updateDataSourceActionResponse.getResult());
   }