Revert "Implement patch API for datasources (opensearch-project#2273) (…

…opensearch-project#2329)"

This reverts commit 4c151fe.

core/src/main/java/org/opensearch/sql/datasource/DataSourceService.java

@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.datasource;
 
-import java.util.Map;
 import java.util.Set;
 import org.opensearch.sql.datasource.model.DataSource;
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
@@ -57,19 +56,12 @@ public interface DataSourceService {
   void createDataSource(DataSourceMetadata metadata);
 
   /**
-   * Updates {@link DataSource} corresponding to dataSourceMetadata (all fields needed).
+   * Updates {@link DataSource} corresponding to dataSourceMetadata.
    *
    * @param dataSourceMetadata {@link DataSourceMetadata}.
    */
   void updateDataSource(DataSourceMetadata dataSourceMetadata);
 
-  /**
-   * Patches {@link DataSource} corresponding to the given name (only fields to be changed needed).
-   *
-   * @param dataSourceData
-   */
-  void patchDataSource(Map<String, Object> dataSourceData);
-
   /**
    * Deletes {@link DataSource} corresponding to the DataSource name.
    *

core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java

@@ -231,9 +231,6 @@ public DataSource getDataSource(String dataSourceName) {
     @Override
     public void updateDataSource(DataSourceMetadata dataSourceMetadata) {}
 
-    @Override
-    public void patchDataSource(Map<String, Object> dataSourceData) {}
-
     @Override
     public void deleteDataSource(String dataSourceName) {}
 

datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java

@@ -10,13 +10,15 @@
 import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
 import static org.opensearch.core.rest.RestStatus.NOT_FOUND;
 import static org.opensearch.core.rest.RestStatus.SERVICE_UNAVAILABLE;
-import static org.opensearch.rest.RestRequest.Method.*;
+import static org.opensearch.rest.RestRequest.Method.DELETE;
+import static org.opensearch.rest.RestRequest.Method.GET;
+import static org.opensearch.rest.RestRequest.Method.POST;
+import static org.opensearch.rest.RestRequest.Method.PUT;
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.OpenSearchException;
@@ -30,8 +32,18 @@
 import org.opensearch.sql.datasource.model.DataSourceMetadata;
 import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException;
 import org.opensearch.sql.datasources.exceptions.ErrorMessage;
-import org.opensearch.sql.datasources.model.transport.*;
-import org.opensearch.sql.datasources.transport.*;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.CreateDataSourceActionResponse;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.DeleteDataSourceActionResponse;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.GetDataSourceActionResponse;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionRequest;
+import org.opensearch.sql.datasources.model.transport.UpdateDataSourceActionResponse;
+import org.opensearch.sql.datasources.transport.TransportCreateDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportDeleteDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportGetDataSourceAction;
+import org.opensearch.sql.datasources.transport.TransportUpdateDataSourceAction;
 import org.opensearch.sql.datasources.utils.Scheduler;
 import org.opensearch.sql.datasources.utils.XContentParserUtils;
 
@@ -86,17 +98,6 @@ public List<Route> routes() {
          */
         new Route(PUT, BASE_DATASOURCE_ACTION_URL),
 
-        /*
-         * PATCH datasources
-         * Request body:
-         * Ref
-         * [org.opensearch.sql.plugin.transport.datasource.model.PatchDataSourceActionRequest]
-         * Response body:
-         * Ref
-         * [org.opensearch.sql.plugin.transport.datasource.model.PatchDataSourceActionResponse]
-         */
-        new Route(PATCH, BASE_DATASOURCE_ACTION_URL),
-
         /*
          * DELETE datasources
          * Request body: Ref
@@ -121,8 +122,6 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
         return executeUpdateRequest(restRequest, nodeClient);
       case DELETE:
         return executeDeleteRequest(restRequest, nodeClient);
-      case PATCH:
-        return executePatchRequest(restRequest, nodeClient);
       default:
         return restChannel ->
             restChannel.sendResponse(
@@ -217,34 +216,6 @@ public void onFailure(Exception e) {
                     }));
   }
 
-  private RestChannelConsumer executePatchRequest(RestRequest restRequest, NodeClient nodeClient)
-      throws IOException {
-    Map<String, Object> dataSourceData = XContentParserUtils.toMap(restRequest.contentParser());
-    return restChannel ->
-        Scheduler.schedule(
-            nodeClient,
-            () ->
-                nodeClient.execute(
-                    TransportPatchDataSourceAction.ACTION_TYPE,
-                    new PatchDataSourceActionRequest(dataSourceData),
-                    new ActionListener<>() {
-                      @Override
-                      public void onResponse(
-                          PatchDataSourceActionResponse patchDataSourceActionResponse) {
-                        restChannel.sendResponse(
-                            new BytesRestResponse(
-                                RestStatus.OK,
-                                "application/json; charset=UTF-8",
-                                patchDataSourceActionResponse.getResult()));
-                      }
-
-                      @Override
-                      public void onFailure(Exception e) {
-                        handleException(e, restChannel);
-                      }
-                    }));
-  }
-
   private RestChannelConsumer executeDeleteRequest(RestRequest restRequest, NodeClient nodeClient) {
 
     String dataSourceName = restRequest.param("dataSourceName");

datasources/src/main/java/org/opensearch/sql/datasources/service/DataSourceServiceImpl.java

@@ -6,11 +6,15 @@
 package org.opensearch.sql.datasources.service;
 
 import static org.opensearch.sql.analysis.DataSourceSchemaIdentifierNameResolver.DEFAULT_DATASOURCE_NAME;
-import static org.opensearch.sql.datasources.utils.XContentParserUtils.*;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import org.opensearch.sql.common.utils.StringUtils;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.datasource.model.DataSource;
@@ -96,19 +100,6 @@ public void updateDataSource(DataSourceMetadata dataSourceMetadata) {
     }
   }
 
-  @Override
-  public void patchDataSource(Map<String, Object> dataSourceData) {
-    if (!dataSourceData.get(NAME_FIELD).equals(DEFAULT_DATASOURCE_NAME)) {
-      DataSourceMetadata dataSourceMetadata =
-          getRawDataSourceMetadata((String) dataSourceData.get(NAME_FIELD));
-      replaceOldDatasourceMetadata(dataSourceData, dataSourceMetadata);
-      updateDataSource(dataSourceMetadata);
-    } else {
-      throw new UnsupportedOperationException(
-          "Not allowed to update default datasource :" + DEFAULT_DATASOURCE_NAME);
-    }
-  }
-
   @Override
   public void deleteDataSource(String dataSourceName) {
     if (dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {
@@ -145,35 +136,6 @@ private void validateDataSourceMetaData(DataSourceMetadata metadata) {
             + " Properties are required parameters.");
   }
 
-  /**
-   * Replaces the fields in the map of the given metadata.
-   *
-   * @param dataSourceData
-   * @param metadata {@link DataSourceMetadata}.
-   */
-  private void replaceOldDatasourceMetadata(
-      Map<String, Object> dataSourceData, DataSourceMetadata metadata) {
-
-    for (String key : dataSourceData.keySet()) {
-      switch (key) {
-          // Name and connector should not be modified
-        case DESCRIPTION_FIELD:
-          metadata.setDescription((String) dataSourceData.get(DESCRIPTION_FIELD));
-          break;
-        case ALLOWED_ROLES_FIELD:
-          metadata.setAllowedRoles((List<String>) dataSourceData.get(ALLOWED_ROLES_FIELD));
-          break;
-        case PROPERTIES_FIELD:
-          Map<String, String> properties = new HashMap<>(metadata.getProperties());
-          properties.putAll(((Map<String, String>) dataSourceData.get(PROPERTIES_FIELD)));
-          break;
-        case NAME_FIELD:
-        case CONNECTOR_FIELD:
-          break;
-      }
-    }
-  }
-
   @Override
   public DataSourceMetadata getRawDataSourceMetadata(String dataSourceName) {
     if (dataSourceName.equals(DEFAULT_DATASOURCE_NAME)) {