[ML-DataFrame] migrate to PageParams for get and stats, move PageParams into core (#41851)

migrate hlrc dataframe get and _stats to use PageParams, moves PageParams into core for common 
usage, fix possible NPE in PageParams

Author: Hendrik Muhs

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

@@ -23,6 +23,7 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest;
 import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest;
 import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest;
@@ -57,11 +58,11 @@ static Request getDataFrameTransform(GetDataFrameTransformRequest getRequest) {
                 .addPathPart(Strings.collectionToCommaDelimitedString(getRequest.getId()))
                 .build();
         Request request = new Request(HttpGet.METHOD_NAME, endpoint);
-        if (getRequest.getFrom() != null) {
-            request.addParameter("from", getRequest.getFrom().toString());
+        if (getRequest.getPageParams() != null && getRequest.getPageParams().getFrom() != null) {
+            request.addParameter(PageParams.FROM.getPreferredName(), getRequest.getPageParams().getFrom().toString());
         }
-        if (getRequest.getSize() != null) {
-            request.addParameter("size", getRequest.getSize().toString());
+        if (getRequest.getPageParams() != null && getRequest.getPageParams().getSize() != null) {
+            request.addParameter(PageParams.SIZE.getPreferredName(), getRequest.getPageParams().getSize().toString());
         }
         return request;
     }
@@ -120,6 +121,13 @@ static Request getDataFrameTransformStats(GetDataFrameTransformStatsRequest stat
                 .addPathPart(statsRequest.getId())
                 .addPathPartAsIs("_stats")
                 .build();
-        return new Request(HttpGet.METHOD_NAME, endpoint);
+        Request request = new Request(HttpGet.METHOD_NAME, endpoint);
+        if (statsRequest.getPageParams() != null && statsRequest.getPageParams().getFrom() != null) {
+            request.addParameter(PageParams.FROM.getPreferredName(), statsRequest.getPageParams().getFrom().toString());
+        }
+        if (statsRequest.getPageParams() != null && statsRequest.getPageParams().getSize() != null) {
+            request.addParameter(PageParams.SIZE.getPreferredName(), statsRequest.getPageParams().getSize().toString());
+        }
+        return request;
     }
 }

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

@@ -27,6 +27,7 @@
 import org.apache.http.nio.entity.NByteArrayEntity;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.client.RequestConverters.EndpointBuilder;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.CloseJobRequest;
 import org.elasticsearch.client.ml.DeleteCalendarEventRequest;
 import org.elasticsearch.client.ml.DeleteCalendarJobRequest;
@@ -71,7 +72,6 @@
 import org.elasticsearch.client.ml.UpdateFilterRequest;
 import org.elasticsearch.client.ml.UpdateJobRequest;
 import org.elasticsearch.client.ml.UpdateModelSnapshotRequest;
-import org.elasticsearch.client.ml.job.util.PageParams;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;

client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/util/PageParams.java renamed to client/rest-high-level/src/main/java/org/elasticsearch/client/core/PageParams.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.client.ml.job.util;
+package org.elasticsearch.client.core;
 
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
@@ -57,11 +57,11 @@ public PageParams(@Nullable Integer from, @Nullable Integer size) {
         this.size = size;
     }
 
-    public int getFrom() {
+    public Integer getFrom() {
         return from;
     }
 
-    public int getSize() {
+    public Integer getSize() {
         return size;
     }
 

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

@@ -21,6 +21,7 @@
 
 import org.elasticsearch.client.Validatable;
 import org.elasticsearch.client.ValidationException;
+import org.elasticsearch.client.core.PageParams;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,10 +30,6 @@
 
 public class GetDataFrameTransformRequest implements Validatable {
 
-    private final List<String> ids;
-    private Integer from;
-    private Integer size;
-
     /**
      * Helper method to create a request that will get ALL Data Frame Transforms
      * @return new {@link GetDataFrameTransformRequest} object for the id "_all"
@@ -41,6 +38,9 @@ public static GetDataFrameTransformRequest getAllDataFrameTransformsRequest() {
         return new GetDataFrameTransformRequest("_all");
     }
 
+    private final List<String> ids;
+    private PageParams pageParams;
+
     public GetDataFrameTransformRequest(String... ids) {
         this.ids = Arrays.asList(ids);
     }
@@ -49,20 +49,12 @@ public List<String> getId() {
         return ids;
     }
 
-    public Integer getFrom() {
-        return from;
-    }
-
-    public void setFrom(Integer from) {
-        this.from = from;
-    }
-
-    public Integer getSize() {
-        return size;
+    public PageParams getPageParams() {
+        return pageParams;
     }
 
-    public void setSize(Integer size) {
-        this.size = size;
+    public void setPageParams(PageParams pageParams) {
+        this.pageParams = pageParams;
     }
 
     @Override
@@ -78,7 +70,7 @@ public Optional<ValidationException> validate() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(ids);
+        return Objects.hash(ids, pageParams);
     }
 
     @Override
@@ -91,6 +83,6 @@ public boolean equals(Object obj) {
             return false;
         }
         GetDataFrameTransformRequest other = (GetDataFrameTransformRequest) obj;
-        return Objects.equals(ids, other.ids);
+        return Objects.equals(ids, other.ids) && Objects.equals(pageParams, other.pageParams);
     }
 }

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

@@ -21,12 +21,14 @@
 
 import org.elasticsearch.client.Validatable;
 import org.elasticsearch.client.ValidationException;
+import org.elasticsearch.client.core.PageParams;
 
 import java.util.Objects;
 import java.util.Optional;
 
 public class GetDataFrameTransformStatsRequest implements Validatable {
     private final String id;
+    private PageParams pageParams;
 
     public GetDataFrameTransformStatsRequest(String id) {
         this.id = id;
@@ -36,6 +38,14 @@ public String getId() {
         return id;
     }
 
+    public PageParams getPageParams() {
+        return pageParams;
+    }
+
+    public void setPageParams(PageParams pageParams) {
+        this.pageParams = pageParams;
+    }
+
     @Override
     public Optional<ValidationException> validate() {
         if (id == null) {
@@ -49,7 +59,7 @@ public Optional<ValidationException> validate() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id);
+        return Objects.hash(id, pageParams);
     }
 
     @Override
@@ -62,6 +72,6 @@ public boolean equals(Object obj) {
             return false;
         }
         GetDataFrameTransformStatsRequest other = (GetDataFrameTransformStatsRequest) obj;
-        return Objects.equals(id, other.id);
+        return Objects.equals(id, other.id) && Objects.equals(pageParams, other.pageParams);
     }
 }

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

@@ -20,9 +20,9 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.job.config.Job;
 import org.elasticsearch.client.ml.job.results.Result;
-import org.elasticsearch.client.ml.job.util.PageParams;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;

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

@@ -21,9 +21,9 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.calendars.Calendar;
 import org.elasticsearch.client.ml.job.config.Job;
-import org.elasticsearch.client.ml.job.util.PageParams;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;

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

@@ -21,13 +21,12 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.calendars.Calendar;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
-import org.elasticsearch.client.ml.job.util.PageParams;
-
 import java.io.IOException;
 import java.util.Objects;
 

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

@@ -20,8 +20,8 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.job.config.Job;
-import org.elasticsearch.client.ml.job.util.PageParams;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;

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

@@ -20,8 +20,8 @@
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.client.core.PageParams;
 import org.elasticsearch.client.ml.job.config.MlFilter;
-import org.elasticsearch.client.ml.job.util.PageParams;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;