Get rid of EstimateMemoryUsageRequest and EstimateMemoryUsageAction.Request. (#45718) (#45725)

Author: przemekwitek

client/rest-high-level/src/main/java/org/elasticsearch/client/MLRequestConverters.java

@@ -39,7 +39,6 @@
 import org.elasticsearch.client.ml.DeleteForecastRequest;
 import org.elasticsearch.client.ml.DeleteJobRequest;
 import org.elasticsearch.client.ml.DeleteModelSnapshotRequest;
-import org.elasticsearch.client.ml.EstimateMemoryUsageRequest;
 import org.elasticsearch.client.ml.EvaluateDataFrameRequest;
 import org.elasticsearch.client.ml.FindFileStructureRequest;
 import org.elasticsearch.client.ml.FlushJobRequest;
@@ -701,7 +700,7 @@ static Request evaluateDataFrame(EvaluateDataFrameRequest evaluateRequest) throw
         return request;
     }
 
-    static Request estimateMemoryUsage(EstimateMemoryUsageRequest estimateRequest) throws IOException {
+    static Request estimateMemoryUsage(PutDataFrameAnalyticsRequest estimateRequest) throws IOException {
         String endpoint = new EndpointBuilder()
             .addPathPartAsIs("_ml", "data_frame", "analytics", "_estimate_memory_usage")
             .build();

client/rest-high-level/src/main/java/org/elasticsearch/client/MachineLearningClient.java

@@ -34,7 +34,6 @@
 import org.elasticsearch.client.ml.DeleteJobRequest;
 import org.elasticsearch.client.ml.DeleteJobResponse;
 import org.elasticsearch.client.ml.DeleteModelSnapshotRequest;
-import org.elasticsearch.client.ml.EstimateMemoryUsageRequest;
 import org.elasticsearch.client.ml.EstimateMemoryUsageResponse;
 import org.elasticsearch.client.ml.EvaluateDataFrameRequest;
 import org.elasticsearch.client.ml.EvaluateDataFrameResponse;
@@ -2195,14 +2194,15 @@ public void evaluateDataFrameAsync(EvaluateDataFrameRequest request, RequestOpti
      * see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html">
      *     Estimate Memory Usage for Data Frame Analytics documentation</a>
      *
-     * @param request The {@link EstimateMemoryUsageRequest}
+     * @param request The {@link PutDataFrameAnalyticsRequest}
      * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
      * @return {@link EstimateMemoryUsageResponse} response object
      * @throws IOException when there is a serialization issue sending the request or receiving the response
      */
-    public EstimateMemoryUsageResponse estimateMemoryUsage(EstimateMemoryUsageRequest request,
+    public EstimateMemoryUsageResponse estimateMemoryUsage(PutDataFrameAnalyticsRequest request,
                                                            RequestOptions options) throws IOException {
-        return restHighLevelClient.performRequestAndParseEntity(request,
+        return restHighLevelClient.performRequestAndParseEntity(
+            request,
             MLRequestConverters::estimateMemoryUsage,
             options,
             EstimateMemoryUsageResponse::fromXContent,
@@ -2216,13 +2216,14 @@ public EstimateMemoryUsageResponse estimateMemoryUsage(EstimateMemoryUsageReques
      * see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/estimate-memory-usage-dfanalytics.html">
      *     Estimate Memory Usage for Data Frame Analytics documentation</a>
      *
-     * @param request The {@link EstimateMemoryUsageRequest}
+     * @param request The {@link PutDataFrameAnalyticsRequest}
      * @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
      * @param listener Listener to be notified upon request completion
      */
-    public void estimateMemoryUsageAsync(EstimateMemoryUsageRequest request, RequestOptions options,
+    public void estimateMemoryUsageAsync(PutDataFrameAnalyticsRequest request, RequestOptions options,
                                          ActionListener<EstimateMemoryUsageResponse> listener) {
-        restHighLevelClient.performRequestAsyncAndParseEntity(request,
+        restHighLevelClient.performRequestAsyncAndParseEntity(
+            request,
             MLRequestConverters::estimateMemoryUsage,
             options,
             EstimateMemoryUsageResponse::fromXContent,

client/rest-high-level/src/main/java/org/elasticsearch/client/ml/EstimateMemoryUsageRequest.java

@@ -35,7 +35,6 @@
 import org.elasticsearch.client.ml.DeleteForecastRequest;
 import org.elasticsearch.client.ml.DeleteJobRequest;
 import org.elasticsearch.client.ml.DeleteModelSnapshotRequest;
-import org.elasticsearch.client.ml.EstimateMemoryUsageRequest;
 import org.elasticsearch.client.ml.EvaluateDataFrameRequest;
 import org.elasticsearch.client.ml.FindFileStructureRequest;
 import org.elasticsearch.client.ml.FindFileStructureRequestTests;
@@ -797,13 +796,13 @@ public void testEvaluateDataFrame() throws IOException {
     }
 
     public void testEstimateMemoryUsage() throws IOException {
-        EstimateMemoryUsageRequest estimateRequest = new EstimateMemoryUsageRequest(randomDataFrameAnalyticsConfig());
+        PutDataFrameAnalyticsRequest estimateRequest = new PutDataFrameAnalyticsRequest(randomDataFrameAnalyticsConfig());
         Request request = MLRequestConverters.estimateMemoryUsage(estimateRequest);
         assertEquals(HttpPost.METHOD_NAME, request.getMethod());
         assertEquals("/_ml/data_frame/analytics/_estimate_memory_usage", request.getEndpoint());
         try (XContentParser parser = createParser(JsonXContent.jsonXContent, request.getEntity().getContent())) {
-            EstimateMemoryUsageRequest parsedRequest = EstimateMemoryUsageRequest.fromXContent(parser);
-            assertThat(parsedRequest, equalTo(estimateRequest));
+            DataFrameAnalyticsConfig parsedConfig = DataFrameAnalyticsConfig.fromXContent(parser);
+            assertThat(parsedConfig, equalTo(estimateRequest.getConfig()));
         }
     }
 

client/rest-high-level/src/test/java/org/elasticsearch/client/MLRequestConvertersTests.java

@@ -44,7 +44,6 @@
 import org.elasticsearch.client.ml.DeleteJobRequest;
 import org.elasticsearch.client.ml.DeleteJobResponse;
 import org.elasticsearch.client.ml.DeleteModelSnapshotRequest;
-import org.elasticsearch.client.ml.EstimateMemoryUsageRequest;
 import org.elasticsearch.client.ml.EstimateMemoryUsageResponse;
 import org.elasticsearch.client.ml.EvaluateDataFrameRequest;
 import org.elasticsearch.client.ml.EvaluateDataFrameResponse;
@@ -1731,8 +1730,8 @@ public void testEstimateMemoryUsage() throws IOException {
         highLevelClient().bulk(bulk1, RequestOptions.DEFAULT);
 
         MachineLearningClient machineLearningClient = highLevelClient().machineLearning();
-        EstimateMemoryUsageRequest estimateMemoryUsageRequest =
-            new EstimateMemoryUsageRequest(
+        PutDataFrameAnalyticsRequest estimateMemoryUsageRequest =
+            new PutDataFrameAnalyticsRequest(
                 DataFrameAnalyticsConfig.builder()
                     .setSource(DataFrameAnalyticsSource.builder().setIndex(indexName).build())
                     .setAnalysis(OutlierDetection.createDefault())

client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java

@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.xpack.core.ml.action;
 
-import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.common.Nullable;
@@ -18,14 +16,10 @@
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig;
-import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
 
 import java.io.IOException;
 import java.util.Objects;
 
-import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
 import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
 public class EstimateMemoryUsageAction extends ActionType<EstimateMemoryUsageAction.Response> {
@@ -37,80 +31,6 @@ private EstimateMemoryUsageAction() {
         super(NAME, EstimateMemoryUsageAction.Response::new);
     }
 
-    public static class Request extends ActionRequest implements ToXContentObject {
-
-        private static final ParseField DATA_FRAME_ANALYTICS_CONFIG = new ParseField("data_frame_analytics_config");
-
-        private static final ConstructingObjectParser<EstimateMemoryUsageAction.Request, Void> PARSER =
-            new ConstructingObjectParser<>(
-                NAME,
-                args -> {
-                    DataFrameAnalyticsConfig.Builder configBuilder = (DataFrameAnalyticsConfig.Builder) args[0];
-                    DataFrameAnalyticsConfig config = configBuilder.buildForMemoryEstimation();
-                    return new EstimateMemoryUsageAction.Request(config);
-                });
-
-        static {
-            PARSER.declareObject(constructorArg(), DataFrameAnalyticsConfig.STRICT_PARSER, DATA_FRAME_ANALYTICS_CONFIG);
-        }
-
-        public static EstimateMemoryUsageAction.Request parseRequest(XContentParser parser) {
-            return PARSER.apply(parser, null);
-        }
-
-        private final DataFrameAnalyticsConfig config;
-
-        public Request(DataFrameAnalyticsConfig config) {
-            this.config = ExceptionsHelper.requireNonNull(config, DATA_FRAME_ANALYTICS_CONFIG);
-        }
-
-        public Request(StreamInput in) throws IOException {
-            super(in);
-            this.config = new DataFrameAnalyticsConfig(in);
-        }
-
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
-
-        public DataFrameAnalyticsConfig getConfig() {
-            return config;
-        }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            config.writeTo(out);
-        }
-
-        @Override
-        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject();
-            builder.field(DATA_FRAME_ANALYTICS_CONFIG.getPreferredName(), config);
-            builder.endObject();
-            return builder;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            if (this == other) {
-                return true;
-            }
-            if (other == null || getClass() != other.getClass()) {
-                return false;
-            }
-
-            Request that = (Request) other;
-            return Objects.equals(config, that.config);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(config);
-        }
-    }
-
     public static class Response extends ActionResponse implements ToXContentObject {
 
         public static final ParseField TYPE = new ParseField("memory_usage_estimation_result");

client/rest-high-level/src/test/java/org/elasticsearch/client/ml/EstimateMemoryUsageRequestTests.java

@@ -34,6 +34,9 @@ private PutDataFrameAnalyticsAction() {
 
     public static class Request extends AcknowledgedRequest<Request> implements ToXContentObject {
 
+        /**
+         * Parses request.
+         */
         public static Request parseRequest(String id, XContentParser parser) {
             DataFrameAnalyticsConfig.Builder config = DataFrameAnalyticsConfig.STRICT_PARSER.apply(parser, null);
             if (config.getId() == null) {
@@ -47,6 +50,17 @@ public static Request parseRequest(String id, XContentParser parser) {
             return new PutDataFrameAnalyticsAction.Request(config.build());
         }
 
+        /**
+         * Parses request for memory estimation.
+         * {@link Request} is reused across {@link PutDataFrameAnalyticsAction} and {@link EstimateMemoryUsageAction} but parsing differs
+         * between these two usages.
+         */
+        public static Request parseRequestForMemoryEstimation(XContentParser parser) {
+            DataFrameAnalyticsConfig.Builder configBuilder = DataFrameAnalyticsConfig.STRICT_PARSER.apply(parser, null);
+            DataFrameAnalyticsConfig config = configBuilder.buildForMemoryEstimation();
+            return new PutDataFrameAnalyticsAction.Request(config);
+        }
+
         private DataFrameAnalyticsConfig config;
 
         public Request() {}