Skip to content

Commit 6ef657c

Browse files
davidkyledavidkyle
authored
[ML] Data Frame minor tidy ups (#40580)
Remove Xlint-rawtypes option and remove unused request builders. Not all requests need to implement ToXContent.
1 parent 073b13f commit 6ef657c

File tree

12 files changed

+55
-132
lines changed

12 files changed

+55
-132
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java

+1-21
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
package org.elasticsearch.xpack.core.dataframe.action;
77

88
import org.elasticsearch.action.Action;
9-
import org.elasticsearch.action.ActionRequestBuilder;
109
import org.elasticsearch.action.ActionRequestValidationException;
1110
import org.elasticsearch.action.FailedNodeException;
1211
import org.elasticsearch.action.TaskOperationFailure;
1312
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
1413
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
15-
import org.elasticsearch.client.ElasticsearchClient;
1614
import org.elasticsearch.common.io.stream.StreamInput;
1715
import org.elasticsearch.common.io.stream.StreamOutput;
1816
import org.elasticsearch.common.io.stream.Writeable;
19-
import org.elasticsearch.common.xcontent.ToXContentFragment;
2017
import org.elasticsearch.common.xcontent.ToXContentObject;
2118
import org.elasticsearch.common.xcontent.XContentBuilder;
2219
import org.elasticsearch.tasks.Task;
@@ -42,16 +39,13 @@ public Response newResponse() {
4239
return new Response();
4340
}
4441

45-
public static class Request extends BaseTasksRequest<Request> implements ToXContentFragment {
42+
public static class Request extends BaseTasksRequest<Request> {
4643
private String id;
4744

4845
public Request(String id) {
4946
this.id = ExceptionsHelper.requireNonNull(id, DataFrameField.ID.getPreferredName());
5047
}
5148

52-
private Request() {
53-
}
54-
5549
public Request(StreamInput in) throws IOException {
5650
super(in);
5751
id = in.readString();
@@ -77,12 +71,6 @@ public ActionRequestValidationException validate() {
7771
return null;
7872
}
7973

80-
@Override
81-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
82-
builder.field(DataFrameField.ID.getPreferredName(), id);
83-
return builder;
84-
}
85-
8674
@Override
8775
public int hashCode() {
8876
return Objects.hash(id);
@@ -102,14 +90,6 @@ public boolean equals(Object obj) {
10290
}
10391
}
10492

105-
public static class RequestBuilder
106-
extends ActionRequestBuilder<DeleteDataFrameTransformAction.Request, DeleteDataFrameTransformAction.Response> {
107-
108-
protected RequestBuilder(ElasticsearchClient client, DeleteDataFrameTransformAction action) {
109-
super(client, action, new DeleteDataFrameTransformAction.Request());
110-
}
111-
}
112-
11393
public static class Response extends BaseTasksResponse implements Writeable, ToXContentObject {
11494
private boolean acknowledged;
11595
public Response(StreamInput in) throws IOException {

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsAction.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
88

99
import org.apache.logging.log4j.LogManager;
1010
import org.elasticsearch.action.Action;
11-
import org.elasticsearch.action.ActionRequestBuilder;
1211
import org.elasticsearch.action.ActionRequestValidationException;
13-
import org.elasticsearch.client.ElasticsearchClient;
1412
import org.elasticsearch.common.ParseField;
1513
import org.elasticsearch.common.io.stream.StreamInput;
1614
import org.elasticsearch.common.io.stream.Writeable;
1715
import org.elasticsearch.common.logging.DeprecationLogger;
18-
import org.elasticsearch.common.xcontent.ToXContent;
1916
import org.elasticsearch.common.xcontent.ToXContentObject;
2017
import org.elasticsearch.common.xcontent.XContentBuilder;
2118
import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest;
@@ -48,7 +45,7 @@ public Response newResponse() {
4845
return new Response();
4946
}
5047

51-
public static class Request extends AbstractGetResourcesRequest implements ToXContent {
48+
public static class Request extends AbstractGetResourcesRequest {
5249

5350
private static final int MAX_SIZE_RETURN = 1000;
5451

@@ -78,25 +75,12 @@ public ActionRequestValidationException validate() {
7875
return exception;
7976
}
8077

81-
@Override
82-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
83-
builder.field(DataFrameField.ID.getPreferredName(), getResourceId());
84-
return builder;
85-
}
86-
8778
@Override
8879
public String getResourceIdField() {
8980
return DataFrameField.ID.getPreferredName();
9081
}
9182
}
9283

93-
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
94-
95-
protected RequestBuilder(ElasticsearchClient client, GetDataFrameTransformsAction action) {
96-
super(client, action, new Request());
97-
}
98-
}
99-
10084
public static class Response extends AbstractGetResourcesResponse<DataFrameTransformConfig> implements Writeable, ToXContentObject {
10185

10286
public static final String INVALID_TRANSFORMS_DEPRECATION_WARNING = "Found [{}] invalid transforms";

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/GetDataFrameTransformsStatsAction.java

+1-19
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
package org.elasticsearch.xpack.core.dataframe.action;
88

99
import org.elasticsearch.action.Action;
10-
import org.elasticsearch.action.ActionRequestBuilder;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.FailedNodeException;
1312
import org.elasticsearch.action.TaskOperationFailure;
1413
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
1514
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
16-
import org.elasticsearch.client.ElasticsearchClient;
1715
import org.elasticsearch.cluster.metadata.MetaData;
1816
import org.elasticsearch.common.Strings;
1917
import org.elasticsearch.common.io.stream.StreamInput;
2018
import org.elasticsearch.common.io.stream.StreamOutput;
2119
import org.elasticsearch.common.io.stream.Writeable;
22-
import org.elasticsearch.common.xcontent.ToXContent;
2320
import org.elasticsearch.common.xcontent.ToXContentObject;
2421
import org.elasticsearch.common.xcontent.XContentBuilder;
2522
import org.elasticsearch.tasks.Task;
@@ -44,7 +41,7 @@ public Response newResponse() {
4441
return new Response();
4542
}
4643

47-
public static class Request extends BaseTasksRequest<Request> implements ToXContent {
44+
public static class Request extends BaseTasksRequest<Request> {
4845
private String id;
4946

5047
public Request(String id) {
@@ -55,8 +52,6 @@ public Request(String id) {
5552
}
5653
}
5754

58-
private Request() {}
59-
6055
public Request(StreamInput in) throws IOException {
6156
super(in);
6257
id = in.readString();
@@ -87,12 +82,6 @@ public ActionRequestValidationException validate() {
8782
return null;
8883
}
8984

90-
@Override
91-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
92-
builder.field(DataFrameField.ID.getPreferredName(), id);
93-
return builder;
94-
}
95-
9685
@Override
9786
public int hashCode() {
9887
return Objects.hash(id);
@@ -111,13 +100,6 @@ public boolean equals(Object obj) {
111100
}
112101
}
113102

114-
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
115-
116-
protected RequestBuilder(ElasticsearchClient client, GetDataFrameTransformsStatsAction action) {
117-
super(client, action, new Request());
118-
}
119-
}
120-
121103
public static class Response extends BaseTasksResponse implements Writeable, ToXContentObject {
122104
private List<DataFrameTransformStateAndStats> transformsStateAndStats;
123105

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java

-9
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import org.elasticsearch.action.ActionRequestValidationException;
1111
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1212
import org.elasticsearch.action.support.master.AcknowledgedResponse;
13-
import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
14-
import org.elasticsearch.client.ElasticsearchClient;
1513
import org.elasticsearch.common.io.stream.StreamInput;
1614
import org.elasticsearch.common.io.stream.StreamOutput;
1715
import org.elasticsearch.common.xcontent.ToXContentObject;
@@ -100,13 +98,6 @@ public boolean equals(Object obj) {
10098
}
10199
}
102100

103-
public static class RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
104-
105-
protected RequestBuilder(ElasticsearchClient client, PutDataFrameTransformAction action) {
106-
super(client, action, new Request());
107-
}
108-
}
109-
110101
public static class Response extends AcknowledgedResponse {
111102
public Response() {
112103
super();

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformAction.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
package org.elasticsearch.xpack.core.dataframe.action;
88

99
import org.elasticsearch.action.Action;
10-
import org.elasticsearch.action.ActionRequestBuilder;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1312
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
14-
import org.elasticsearch.client.ElasticsearchClient;
1513
import org.elasticsearch.common.io.stream.StreamInput;
1614
import org.elasticsearch.common.io.stream.StreamOutput;
1715
import org.elasticsearch.common.io.stream.Writeable;
18-
import org.elasticsearch.common.xcontent.ToXContent;
1916
import org.elasticsearch.common.xcontent.ToXContentObject;
2017
import org.elasticsearch.common.xcontent.XContentBuilder;
2118
import org.elasticsearch.xpack.core.dataframe.DataFrameField;
@@ -39,7 +36,7 @@ public Response newResponse() {
3936
return new Response();
4037
}
4138

42-
public static class Request extends AcknowledgedRequest<Request> implements ToXContent {
39+
public static class Request extends AcknowledgedRequest<Request> {
4340

4441
private String id;
4542
private boolean force;
@@ -76,12 +73,6 @@ public ActionRequestValidationException validate() {
7673
return null;
7774
}
7875

79-
@Override
80-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
81-
builder.field(DataFrameField.ID.getPreferredName(), id);
82-
return builder;
83-
}
84-
8576
@Override
8677
public int hashCode() {
8778
return Objects.hash(id);
@@ -100,13 +91,6 @@ public boolean equals(Object obj) {
10091
}
10192
}
10293

103-
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
104-
105-
protected RequestBuilder(ElasticsearchClient client, StartDataFrameTransformAction action) {
106-
super(client, action, new Request());
107-
}
108-
}
109-
11094
public static class Response extends BaseTasksResponse implements Writeable, ToXContentObject {
11195
private boolean started;
11296

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskAction.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
package org.elasticsearch.xpack.core.dataframe.action;
88

99
import org.elasticsearch.action.Action;
10-
import org.elasticsearch.action.ActionRequestBuilder;
1110
import org.elasticsearch.action.ActionRequestValidationException;
1211
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
1312
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
14-
import org.elasticsearch.client.ElasticsearchClient;
1513
import org.elasticsearch.common.io.stream.StreamInput;
1614
import org.elasticsearch.common.io.stream.StreamOutput;
1715
import org.elasticsearch.common.io.stream.Writeable;
18-
import org.elasticsearch.common.xcontent.ToXContent;
1916
import org.elasticsearch.common.xcontent.ToXContentObject;
2017
import org.elasticsearch.common.xcontent.XContentBuilder;
2118
import org.elasticsearch.xpack.core.dataframe.DataFrameField;
@@ -39,7 +36,7 @@ public Response newResponse() {
3936
return new Response();
4037
}
4138

42-
public static class Request extends BaseTasksRequest<Request> implements ToXContent {
39+
public static class Request extends BaseTasksRequest<Request> {
4340

4441
private String id;
4542

@@ -70,12 +67,6 @@ public ActionRequestValidationException validate() {
7067
return null;
7168
}
7269

73-
@Override
74-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
75-
builder.field(DataFrameField.ID.getPreferredName(), id);
76-
return builder;
77-
}
78-
7970
@Override
8071
public int hashCode() {
8172
return Objects.hash(id);
@@ -94,13 +85,6 @@ public boolean equals(Object obj) {
9485
}
9586
}
9687

97-
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
98-
99-
protected RequestBuilder(ElasticsearchClient client, StartDataFrameTransformTaskAction action) {
100-
super(client, action, new Request());
101-
}
102-
}
103-
10488
public static class Response extends BaseTasksResponse implements Writeable, ToXContentObject {
10589
private boolean started;
10690

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/StopDataFrameTransformAction.java

+1-22
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
package org.elasticsearch.xpack.core.dataframe.action;
77

88
import org.elasticsearch.action.Action;
9-
import org.elasticsearch.action.ActionRequestBuilder;
109
import org.elasticsearch.action.ActionRequestValidationException;
1110
import org.elasticsearch.action.support.tasks.BaseTasksRequest;
1211
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
13-
import org.elasticsearch.client.ElasticsearchClient;
1412
import org.elasticsearch.common.Nullable;
1513
import org.elasticsearch.common.io.stream.StreamInput;
1614
import org.elasticsearch.common.io.stream.StreamOutput;
1715
import org.elasticsearch.common.io.stream.Writeable;
1816
import org.elasticsearch.common.unit.TimeValue;
19-
import org.elasticsearch.common.xcontent.ToXContent;
2017
import org.elasticsearch.common.xcontent.ToXContentObject;
2118
import org.elasticsearch.common.xcontent.XContentBuilder;
2219
import org.elasticsearch.tasks.Task;
@@ -44,7 +41,7 @@ public Response newResponse() {
4441
return new Response();
4542
}
4643

47-
public static class Request extends BaseTasksRequest<Request> implements ToXContent {
44+
public static class Request extends BaseTasksRequest<Request> {
4845
private String id;
4946
private final boolean waitForCompletion;
5047
private final boolean force;
@@ -98,17 +95,6 @@ public ActionRequestValidationException validate() {
9895
return null;
9996
}
10097

101-
@Override
102-
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
103-
builder.field(DataFrameField.ID.getPreferredName(), id);
104-
builder.field(DataFrameField.WAIT_FOR_COMPLETION.getPreferredName(), waitForCompletion);
105-
builder.field(DataFrameField.FORCE.getPreferredName(), force);
106-
if (this.getTimeout() != null) {
107-
builder.field(DataFrameField.TIMEOUT.getPreferredName(), this.getTimeout());
108-
}
109-
return builder;
110-
}
111-
11298
@Override
11399
public int hashCode() {
114100
// the base class does not implement hashCode, therefore we need to hash timeout ourselves
@@ -144,13 +130,6 @@ public boolean match(Task task) {
144130
}
145131
}
146132

147-
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
148-
149-
protected RequestBuilder(ElasticsearchClient client, StopDataFrameTransformAction action) {
150-
super(client, action, new Request());
151-
}
152-
}
153-
154133
public static class Response extends BaseTasksResponse implements Writeable, ToXContentObject {
155134

156135
private boolean stopped;

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/action/StartDataFrameTransformTaskActionRequestTests.java

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License;
4+
* you may not use this file except in compliance with the Elastic License.
5+
*/
6+
7+
package org.elasticsearch.xpack.core.dataframe.action;
8+
9+
import org.elasticsearch.common.io.stream.Writeable;
10+
import org.elasticsearch.test.AbstractWireSerializingTestCase;
11+
12+
public class StartDataFrameTransformTaskActionRequestTests extends
13+
AbstractWireSerializingTestCase<StartDataFrameTransformTaskAction.Request> {
14+
@Override
15+
protected StartDataFrameTransformTaskAction.Request createTestInstance() {
16+
return new StartDataFrameTransformTaskAction.Request(randomAlphaOfLength(4));
17+
}
18+
19+
@Override
20+
protected Writeable.Reader<StartDataFrameTransformTaskAction.Request> instanceReader() {
21+
return StartDataFrameTransformTaskAction.Request::new;
22+
}
23+
}

0 commit comments

Comments
 (0)