From 901310a8268fa8034ce224f43e3a97c903e9af6c Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Tue, 16 Jul 2019 12:41:10 -0700 Subject: [PATCH] [7.x] Migrate ML Actions to use writeable ActionType (#44302) (#44391) * Migrate ML Actions to use writeable ActionType (#44302) This commit converts all the StreamableResponseActionType actions in the ML core module to be ActionType and leverage the Writeable infrastructure. --- .../client/ml/MlInfoActionResponseTests.java | 34 ++++------- .../ml/PutCalendarActionResponseTests.java | 61 +++++++------------ .../action/AbstractGetResourcesRequest.java | 5 +- .../action/AbstractGetResourcesResponse.java | 4 +- .../core/ml/action/DeleteDatafeedAction.java | 10 ++- .../ml/action/DeleteExpiredDataAction.java | 19 +++--- .../xpack/core/ml/action/DeleteJobAction.java | 10 ++- .../ml/action/EvaluateDataFrameAction.java | 30 ++++----- .../ml/action/FinalizeJobExecutionAction.java | 8 ++- .../ml/action/FindFileStructureAction.java | 61 +++++++++---------- .../core/ml/action/GetBucketsAction.java | 40 ++++++------ .../ml/action/GetCalendarEventsAction.java | 30 ++++----- .../core/ml/action/GetCalendarsAction.java | 24 ++++---- .../core/ml/action/GetCategoriesAction.java | 26 ++++---- .../action/GetDataFrameAnalyticsAction.java | 18 +++--- .../core/ml/action/GetDatafeedsAction.java | 15 ++--- .../ml/action/GetDatafeedsStatsAction.java | 15 ++--- .../core/ml/action/GetFiltersAction.java | 21 ++++--- .../core/ml/action/GetInfluencersAction.java | 37 +++++------ .../xpack/core/ml/action/GetJobsAction.java | 15 ++--- .../ml/action/GetModelSnapshotsAction.java | 34 +++++------ .../ml/action/GetOverallBucketsAction.java | 38 ++++++------ .../core/ml/action/GetRecordsAction.java | 36 +++++------ .../xpack/core/ml/action/MlInfoAction.java | 23 ++++--- .../ml/action/PostCalendarEventsAction.java | 36 +++++------ .../core/ml/action/PreviewDatafeedAction.java | 28 ++++----- .../core/ml/action/PutCalendarAction.java | 35 ++++++----- .../action/PutDataFrameAnalyticsAction.java | 27 ++++---- .../core/ml/action/PutDatafeedAction.java | 34 +++++------ .../xpack/core/ml/action/PutFilterAction.java | 27 ++++---- .../xpack/core/ml/action/PutJobAction.java | 36 +++++------ .../ml/action/RevertModelSnapshotAction.java | 40 ++++++------ .../ml/action/UpdateCalendarJobAction.java | 23 ++++--- .../core/ml/action/UpdateDatafeedAction.java | 19 +++--- .../core/ml/action/UpdateFilterAction.java | 25 ++++---- .../xpack/core/ml/action/UpdateJobAction.java | 37 ++++++----- .../ml/action/UpdateModelSnapshotAction.java | 35 ++++++----- .../ml/action/DeleteDatafeedRequestTests.java | 9 +-- .../DeleteExpiredDataActionResponseTests.java | 9 +-- .../core/ml/action/DeleteJobRequestTests.java | 12 ++-- .../EvaluateDataFrameActionRequestTests.java | 13 ++-- .../FindFileStructureActionRequestTests.java | 9 +-- .../FindFileStructureActionResponseTests.java | 9 +-- .../action/GetBucketActionRequestTests.java | 15 ++--- .../action/GetBucketActionResponseTests.java | 10 +-- .../GetCalendarEventsActionRequestTests.java | 10 +-- .../GetCalendarsActionRequestTests.java | 10 +-- .../ml/action/GetCategoriesRequestTests.java | 13 ++-- .../ml/action/GetCategoriesResponseTests.java | 9 +-- ...DataFrameAnalyticsActionResponseTests.java | 9 +-- .../GetDatafeedStatsActionResponseTests.java | 9 +-- .../GetDatafeedsActionResponseTests.java | 9 +-- .../action/GetFiltersActionRequestTests.java | 10 +-- .../action/GetFiltersActionResponseTests.java | 10 +-- .../GetInfluencersActionRequestTests.java | 16 ++--- .../GetInfluencersActionResponseTests.java | 12 ++-- .../ml/action/GetJobsActionResponseTests.java | 10 +-- .../GetModelSnapshotsActionRequestTests.java | 18 +++--- .../GetModelSnapshotsActionResponseTests.java | 9 +-- .../GetOverallBucketsActionRequestTests.java | 13 ++-- .../GetOverallBucketsActionResponseTests.java | 9 +-- .../action/GetRecordsActionRequestTests.java | 16 ++--- .../action/GetRecordsActionResponseTests.java | 10 +-- .../PostCalendarEventActionRequestTests.java | 16 ++--- .../PreviewDatafeedActionRequestTests.java | 9 +-- .../action/PutCalendarActionRequestTests.java | 13 ++-- ...tDataFrameAnalyticsActionRequestTests.java | 13 ++-- ...DataFrameAnalyticsActionResponseTests.java | 18 ++---- .../action/PutDatafeedActionRequestTests.java | 13 ++-- .../PutDatafeedActionResponseTests.java | 9 +-- .../action/PutFilterActionRequestTests.java | 13 ++-- .../action/PutFilterActionResponseTests.java | 9 +-- .../ml/action/PutJobActionRequestTests.java | 9 +-- .../ml/action/PutJobActionResponseTests.java | 10 +-- ...RevertModelSnapshotActionRequestTests.java | 14 ++--- ...evertModelSnapshotActionResponseTests.java | 10 +-- .../UpdateCalendarJobActionResquestTests.java | 9 +-- .../UpdateDatafeedActionRequestTests.java | 13 ++-- .../UpdateFilterActionRequestTests.java | 15 ++--- .../action/UpdateJobActionRequestTests.java | 10 +-- ...UpdateModelSnapshotActionRequestTests.java | 14 ++--- ...pdateModelSnapshotActionResponseTests.java | 9 +-- .../action/TransportDeleteDatafeedAction.java | 2 +- .../action/TransportDeleteFilterAction.java | 3 +- .../ml/action/TransportDeleteJobAction.java | 2 +- .../TransportEvaluateDataFrameAction.java | 2 +- .../TransportFinalizeJobExecutionAction.java | 2 +- .../TransportFindFileStructureAction.java | 2 +- .../ml/action/TransportGetBucketsAction.java | 2 +- .../action/TransportGetCalendarsAction.java | 3 +- .../action/TransportGetCategoriesAction.java | 3 +- .../action/TransportGetDatafeedsAction.java | 13 ++-- .../TransportGetDatafeedsStatsAction.java | 12 ++-- .../action/TransportGetInfluencersAction.java | 3 +- .../ml/action/TransportGetJobsAction.java | 11 ++-- .../TransportGetModelSnapshotsAction.java | 2 +- .../TransportGetOverallBucketsAction.java | 9 +-- .../ml/action/TransportGetRecordsAction.java | 2 +- .../ml/action/TransportMlInfoAction.java | 2 +- .../ml/action/TransportOpenJobAction.java | 4 +- .../TransportPostCalendarEventsAction.java | 2 +- .../TransportPreviewDatafeedAction.java | 3 +- .../ml/action/TransportPutCalendarAction.java | 3 +- .../TransportPutDataFrameAnalyticsAction.java | 3 +- .../ml/action/TransportPutDatafeedAction.java | 11 ++-- .../ml/action/TransportPutFilterAction.java | 2 +- .../ml/action/TransportPutJobAction.java | 15 +++-- .../TransportRevertModelSnapshotAction.java | 12 ++-- .../action/TransportSetUpgradeModeAction.java | 4 +- .../action/TransportStartDatafeedAction.java | 4 +- .../TransportUpdateCalendarJobAction.java | 2 +- .../action/TransportUpdateDatafeedAction.java | 14 +++-- .../action/TransportUpdateFilterAction.java | 3 +- .../ml/action/TransportUpdateJobAction.java | 15 +++-- .../TransportUpdateModelSnapshotAction.java | 2 +- .../TransportValidateDetectorAction.java | 3 +- 116 files changed, 851 insertions(+), 856 deletions(-) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/MlInfoActionResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/MlInfoActionResponseTests.java index 2ffb7744a3b..2fa57aa9dd9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/MlInfoActionResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/MlInfoActionResponseTests.java @@ -18,35 +18,20 @@ */ package org.elasticsearch.client.ml; +import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.client.AbstractHlrcStreamableXContentTestCase; import org.elasticsearch.xpack.core.ml.action.MlInfoAction.Response; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.function.Predicate; -public class MlInfoActionResponseTests extends - AbstractHlrcStreamableXContentTestCase { +import static org.hamcrest.Matchers.equalTo; + +public class MlInfoActionResponseTests extends AbstractResponseTestCase { @Override - public MlInfoResponse doHlrcParseInstance(XContentParser parser) throws IOException { - return MlInfoResponse.fromXContent(parser); - } - - @Override - public Response convertHlrcToInternal(MlInfoResponse instance) { - return new Response(instance.getInfo()); - } - - @Override - protected Predicate getRandomFieldsExcludeFilter() { - return p -> true; - } - - @Override - protected Response createTestInstance() { + protected Response createServerTestInstance() { int size = randomInt(10); Map info = new HashMap<>(); for (int j = 0; j < size; j++) { @@ -56,7 +41,12 @@ public class MlInfoActionResponseTests extends } @Override - protected Response createBlankInstance() { - return new Response(); + protected MlInfoResponse doParseToClientInstance(XContentParser parser) throws IOException { + return MlInfoResponse.fromXContent(parser); + } + + @Override + protected void assertInstances(Response serverTestInstance, MlInfoResponse clientInstance) { + assertThat(serverTestInstance.getInfo(), equalTo(clientInstance.getInfo())); } } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/PutCalendarActionResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/PutCalendarActionResponseTests.java index fd2b019c613..d5ef3dbcc0b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/PutCalendarActionResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ml/PutCalendarActionResponseTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.client.ml; import com.carrotsearch.randomizedtesting.generators.CodepointSetGenerator; +import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.client.AbstractHlrcStreamableXContentTestCase; import org.elasticsearch.xpack.core.ml.action.PutCalendarAction; import org.elasticsearch.xpack.core.ml.calendars.Calendar; @@ -28,46 +28,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -public class PutCalendarActionResponseTests - extends AbstractHlrcStreamableXContentTestCase { +import static org.hamcrest.Matchers.equalTo; + +public class PutCalendarActionResponseTests extends AbstractResponseTestCase { @Override - protected PutCalendarAction.Response createTestInstance() { - return new PutCalendarAction.Response(testInstance()); - } - - @Override - protected PutCalendarAction.Response doParseInstance(XContentParser parser) throws IOException { - return new PutCalendarAction.Response(Calendar.LENIENT_PARSER.parse(parser, null).build()); - } - - @Override - protected boolean supportsUnknownFields() { - return true; - } - - @Override - public PutCalendarResponse doHlrcParseInstance(XContentParser parser) throws IOException { - return PutCalendarResponse.fromXContent(parser); - } - - @Override - public PutCalendarAction.Response convertHlrcToInternal(PutCalendarResponse instance) { - org.elasticsearch.client.ml.calendars.Calendar hlrcCalendar = instance.getCalendar(); - Calendar internalCalendar = new Calendar(hlrcCalendar.getId(), hlrcCalendar.getJobIds(), hlrcCalendar.getDescription()); - return new PutCalendarAction.Response(internalCalendar); - } - - @Override - protected PutCalendarAction.Response createBlankInstance() { - return new PutCalendarAction.Response(); - } - - public static Calendar testInstance() { - return testInstance(new CodepointSetGenerator("abcdefghijklmnopqrstuvwxyz".toCharArray()).ofCodePointsLength(random(), 10, 10)); - } - - public static Calendar testInstance(String calendarId) { + protected PutCalendarAction.Response createServerTestInstance() { + String calendarId = new CodepointSetGenerator("abcdefghijklmnopqrstuvwxyz".toCharArray()).ofCodePointsLength(random(), 10, 10); int size = randomInt(10); List items = new ArrayList<>(size); for (int i = 0; i < size; i++) { @@ -77,6 +44,20 @@ public class PutCalendarActionResponseTests if (randomBoolean()) { description = randomAlphaOfLength(20); } - return new Calendar(calendarId, items, description); + Calendar calendar = new Calendar(calendarId, items, description); + return new PutCalendarAction.Response(calendar); + } + + @Override + protected PutCalendarResponse doParseToClientInstance(XContentParser parser) throws IOException { + return PutCalendarResponse.fromXContent(parser); + } + + @Override + protected void assertInstances(PutCalendarAction.Response serverTestInstance, PutCalendarResponse clientInstance) { + org.elasticsearch.client.ml.calendars.Calendar hlrcCalendar = clientInstance.getCalendar(); + Calendar internalCalendar = new Calendar(hlrcCalendar.getId(), hlrcCalendar.getJobIds(), hlrcCalendar.getDescription()); + PutCalendarAction.Response convertedServerTestInstance =new PutCalendarAction.Response(internalCalendar); + assertThat(convertedServerTestInstance, equalTo(serverTestInstance)); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java index 214d84bb6b8..70d9ffdf133 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java @@ -68,10 +68,7 @@ public abstract class AbstractGetResourcesRequest extends ActionRequest { @Override public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - resourceId = in.readOptionalString(); - pageParams = in.readOptionalWriteable(PageParams::new); - allowNoResources = in.readBoolean(); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java index eb3cfa0b8f5..a903e75ef4b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java @@ -41,8 +41,7 @@ public abstract class AbstractGetResourcesResponse(in, getReader()); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override @@ -84,5 +83,6 @@ public abstract class AbstractGetResourcesResponse getReader(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDatafeedAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDatafeedAction.java index 34640a4b5a8..690dc0e55e2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDatafeedAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDatafeedAction.java @@ -51,6 +51,12 @@ public class DeleteDatafeedAction extends ActionType { public Request() { } + public Request(StreamInput in) throws IOException { + super(in); + datafeedId = in.readString(); + force = in.readBoolean(); + } + public String getDatafeedId() { return datafeedId; } @@ -70,9 +76,7 @@ public class DeleteDatafeedAction extends ActionType { @Override public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - datafeedId = in.readString(); - force = in.readBoolean(); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java index 20153f88b3a..7a294860179 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java @@ -9,7 +9,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,18 +20,13 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; import java.util.Objects; -public class DeleteExpiredDataAction extends StreamableResponseActionType { +public class DeleteExpiredDataAction extends ActionType { public static final DeleteExpiredDataAction INSTANCE = new DeleteExpiredDataAction(); public static final String NAME = "cluster:admin/xpack/ml/delete_expired_data"; private DeleteExpiredDataAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest { @@ -61,12 +56,14 @@ public class DeleteExpiredDataAction extends StreamableResponseActionType { public Request() {} + public Request(StreamInput in) throws IOException { + super(in); + jobId = in.readString(); + force = in.readBoolean(); + } + public String getJobId() { return jobId; } @@ -94,9 +100,7 @@ public class DeleteJobAction extends ActionType { @Override public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - jobId = in.readString(); - force = in.readBoolean(); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java index 9be2c08fce0..1b445e796f0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java @@ -9,7 +9,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; @@ -29,18 +29,13 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -public class EvaluateDataFrameAction extends StreamableResponseActionType { +public class EvaluateDataFrameAction extends ActionType { public static final EvaluateDataFrameAction INSTANCE = new EvaluateDataFrameAction(); public static final String NAME = "cluster:monitor/xpack/ml/data_frame/evaluate"; private EvaluateDataFrameAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, EvaluateDataFrameAction.Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -79,6 +74,12 @@ public class EvaluateDataFrameAction extends StreamableResponseActionType metrics; - public Response() { + public Response(StreamInput in) throws IOException { + super(in); + this.evaluationName = in.readString(); + this.metrics = in.readNamedWriteableList(EvaluationMetricResult.class); } public Response(String evaluationName, List metrics) { @@ -165,9 +167,7 @@ public class EvaluateDataFrameAction extends StreamableResponseActionType public Request() { } + public Request(StreamInput in) throws IOException { + super(in); + jobIds = in.readStringArray(); + } + public String[] getJobIds() { return jobIds; } @Override public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - jobIds = in.readStringArray(); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java index 14222075d60..935c097cb40 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureAction.java @@ -10,7 +10,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.bytes.BytesReference; @@ -31,18 +31,13 @@ import java.util.Objects; import static org.elasticsearch.action.ValidateActions.addValidationError; -public class FindFileStructureAction extends StreamableResponseActionType { +public class FindFileStructureAction extends ActionType { public static final FindFileStructureAction INSTANCE = new FindFileStructureAction(); public static final String NAME = "cluster:monitor/xpack/ml/findfilestructure"; private FindFileStructureAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } static class RequestBuilder extends ActionRequestBuilder { @@ -60,17 +55,14 @@ public class FindFileStructureAction extends StreamableResponseActionType { +public class GetBucketsAction extends ActionType { public static final GetBucketsAction INSTANCE = new GetBucketsAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/results/buckets/get"; private GetBucketsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -90,6 +85,20 @@ public class GetBucketsAction extends StreamableResponseActionType implements ToXContentObject { - public Response() { + public Response(StreamInput in) throws IOException { + super(in); } public Response(QueryPage buckets) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java index 1e4a4f60ae7..1fb164fdb72 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; @@ -29,17 +29,12 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetCalendarEventsAction extends StreamableResponseActionType { +public class GetCalendarEventsAction extends ActionType { public static final GetCalendarEventsAction INSTANCE = new GetCalendarEventsAction(); public static final String NAME = "cluster:monitor/xpack/ml/calendars/events/get"; private GetCalendarEventsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -74,6 +69,15 @@ public class GetCalendarEventsAction extends StreamableResponseActionType implements ToXContentObject { - public Response() { + public Response(StreamInput in) throws IOException { + super(in); } public Response(QueryPage scheduledEvents) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java index 29e2fea89a8..9d8ff091d13 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,18 +28,13 @@ import java.util.Objects; import static org.elasticsearch.action.ValidateActions.addValidationError; -public class GetCalendarsAction extends StreamableResponseActionType { +public class GetCalendarsAction extends ActionType { public static final GetCalendarsAction INSTANCE = new GetCalendarsAction(); public static final String NAME = "cluster:monitor/xpack/ml/calendars/get"; private GetCalendarsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -67,6 +62,12 @@ public class GetCalendarsAction extends StreamableResponseActionType { +public class GetCategoriesAction extends ActionType { public static final GetCategoriesAction INSTANCE = new GetCategoriesAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/results/categories/get"; private GetCategoriesAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -76,6 +71,13 @@ public class GetCategoriesAction extends StreamableResponseActionType getResult() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsAction.java index 3873cdac964..efa6430489b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsAction.java @@ -6,7 +6,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequestBuilder; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -16,20 +16,14 @@ import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig; import java.io.IOException; -import java.util.Collections; -public class GetDataFrameAnalyticsAction extends StreamableResponseActionType { +public class GetDataFrameAnalyticsAction extends ActionType { public static final GetDataFrameAnalyticsAction INSTANCE = new GetDataFrameAnalyticsAction(); public static final String NAME = "cluster:monitor/xpack/ml/data_frame/analytics/get"; private GetDataFrameAnalyticsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(new QueryPage<>(Collections.emptyList(), 0, Response.RESULTS_FIELD)); + super(NAME, Response::new); } public static class Request extends AbstractGetResourcesRequest { @@ -46,7 +40,7 @@ public class GetDataFrameAnalyticsAction extends StreamableResponseActionType analytics) { super(analytics); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java index 35ae08b2dc6..a107f8bef1e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsAction.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.client.ElasticsearchClient; @@ -23,7 +23,7 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetDatafeedsAction extends StreamableResponseActionType { +public class GetDatafeedsAction extends ActionType { public static final GetDatafeedsAction INSTANCE = new GetDatafeedsAction(); public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/get"; @@ -31,12 +31,7 @@ public class GetDatafeedsAction extends StreamableResponseActionType { @@ -125,7 +120,9 @@ public class GetDatafeedsAction extends StreamableResponseActionType getResponse() { return getResources(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java index 2e124261226..bdb5858f755 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.client.ElasticsearchClient; @@ -34,7 +34,7 @@ import java.util.Objects; import static org.elasticsearch.Version.V_7_4_0; -public class GetDatafeedsStatsAction extends StreamableResponseActionType { +public class GetDatafeedsStatsAction extends ActionType { public static final GetDatafeedsStatsAction INSTANCE = new GetDatafeedsStatsAction(); public static final String NAME = "cluster:monitor/xpack/ml/datafeeds/stats/get"; @@ -46,12 +46,7 @@ public class GetDatafeedsStatsAction extends StreamableResponseActionType { @@ -256,7 +251,9 @@ public class GetDatafeedsStatsAction extends StreamableResponseActionType getResponse() { return getResources(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetFiltersAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetFiltersAction.java index d3ec3f2e324..de22800832d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetFiltersAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetFiltersAction.java @@ -7,8 +7,9 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; +import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.xpack.core.action.AbstractGetResourcesRequest; @@ -17,21 +18,18 @@ import org.elasticsearch.xpack.core.action.util.PageParams; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.config.MlFilter; +import java.io.IOException; + import static org.elasticsearch.action.ValidateActions.addValidationError; -public class GetFiltersAction extends StreamableResponseActionType { +public class GetFiltersAction extends ActionType { public static final GetFiltersAction INSTANCE = new GetFiltersAction(); public static final String NAME = "cluster:admin/xpack/ml/filters/get"; private GetFiltersAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends AbstractGetResourcesRequest { @@ -41,6 +39,10 @@ public class GetFiltersAction extends StreamableResponseActionType getFilters() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java index 2042d581a22..35f501dea97 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,18 +27,13 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetInfluencersAction extends StreamableResponseActionType { +public class GetInfluencersAction extends ActionType { public static final GetInfluencersAction INSTANCE = new GetInfluencersAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/results/influencers/get"; private GetInfluencersAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -83,6 +78,18 @@ public class GetInfluencersAction extends StreamableResponseActionType influencers) { super(influencers); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java index 89f931e2517..52875dd98b4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetJobsAction.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.client.ElasticsearchClient; @@ -23,18 +23,13 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetJobsAction extends StreamableResponseActionType { +public class GetJobsAction extends ActionType { public static final GetJobsAction INSTANCE = new GetJobsAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/get"; private GetJobsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends MasterNodeReadRequest { @@ -123,7 +118,9 @@ public class GetJobsAction extends StreamableResponseActionType getResponse() { return getResources(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java index 0b1bee54a3a..4e55675a6a1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; @@ -28,18 +28,13 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetModelSnapshotsAction extends StreamableResponseActionType { +public class GetModelSnapshotsAction extends ActionType { public static final GetModelSnapshotsAction INSTANCE = new GetModelSnapshotsAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/model_snapshots/get"; private GetModelSnapshotsAction() { - super(NAME); - } - - @Override - public GetModelSnapshotsAction.Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -84,6 +79,17 @@ public class GetModelSnapshotsAction extends StreamableResponseActionType getPage() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java index 4b657fdf26e..062b7f5bb76 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java @@ -9,7 +9,7 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,7 +29,6 @@ import org.elasticsearch.xpack.core.ml.job.results.OverallBucket; import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; -import java.util.Collections; import java.util.Objects; import java.util.function.LongSupplier; @@ -47,18 +46,13 @@ import java.util.function.LongSupplier; * the interval. *

*/ -public class GetOverallBucketsAction extends StreamableResponseActionType { +public class GetOverallBucketsAction extends ActionType { public static final GetOverallBucketsAction INSTANCE = new GetOverallBucketsAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/results/overall_buckets/get"; private GetOverallBucketsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -117,6 +111,18 @@ public class GetOverallBucketsAction extends StreamableResponseActionType implements ToXContentObject { - public Response() { - super(new QueryPage<>(Collections.emptyList(), 0, OverallBucket.RESULTS_FIELD)); + public Response(StreamInput in) throws IOException { + super(in); } public Response(QueryPage overallBuckets) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java index c1af5da7726..de5663cde50 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,18 +27,13 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class GetRecordsAction extends StreamableResponseActionType { +public class GetRecordsAction extends ActionType { public static final GetRecordsAction INSTANCE = new GetRecordsAction(); public static final String NAME = "cluster:monitor/xpack/ml/job/results/records/get"; private GetRecordsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -83,6 +78,18 @@ public class GetRecordsAction extends StreamableResponseActionType implements ToXContentObject { - public Response() { + public Response(StreamInput in) throws IOException { + super(in); } public Response(QueryPage records) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java index c02909aa761..014a79cdc12 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java @@ -9,7 +9,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -21,18 +21,13 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; -public class MlInfoAction extends StreamableResponseActionType { +public class MlInfoAction extends ActionType { public static final MlInfoAction INSTANCE = new MlInfoAction(); public static final String NAME = "cluster:monitor/xpack/ml/info/get"; private MlInfoAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest { @@ -70,10 +65,18 @@ public class MlInfoAction extends StreamableResponseActionType getInfo() { + return info; + } + @Override public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - info = in.readMap(); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java index 5611cbab4e5..dd143e57160 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java @@ -10,7 +10,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.client.ElasticsearchClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -30,19 +30,14 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -public class PostCalendarEventsAction extends StreamableResponseActionType { +public class PostCalendarEventsAction extends ActionType { public static final PostCalendarEventsAction INSTANCE = new PostCalendarEventsAction(); public static final String NAME = "cluster:admin/xpack/ml/calendars/events/post"; public static final ParseField EVENTS = new ParseField("events"); private PostCalendarEventsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest { @@ -74,6 +69,12 @@ public class PostCalendarEventsAction extends StreamableResponseActionType scheduledEvents) { this.calendarId = ExceptionsHelper.requireNonNull(calendarId, Calendar.ID.getPreferredName()); this.scheduledEvents = ExceptionsHelper.requireNonNull(scheduledEvents, EVENTS.getPreferredName()); @@ -98,9 +99,7 @@ public class PostCalendarEventsAction extends StreamableResponseActionType scheduledEvents; - public Response() { + public Response(StreamInput in) throws IOException { + super(in); + if (in.getVersion().before(Version.V_6_3_0)) { + //the acknowledged flag was removed + in.readBoolean(); + } + in.readList(ScheduledEvent::new); } public Response(List scheduledEvents) { @@ -148,12 +153,7 @@ public class PostCalendarEventsAction extends StreamableResponseActionType { +public class PreviewDatafeedAction extends ActionType { public static final PreviewDatafeedAction INSTANCE = new PreviewDatafeedAction(); public static final String NAME = "cluster:admin/xpack/ml/datafeeds/preview"; private PreviewDatafeedAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -46,6 +41,11 @@ public class PreviewDatafeedAction extends StreamableResponseActionType { +public class PutCalendarAction extends ActionType { public static final PutCalendarAction INSTANCE = new PutCalendarAction(); public static final String NAME = "cluster:admin/xpack/ml/calendars/put"; private PutCalendarAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -61,6 +56,11 @@ public class PutCalendarAction extends StreamableResponseActionType { +public class PutDataFrameAnalyticsAction extends ActionType { public static final PutDataFrameAnalyticsAction INSTANCE = new PutDataFrameAnalyticsAction(); public static final String NAME = "cluster:admin/xpack/ml/data_frame/analytics/put"; private PutDataFrameAnalyticsAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -56,14 +51,18 @@ public class PutDataFrameAnalyticsAction extends StreamableResponseActionType { +public class PutDatafeedAction extends ActionType { public static final PutDatafeedAction INSTANCE = new PutDatafeedAction(); public static final String NAME = "cluster:admin/xpack/ml/datafeeds/put"; private PutDatafeedAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -53,6 +48,11 @@ public class PutDatafeedAction extends StreamableResponseActionType { +public class PutFilterAction extends ActionType { public static final PutFilterAction INSTANCE = new PutFilterAction(); public static final String NAME = "cluster:admin/xpack/ml/filters/put"; private PutFilterAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -59,6 +54,11 @@ public class PutFilterAction extends StreamableResponseActionType { +public class PutJobAction extends ActionType { public static final PutJobAction INSTANCE = new PutJobAction(); public static final String NAME = "cluster:admin/xpack/ml/job/put"; private PutJobAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -77,6 +72,11 @@ public class PutJobAction extends StreamableResponseActionType { +public class RevertModelSnapshotAction extends ActionType { public static final RevertModelSnapshotAction INSTANCE = new RevertModelSnapshotAction(); public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/revert"; private RevertModelSnapshotAction() { - super(NAME); - } - - @Override - public Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -74,6 +69,13 @@ public class RevertModelSnapshotAction extends StreamableResponseActionType { +public class UpdateCalendarJobAction extends ActionType { public static final UpdateCalendarJobAction INSTANCE = new UpdateCalendarJobAction(); public static final String NAME = "cluster:admin/xpack/ml/calendars/jobs/update"; private UpdateCalendarJobAction() { - super(NAME); - } - - @Override - public PutCalendarAction.Response newResponse() { - return new PutCalendarAction.Response(); + super(NAME, PutCalendarAction.Response::new); } public static class Request extends ActionRequest { @@ -40,6 +35,13 @@ public class UpdateCalendarJobAction extends StreamableResponseActionType { +public class UpdateDatafeedAction extends ActionType { public static final UpdateDatafeedAction INSTANCE = new UpdateDatafeedAction(); public static final String NAME = "cluster:admin/xpack/ml/datafeeds/update"; private UpdateDatafeedAction() { - super(NAME); - } - - @Override - public PutDatafeedAction.Response newResponse() { - return new PutDatafeedAction.Response(); + super(NAME, PutDatafeedAction.Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -51,6 +46,11 @@ public class UpdateDatafeedAction extends StreamableResponseActionType { +public class UpdateFilterAction extends ActionType { public static final UpdateFilterAction INSTANCE = new UpdateFilterAction(); public static final String NAME = "cluster:admin/xpack/ml/filters/update"; private UpdateFilterAction() { - super(NAME); - } - - @Override - public PutFilterAction.Response newResponse() { - return new PutFilterAction.Response(); + super(NAME, PutFilterAction.Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -81,6 +76,14 @@ public class UpdateFilterAction extends StreamableResponseActionType(Arrays.asList(in.readStringArray())); + removeItems = new TreeSet<>(Arrays.asList(in.readStringArray())); + } + public Request(String filterId) { this.filterId = ExceptionsHelper.requireNonNull(filterId, MlFilter.ID.getPreferredName()); } @@ -124,11 +127,7 @@ public class UpdateFilterAction extends StreamableResponseActionType(Arrays.asList(in.readStringArray())); - removeItems = new TreeSet<>(Arrays.asList(in.readStringArray())); + throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java index f3ac7e0b306..59fdd7a8efc 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateJobAction.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.StreamableResponseActionType; +import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.master.AcknowledgedRequest; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; @@ -24,17 +24,12 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; import java.util.Objects; -public class UpdateJobAction extends StreamableResponseActionType { +public class UpdateJobAction extends ActionType { public static final UpdateJobAction INSTANCE = new UpdateJobAction(); public static final String NAME = "cluster:admin/xpack/ml/job/update"; private UpdateJobAction() { - super(NAME); - } - - @Override - public PutJobAction.Response newResponse() { - return new PutJobAction.Response(); + super(NAME, PutJobAction.Response::new); } public static class Request extends AcknowledgedRequest implements ToXContentObject { @@ -66,6 +61,20 @@ public class UpdateJobAction extends StreamableResponseActionType { +public class UpdateModelSnapshotAction extends ActionType { public static final UpdateModelSnapshotAction INSTANCE = new UpdateModelSnapshotAction(); public static final String NAME = "cluster:admin/xpack/ml/job/model_snapshots/update"; private UpdateModelSnapshotAction() { - super(NAME); - } - - @Override - public UpdateModelSnapshotAction.Response newResponse() { - return new Response(); + super(NAME, Response::new); } public static class Request extends ActionRequest implements ToXContentObject { @@ -73,6 +68,14 @@ public class UpdateModelSnapshotAction extends StreamableResponseActionType { +public class DeleteDatafeedRequestTests extends AbstractWireSerializingTestCase { @Override protected Request createTestInstance() { @@ -16,7 +17,7 @@ public class DeleteDatafeedRequestTests extends AbstractStreamableTestCase instanceReader() { + return Request::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionResponseTests.java index 34a03fb2e40..c458896dbfe 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataActionResponseTests.java @@ -5,10 +5,11 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.DeleteExpiredDataAction.Response; -public class DeleteExpiredDataActionResponseTests extends AbstractStreamableTestCase { +public class DeleteExpiredDataActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -16,7 +17,7 @@ public class DeleteExpiredDataActionResponseTests extends AbstractStreamableTest } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteJobRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteJobRequestTests.java index 2482e9b5625..9aa492c0451 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteJobRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/DeleteJobRequestTests.java @@ -5,10 +5,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; -import org.elasticsearch.xpack.core.ml.action.DeleteJobAction; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; -public class DeleteJobRequestTests extends AbstractStreamableTestCase { +public class DeleteJobRequestTests extends AbstractWireSerializingTestCase { @Override protected DeleteJobAction.Request createTestInstance() { @@ -18,7 +18,7 @@ public class DeleteJobRequestTests extends AbstractStreamableTestCase instanceReader() { + return DeleteJobAction.Request::new; } -} \ No newline at end of file +} diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameActionRequestTests.java index e899b7e6642..e93eb9b2013 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameActionRequestTests.java @@ -6,9 +6,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.EvaluateDataFrameAction.Request; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.MlEvaluationNamedXContentProvider; import org.elasticsearch.xpack.core.ml.dataframe.evaluation.softclassification.BinarySoftClassificationTests; @@ -16,7 +17,7 @@ import org.elasticsearch.xpack.core.ml.dataframe.evaluation.softclassification.B import java.util.ArrayList; import java.util.List; -public class EvaluateDataFrameActionRequestTests extends AbstractStreamableXContentTestCase { +public class EvaluateDataFrameActionRequestTests extends AbstractSerializingTestCase { @Override protected NamedWriteableRegistry getNamedWriteableRegistry() { @@ -42,13 +43,13 @@ public class EvaluateDataFrameActionRequestTests extends AbstractStreamableXCont } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionRequestTests.java index e72b0540158..557a044d27b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionRequestTests.java @@ -7,7 +7,8 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.filestructurefinder.FileStructure; import java.util.Arrays; @@ -15,7 +16,7 @@ import java.util.Arrays; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.startsWith; -public class FindFileStructureActionRequestTests extends AbstractStreamableTestCase { +public class FindFileStructureActionRequestTests extends AbstractWireSerializingTestCase { @Override protected FindFileStructureAction.Request createTestInstance() { @@ -73,8 +74,8 @@ public class FindFileStructureActionRequestTests extends AbstractStreamableTestC } @Override - protected FindFileStructureAction.Request createBlankInstance() { - return new FindFileStructureAction.Request(); + protected Writeable.Reader instanceReader() { + return FindFileStructureAction.Request::new; } public void testValidateLinesToSample() { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionResponseTests.java index 706ee44a4fd..0c8970fd35b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/FindFileStructureActionResponseTests.java @@ -5,10 +5,11 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.filestructurefinder.FileStructureTests; -public class FindFileStructureActionResponseTests extends AbstractStreamableTestCase { +public class FindFileStructureActionResponseTests extends AbstractWireSerializingTestCase { @Override protected FindFileStructureAction.Response createTestInstance() { @@ -16,7 +17,7 @@ public class FindFileStructureActionResponseTests extends AbstractStreamableTest } @Override - protected FindFileStructureAction.Response createBlankInstance() { - return new FindFileStructureAction.Response(); + protected Writeable.Reader instanceReader() { + return FindFileStructureAction.Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionRequestTests.java index 1f65852a1ff..9349315a29f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetBucketsAction.Request; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; +import org.elasticsearch.xpack.core.ml.action.GetBucketsAction.Request; -public class GetBucketActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetBucketActionRequestTests extends AbstractSerializingTestCase { @Override protected Request createTestInstance() { @@ -51,13 +52,13 @@ public class GetBucketActionRequestTests extends AbstractStreamableXContentTestC } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new GetBucketsAction.Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionResponseTests.java index f55aca6b368..b9b1af32432 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetBucketActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetBucketsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.results.AnomalyRecord; @@ -17,7 +18,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -public class GetBucketActionResponseTests extends AbstractStreamableTestCase { +public class GetBucketActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -75,8 +76,7 @@ public class GetBucketActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsActionRequestTests.java index c6dee20dcfe..fc9d2e6b80c 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsActionRequestTests.java @@ -6,12 +6,12 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetCalendarEventsAction; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; -public class GetCalendarEventsActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetCalendarEventsActionRequestTests extends AbstractSerializingTestCase { @Override protected GetCalendarEventsAction.Request createTestInstance() { @@ -33,8 +33,8 @@ public class GetCalendarEventsActionRequestTests extends AbstractStreamableXCont } @Override - protected GetCalendarEventsAction.Request createBlankInstance() { - return new GetCalendarEventsAction.Request(); + protected Writeable.Reader instanceReader() { + return GetCalendarEventsAction.Request::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsActionRequestTests.java index d01599e340f..7d7ad2f7334 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsActionRequestTests.java @@ -5,12 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetCalendarsAction; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; -public class GetCalendarsActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetCalendarsActionRequestTests extends AbstractSerializingTestCase { @Override protected GetCalendarsAction.Request createTestInstance() { @@ -25,8 +25,8 @@ public class GetCalendarsActionRequestTests extends AbstractStreamableXContentTe } @Override - protected GetCalendarsAction.Request createBlankInstance() { - return new GetCalendarsAction.Request(); + protected Writeable.Reader instanceReader() { + return GetCalendarsAction.Request::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesRequestTests.java index 2cc7738d761..b3d93ed5c9f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesRequestTests.java @@ -5,11 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; -public class GetCategoriesRequestTests extends AbstractStreamableXContentTestCase { +public class GetCategoriesRequestTests extends AbstractSerializingTestCase { @Override protected GetCategoriesAction.Request createTestInstance() { @@ -26,13 +27,13 @@ public class GetCategoriesRequestTests extends AbstractStreamableXContentTestCas } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return GetCategoriesAction.Request::new; } @Override - protected GetCategoriesAction.Request createBlankInstance() { - return new GetCategoriesAction.Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesResponseTests.java index 05cddd8097a..0dccc9cde3e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesResponseTests.java @@ -5,13 +5,14 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.results.CategoryDefinition; import java.util.Collections; -public class GetCategoriesResponseTests extends AbstractStreamableTestCase { +public class GetCategoriesResponseTests extends AbstractWireSerializingTestCase { @Override protected GetCategoriesAction.Response createTestInstance() { @@ -22,7 +23,7 @@ public class GetCategoriesResponseTests extends AbstractStreamableTestCase instanceReader() { + return GetCategoriesAction.Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsActionResponseTests.java index 38a33963166..83ad1f8285d 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsActionResponseTests.java @@ -6,10 +6,11 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.action.GetDataFrameAnalyticsAction.Response; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfig; @@ -20,7 +21,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class GetDataFrameAnalyticsActionResponseTests extends AbstractStreamableTestCase { +public class GetDataFrameAnalyticsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected NamedWriteableRegistry getNamedWriteableRegistry() { @@ -49,7 +50,7 @@ public class GetDataFrameAnalyticsActionResponseTests extends AbstractStreamable } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedStatsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedStatsActionResponseTests.java index b4093c27a90..cff117b7430 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedStatsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedStatsActionResponseTests.java @@ -8,12 +8,13 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.action.GetDatafeedsStatsAction.Response; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; @@ -34,7 +35,7 @@ import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; -public class GetDatafeedStatsActionResponseTests extends AbstractStreamableTestCase { +public class GetDatafeedStatsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -61,8 +62,8 @@ public class GetDatafeedStatsActionResponseTests extends AbstractStreamableTestC } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } @SuppressWarnings("unchecked") diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsActionResponseTests.java index 383a4a7d62e..157fb477cf6 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsActionResponseTests.java @@ -6,9 +6,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetDatafeedsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; @@ -18,7 +19,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class GetDatafeedsActionResponseTests extends AbstractStreamableTestCase { +public class GetDatafeedsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -31,8 +32,8 @@ public class GetDatafeedsActionResponseTests extends AbstractStreamableTestCase< } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionRequestTests.java index af80712fb9f..a4419a60fca 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionRequestTests.java @@ -5,11 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetFiltersAction.Request; import org.elasticsearch.xpack.core.action.util.PageParams; -public class GetFiltersActionRequestTests extends AbstractStreamableTestCase { +public class GetFiltersActionRequestTests extends AbstractWireSerializingTestCase { @Override @@ -28,8 +29,7 @@ public class GetFiltersActionRequestTests extends AbstractStreamableTestCase instanceReader() { + return Request::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionResponseTests.java index d6df42cd617..ba16c5a0afc 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetFiltersActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetFiltersAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.config.MlFilter; @@ -13,7 +14,7 @@ import org.elasticsearch.xpack.core.ml.job.config.MlFilterTests; import java.util.Collections; -public class GetFiltersActionResponseTests extends AbstractStreamableTestCase { +public class GetFiltersActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -24,8 +25,7 @@ public class GetFiltersActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionRequestTests.java index 7f2c94862c3..74e375bd6e7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetInfluencersAction.Request; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; +import org.elasticsearch.xpack.core.ml.action.GetInfluencersAction.Request; -public class GetInfluencersActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetInfluencersActionRequestTests extends AbstractSerializingTestCase { @Override protected Request doParseInstance(XContentParser parser) { @@ -49,13 +50,12 @@ public class GetInfluencersActionRequestTests extends AbstractStreamableXContent } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionResponseTests.java index e01c8935365..8de799ecd20 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersActionResponseTests.java @@ -5,16 +5,17 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; -import org.elasticsearch.xpack.core.ml.action.GetInfluencersAction.Response; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.action.util.QueryPage; +import org.elasticsearch.xpack.core.ml.action.GetInfluencersAction.Response; import org.elasticsearch.xpack.core.ml.job.results.Influencer; import java.util.ArrayList; import java.util.Date; import java.util.List; -public class GetInfluencersActionResponseTests extends AbstractStreamableTestCase { +public class GetInfluencersActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -34,8 +35,7 @@ public class GetInfluencersActionResponseTests extends AbstractStreamableTestCas } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetJobsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetJobsActionResponseTests.java index 932386dba8b..30f8eb6f132 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetJobsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetJobsActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetJobsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.config.Job; @@ -14,7 +15,7 @@ import org.elasticsearch.xpack.core.ml.job.config.JobTests; import java.util.ArrayList; import java.util.List; -public class GetJobsActionResponseTests extends AbstractStreamableTestCase { +public class GetJobsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -32,8 +33,7 @@ public class GetJobsActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionRequestTests.java index 54c5fc894b6..636094acd70 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionRequestTests.java @@ -5,16 +5,17 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetModelSnapshotsAction.Request; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; +import org.elasticsearch.xpack.core.ml.action.GetModelSnapshotsAction.Request; -public class GetModelSnapshotsActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetModelSnapshotsActionRequestTests extends AbstractSerializingTestCase { @Override protected Request doParseInstance(XContentParser parser) { - return GetModelSnapshotsAction.Request.parseRequest(null, null, parser); + return Request.parseRequest(null, null, parser); } @Override @@ -41,13 +42,12 @@ public class GetModelSnapshotsActionRequestTests extends AbstractStreamableXCont } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionResponseTests.java index da3eb87ebd5..19a063f6bd3 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetModelSnapshotsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapshot; @@ -14,7 +15,7 @@ import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapsho import java.util.ArrayList; import java.util.List; -public class GetModelSnapshotsActionResponseTests extends AbstractStreamableTestCase { +public class GetModelSnapshotsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -28,7 +29,7 @@ public class GetModelSnapshotsActionResponseTests extends AbstractStreamableTest } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionRequestTests.java index 9799010204c..2be2dcdab58 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetOverallBucketsAction.Request; -public class GetOverallBucketsActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetOverallBucketsActionRequestTests extends AbstractSerializingTestCase { @Override protected Request createTestInstance() { @@ -39,13 +40,13 @@ public class GetOverallBucketsActionRequestTests extends AbstractStreamableXCont } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionResponseTests.java index ec40eebb502..4f3cdc6245e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetOverallBucketsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.results.OverallBucket; @@ -14,7 +15,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -public class GetOverallBucketsActionResponseTests extends AbstractStreamableTestCase { +public class GetOverallBucketsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -34,7 +35,7 @@ public class GetOverallBucketsActionResponseTests extends AbstractStreamableTest } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionRequestTests.java index 982f6e17055..3936b88b944 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.GetRecordsAction.Request; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.action.util.PageParams; +import org.elasticsearch.xpack.core.ml.action.GetRecordsAction.Request; -public class GetRecordsActionRequestTests extends AbstractStreamableXContentTestCase { +public class GetRecordsActionRequestTests extends AbstractSerializingTestCase { @Override protected Request doParseInstance(XContentParser parser) { @@ -49,13 +50,12 @@ public class GetRecordsActionRequestTests extends AbstractStreamableXContentTest } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionResponseTests.java index 1620820cba4..d74d8ef0472 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/GetRecordsActionResponseTests.java @@ -5,7 +5,8 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.GetRecordsAction.Response; import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.job.results.AnomalyRecord; @@ -14,7 +15,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -public class GetRecordsActionResponseTests extends AbstractStreamableTestCase { +public class GetRecordsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -30,8 +31,7 @@ public class GetRecordsActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventActionRequestTests.java index af94c180a1f..cd984cc2549 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventActionRequestTests.java @@ -7,9 +7,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.common.Strings; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.calendars.ScheduledEvent; import org.elasticsearch.xpack.core.ml.calendars.ScheduledEventTests; @@ -17,7 +18,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -public class PostCalendarEventActionRequestTests extends AbstractStreamableTestCase { +public class PostCalendarEventActionRequestTests extends AbstractWireSerializingTestCase { @Override protected PostCalendarEventsAction.Request createTestInstance() { @@ -25,6 +26,11 @@ public class PostCalendarEventActionRequestTests extends AbstractStreamableTestC return createTestInstance(id); } + @Override + protected Writeable.Reader instanceReader() { + return PostCalendarEventsAction.Request::new; + } + private PostCalendarEventsAction.Request createTestInstance(String calendarId) { int numEvents = randomIntBetween(1, 10); List events = new ArrayList<>(); @@ -36,12 +42,6 @@ public class PostCalendarEventActionRequestTests extends AbstractStreamableTestC return request; } - @Override - protected PostCalendarEventsAction.Request createBlankInstance() { - return new PostCalendarEventsAction.Request(); - } - - public void testParseRequest() throws IOException { PostCalendarEventsAction.Request sourceRequest = createTestInstance(); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedActionRequestTests.java index b7828e4b976..d60420e4834 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedActionRequestTests.java @@ -5,10 +5,11 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PreviewDatafeedAction.Request; -public class PreviewDatafeedActionRequestTests extends AbstractStreamableTestCase { +public class PreviewDatafeedActionRequestTests extends AbstractWireSerializingTestCase { @Override protected Request createTestInstance() { @@ -16,7 +17,7 @@ public class PreviewDatafeedActionRequestTests extends AbstractStreamableTestCas } @Override - protected Request createBlankInstance() { - return new Request(); + protected Writeable.Reader instanceReader() { + return Request::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutCalendarActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutCalendarActionRequestTests.java index 7d111a31c9d..32c54d57e97 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutCalendarActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutCalendarActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.calendars.CalendarTests; import org.elasticsearch.xpack.core.ml.job.config.JobTests; -public class PutCalendarActionRequestTests extends AbstractStreamableXContentTestCase { +public class PutCalendarActionRequestTests extends AbstractSerializingTestCase { private final String calendarId = JobTests.randomValidJobId(); @@ -20,13 +21,13 @@ public class PutCalendarActionRequestTests extends AbstractStreamableXContentTes } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return PutCalendarAction.Request::new; } @Override - protected PutCalendarAction.Request createBlankInstance() { - return new PutCalendarAction.Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionRequestTests.java index d00fa4384be..922ef0616ab 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionRequestTests.java @@ -6,11 +6,12 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutDataFrameAnalyticsAction.Request; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfigTests; import org.elasticsearch.xpack.core.ml.dataframe.analyses.MlDataFrameAnalysisNamedXContentProvider; @@ -20,7 +21,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class PutDataFrameAnalyticsActionRequestTests extends AbstractStreamableXContentTestCase { +public class PutDataFrameAnalyticsActionRequestTests extends AbstractSerializingTestCase { private String id; @@ -51,13 +52,13 @@ public class PutDataFrameAnalyticsActionRequestTests extends AbstractStreamableX } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionResponseTests.java index c9f678b13df..7f160781012 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDataFrameAnalyticsActionResponseTests.java @@ -6,10 +6,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutDataFrameAnalyticsAction.Response; import org.elasticsearch.xpack.core.ml.dataframe.DataFrameAnalyticsConfigTests; import org.elasticsearch.xpack.core.ml.dataframe.analyses.MlDataFrameAnalysisNamedXContentProvider; @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class PutDataFrameAnalyticsActionResponseTests extends AbstractStreamableTestCase { +public class PutDataFrameAnalyticsActionResponseTests extends AbstractWireSerializingTestCase { @Override protected NamedWriteableRegistry getNamedWriteableRegistry() { @@ -28,21 +28,13 @@ public class PutDataFrameAnalyticsActionResponseTests extends AbstractStreamable return new NamedWriteableRegistry(namedWriteables); } - @Override - protected NamedXContentRegistry xContentRegistry() { - List namedXContent = new ArrayList<>(); - namedXContent.addAll(new MlDataFrameAnalysisNamedXContentProvider().getNamedXContentParsers()); - namedXContent.addAll(new SearchModule(Settings.EMPTY, false, Collections.emptyList()).getNamedXContents()); - return new NamedXContentRegistry(namedXContent); - } - @Override protected Response createTestInstance() { return new Response(DataFrameAnalyticsConfigTests.createRandom(DataFrameAnalyticsConfigTests.randomValidId())); } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionRequestTests.java index d688ee9b5b9..dfbc7e7a55a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionRequestTests.java @@ -6,11 +6,12 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutDatafeedAction.Request; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests; @@ -18,7 +19,7 @@ import org.junit.Before; import java.util.Collections; -public class PutDatafeedActionRequestTests extends AbstractStreamableXContentTestCase { +public class PutDatafeedActionRequestTests extends AbstractSerializingTestCase { private String datafeedId; @@ -35,13 +36,13 @@ public class PutDatafeedActionRequestTests extends AbstractStreamableXContentTes } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionResponseTests.java index ca650914fe1..a9c1fae4fc8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutDatafeedActionResponseTests.java @@ -6,9 +6,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutDatafeedAction.Response; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests; @@ -16,7 +17,7 @@ import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests; import java.util.Arrays; import java.util.Collections; -public class PutDatafeedActionResponseTests extends AbstractStreamableTestCase { +public class PutDatafeedActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -27,8 +28,8 @@ public class PutDatafeedActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionRequestTests.java index bed0ab775af..37ec18c45e7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutFilterAction.Request; import org.elasticsearch.xpack.core.ml.job.config.MlFilterTests; -public class PutFilterActionRequestTests extends AbstractStreamableXContentTestCase { +public class PutFilterActionRequestTests extends AbstractSerializingTestCase { private final String filterId = MlFilterTests.randomValidFilterId(); @@ -20,13 +21,13 @@ public class PutFilterActionRequestTests extends AbstractStreamableXContentTestC } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new PutFilterAction.Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionResponseTests.java index 1e697f5172a..e712602be2d 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutFilterActionResponseTests.java @@ -5,14 +5,15 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.job.config.MlFilter; import org.elasticsearch.xpack.core.ml.job.config.MlFilterTests; import java.io.IOException; -public class PutFilterActionResponseTests extends AbstractStreamableXContentTestCase { +public class PutFilterActionResponseTests extends AbstractSerializingTestCase { @Override protected PutFilterAction.Response createTestInstance() { @@ -20,8 +21,8 @@ public class PutFilterActionResponseTests extends AbstractStreamableXContentTest } @Override - protected PutFilterAction.Response createBlankInstance() { - return new PutFilterAction.Response(); + protected Writeable.Reader instanceReader() { + return PutFilterAction.Response::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionRequestTests.java index 46dd97a63a8..379d90000db 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionRequestTests.java @@ -6,10 +6,11 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutJobAction.Request; import org.elasticsearch.xpack.core.ml.job.config.Job; @@ -19,7 +20,7 @@ import java.util.Date; import static org.elasticsearch.xpack.core.ml.job.config.JobTests.buildJobBuilder; import static org.elasticsearch.xpack.core.ml.job.config.JobTests.randomValidJobId; -public class PutJobActionRequestTests extends AbstractStreamableXContentTestCase { +public class PutJobActionRequestTests extends AbstractSerializingTestCase { private final String jobId = randomValidJobId(); @@ -30,8 +31,8 @@ public class PutJobActionRequestTests extends AbstractStreamableXContentTestCase } @Override - protected Request createBlankInstance() { - return new Request(); + protected Writeable.Reader instanceReader() { + return Request::new; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionResponseTests.java index 090ae23f2cb..9abca64c709 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/PutJobActionResponseTests.java @@ -5,14 +5,15 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.PutJobAction.Response; import org.elasticsearch.xpack.core.ml.job.config.Job; import static org.elasticsearch.xpack.core.ml.job.config.JobTests.buildJobBuilder; import static org.elasticsearch.xpack.core.ml.job.config.JobTests.randomValidJobId; -public class PutJobActionResponseTests extends AbstractStreamableTestCase { +public class PutJobActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -21,8 +22,7 @@ public class PutJobActionResponseTests extends AbstractStreamableTestCase instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionRequestTests.java index cd1b48cb31a..46b6999defc 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionRequestTests.java @@ -5,12 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; -import org.elasticsearch.xpack.core.ml.action.RevertModelSnapshotAction; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.RevertModelSnapshotAction.Request; -public class RevertModelSnapshotActionRequestTests extends AbstractStreamableXContentTestCase { +public class RevertModelSnapshotActionRequestTests extends AbstractSerializingTestCase { @Override protected Request createTestInstance() { @@ -23,13 +23,13 @@ public class RevertModelSnapshotActionRequestTests extends AbstractStreamableXCo } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new RevertModelSnapshotAction.Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionResponseTests.java index f24a8ccb9e1..20dc85f8c98 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/RevertModelSnapshotActionResponseTests.java @@ -5,11 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.RevertModelSnapshotAction.Response; import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapshotTests; -public class RevertModelSnapshotActionResponseTests extends AbstractStreamableTestCase { +public class RevertModelSnapshotActionResponseTests extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -17,8 +18,7 @@ public class RevertModelSnapshotActionResponseTests extends AbstractStreamableTe } @Override - protected Response createBlankInstance() { - return new RevertModelSnapshotAction.Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobActionResquestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobActionResquestTests.java index b11c571bf78..3f6264815df 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobActionResquestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobActionResquestTests.java @@ -5,9 +5,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; -public class UpdateCalendarJobActionResquestTests extends AbstractStreamableTestCase { +public class UpdateCalendarJobActionResquestTests extends AbstractWireSerializingTestCase { @Override protected UpdateCalendarJobAction.Request createTestInstance() { @@ -17,7 +18,7 @@ public class UpdateCalendarJobActionResquestTests extends AbstractStreamableTest } @Override - protected UpdateCalendarJobAction.Request createBlankInstance() { - return new UpdateCalendarJobAction.Request(); + protected Writeable.Reader instanceReader() { + return UpdateCalendarJobAction.Request::new; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateDatafeedActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateDatafeedActionRequestTests.java index af883ee9164..16cd5b2030f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateDatafeedActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateDatafeedActionRequestTests.java @@ -6,11 +6,12 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.UpdateDatafeedAction.Request; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedUpdateTests; @@ -18,7 +19,7 @@ import org.junit.Before; import java.util.Collections; -public class UpdateDatafeedActionRequestTests extends AbstractStreamableXContentTestCase { +public class UpdateDatafeedActionRequestTests extends AbstractSerializingTestCase { private String datafeedId; @@ -33,13 +34,13 @@ public class UpdateDatafeedActionRequestTests extends AbstractStreamableXContent } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterActionRequestTests.java index f07eba7e90e..e38ee5724df 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterActionRequestTests.java @@ -5,15 +5,16 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.UpdateFilterAction.Request; import java.util.ArrayList; import java.util.Collection; import java.util.List; -public class UpdateFilterActionRequestTests extends AbstractStreamableXContentTestCase { +public class UpdateFilterActionRequestTests extends AbstractSerializingTestCase { private String filterId = randomAlphaOfLength(20); @@ -32,6 +33,11 @@ public class UpdateFilterActionRequestTests extends AbstractStreamableXContentTe return request; } + @Override + protected Writeable.Reader instanceReader() { + return Request::new; + } + private static Collection generateRandomStrings() { int size = randomIntBetween(0, 10); List strings = new ArrayList<>(size); @@ -46,11 +52,6 @@ public class UpdateFilterActionRequestTests extends AbstractStreamableXContentTe return false; } - @Override - protected Request createBlankInstance() { - return new Request(); - } - @Override protected Request doParseInstance(XContentParser parser) { return Request.parseRequest(filterId, parser); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java index 20d27f03d0c..e9beada65dc 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateJobActionRequestTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.job.config.AnalysisLimits; import org.elasticsearch.xpack.core.ml.job.config.JobUpdate; public class UpdateJobActionRequestTests - extends AbstractStreamableTestCase { + extends AbstractWireSerializingTestCase { @Override protected UpdateJobAction.Request createTestInstance() { @@ -30,8 +31,7 @@ public class UpdateJobActionRequestTests } @Override - protected UpdateJobAction.Request createBlankInstance() { - return new UpdateJobAction.Request(); + protected Writeable.Reader instanceReader() { + return UpdateJobAction.Request::new; } - } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionRequestTests.java index 8ccb8bb2e19..f39d308d7cf 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionRequestTests.java @@ -5,12 +5,12 @@ */ package org.elasticsearch.xpack.core.ml.action; +import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractStreamableXContentTestCase; +import org.elasticsearch.test.AbstractSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.UpdateModelSnapshotAction.Request; -public class UpdateModelSnapshotActionRequestTests - extends AbstractStreamableXContentTestCase { +public class UpdateModelSnapshotActionRequestTests extends AbstractSerializingTestCase { @Override protected Request doParseInstance(XContentParser parser) { @@ -31,12 +31,12 @@ public class UpdateModelSnapshotActionRequestTests } @Override - protected boolean supportsUnknownFields() { - return false; + protected Writeable.Reader instanceReader() { + return Request::new; } @Override - protected Request createBlankInstance() { - return new Request(); + protected boolean supportsUnknownFields() { + return false; } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionResponseTests.java index a8694476ee2..5e1e25411ae 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotActionResponseTests.java @@ -5,12 +5,13 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.test.AbstractStreamableTestCase; +import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.xpack.core.ml.action.UpdateModelSnapshotAction.Response; import org.elasticsearch.xpack.core.ml.job.process.autodetect.state.ModelSnapshotTests; public class UpdateModelSnapshotActionResponseTests - extends AbstractStreamableTestCase { + extends AbstractWireSerializingTestCase { @Override protected Response createTestInstance() { @@ -18,7 +19,7 @@ public class UpdateModelSnapshotActionResponseTests } @Override - protected Response createBlankInstance() { - return new Response(); + protected Writeable.Reader instanceReader() { + return Response::new; } } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java index 0178393d80a..372cb3fa3b1 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java @@ -54,7 +54,7 @@ public class TransportDeleteDatafeedAction extends TransportMasterNodeAction { +public class TransportGetDatafeedsAction extends TransportMasterNodeReadAction { private final DatafeedConfigProvider datafeedConfigProvider; @@ -55,8 +56,8 @@ public class TransportGetDatafeedsAction extends } @Override - protected GetDatafeedsAction.Response newResponse() { - return new GetDatafeedsAction.Response(); + protected GetDatafeedsAction.Response read(StreamInput in) throws IOException { + return new GetDatafeedsAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsStatsAction.java index 591797168c7..965a7e0bfae 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsStatsAction.java @@ -7,7 +7,7 @@ package org.elasticsearch.xpack.ml.action; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.StreamableTransportMasterNodeReadAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -15,22 +15,24 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.MlTasks; import org.elasticsearch.xpack.core.ml.action.GetDatafeedsStatsAction; -import org.elasticsearch.xpack.core.action.util.QueryPage; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedState; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedTimingStats; import org.elasticsearch.xpack.ml.datafeed.persistence.DatafeedConfigProvider; import org.elasticsearch.xpack.ml.job.persistence.JobResultsProvider; +import java.io.IOException; import java.util.List; import java.util.stream.Collectors; -public class TransportGetDatafeedsStatsAction extends StreamableTransportMasterNodeReadAction { private final DatafeedConfigProvider datafeedConfigProvider; @@ -53,8 +55,8 @@ public class TransportGetDatafeedsStatsAction extends StreamableTransportMasterN } @Override - protected GetDatafeedsStatsAction.Response newResponse() { - return new GetDatafeedsStatsAction.Response(); + protected GetDatafeedsStatsAction.Response read(StreamInput in) throws IOException { + return new GetDatafeedsStatsAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetInfluencersAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetInfluencersAction.java index 6df64025467..ca139e46965 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetInfluencersAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetInfluencersAction.java @@ -26,8 +26,7 @@ public class TransportGetInfluencersAction extends HandledTransportAction { +import java.io.IOException; + +public class TransportGetJobsAction extends TransportMasterNodeReadAction { private final JobManager jobManager; @@ -39,8 +42,8 @@ public class TransportGetJobsAction extends StreamableTransportMasterNodeReadAct } @Override - protected GetJobsAction.Response newResponse() { - return new GetJobsAction.Response(); + protected GetJobsAction.Response read(StreamInput in) throws IOException { + return new GetJobsAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetModelSnapshotsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetModelSnapshotsAction.java index c8090f32904..007bdf3c374 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetModelSnapshotsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetModelSnapshotsAction.java @@ -28,7 +28,7 @@ public class TransportGetModelSnapshotsAction extends HandledTransportAction { if (jobPage.count() == 0) { - listener.onResponse(new GetOverallBucketsAction.Response()); + listener.onResponse(new GetOverallBucketsAction.Response( + new QueryPage<>(Collections.emptyList(), 0, Job.RESULTS_FIELD))); return; } @@ -107,7 +108,7 @@ public class TransportGetOverallBucketsAction extends HandledTransportAction chunkedBucketSearcherListener = ActionListener.wrap(searcher -> { if (searcher == null) { - listener.onResponse(new GetOverallBucketsAction.Response()); + listener.onResponse(new GetOverallBucketsAction.Response(new QueryPage<>(Collections.emptyList(), 0, Job.RESULTS_FIELD))); return; } searcher.searchAndComputeOverallBuckets(overallBucketsListener); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetRecordsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetRecordsAction.java index 81708088145..efbc4107884 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetRecordsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetRecordsAction.java @@ -26,7 +26,7 @@ public class TransportGetRecordsAction extends HandledTransportAction { +public class TransportPutDatafeedAction extends TransportMasterNodeAction { private static final Logger logger = LogManager.getLogger(TransportPutDatafeedAction.class); @@ -78,7 +79,7 @@ public class TransportPutDatafeedAction extends StreamableTransportMasterNodeAct IndexNameExpressionResolver indexNameExpressionResolver, NamedXContentRegistry xContentRegistry) { super(PutDatafeedAction.NAME, transportService, clusterService, threadPool, - actionFilters, indexNameExpressionResolver, PutDatafeedAction.Request::new); + actionFilters, PutDatafeedAction.Request::new, indexNameExpressionResolver); this.licenseState = licenseState; this.client = client; this.securityContext = XPackSettings.SECURITY_ENABLED.get(settings) ? @@ -94,8 +95,8 @@ public class TransportPutDatafeedAction extends StreamableTransportMasterNodeAct } @Override - protected PutDatafeedAction.Response newResponse() { - return new PutDatafeedAction.Response(); + protected PutDatafeedAction.Response read(StreamInput in) throws IOException { + return new PutDatafeedAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutFilterAction.java index e36ea1eaedd..b9c8afa9340 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutFilterAction.java @@ -40,7 +40,7 @@ public class TransportPutFilterAction extends HandledTransportAction { +import java.io.IOException; + +public class TransportPutJobAction extends TransportMasterNodeAction { private final JobManager jobManager; private final XPackLicenseState licenseState; @@ -35,8 +38,8 @@ public class TransportPutJobAction extends StreamableTransportMasterNodeAction

{ private final Client client; @@ -51,7 +53,7 @@ public class TransportRevertModelSnapshotAction extends StreamableTransportMaste JobManager jobManager, JobResultsProvider jobResultsProvider, ClusterService clusterService, Client client, JobDataCountsPersister jobDataCountsPersister) { super(RevertModelSnapshotAction.NAME, transportService, clusterService, threadPool, actionFilters, - indexNameExpressionResolver, RevertModelSnapshotAction.Request::new); + RevertModelSnapshotAction.Request::new, indexNameExpressionResolver); this.client = client; this.jobManager = jobManager; this.jobResultsProvider = jobResultsProvider; @@ -65,8 +67,8 @@ public class TransportRevertModelSnapshotAction extends StreamableTransportMaste } @Override - protected RevertModelSnapshotAction.Response newResponse() { - return new RevertModelSnapshotAction.Response(); + protected RevertModelSnapshotAction.Response read(StreamInput in) throws IOException { + return new RevertModelSnapshotAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportSetUpgradeModeAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportSetUpgradeModeAction.java index 5947e6490d6..0107bd2cfd6 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportSetUpgradeModeAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportSetUpgradeModeAction.java @@ -63,8 +63,8 @@ public class TransportSetUpgradeModeAction extends TransportMasterNodeAction { + TransportMasterNodeAction { private final Client client; private final DatafeedConfigProvider datafeedConfigProvider; @@ -49,8 +51,8 @@ public class TransportUpdateDatafeedAction extends ThreadPool threadPool, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, Client client, NamedXContentRegistry xContentRegistry) { - super(UpdateDatafeedAction.NAME, transportService, clusterService, threadPool, actionFilters, - indexNameExpressionResolver, UpdateDatafeedAction.Request::new); + super(UpdateDatafeedAction.NAME, transportService, clusterService, threadPool, actionFilters, UpdateDatafeedAction.Request::new, + indexNameExpressionResolver); this.client = client; this.datafeedConfigProvider = new DatafeedConfigProvider(client, xContentRegistry); @@ -64,8 +66,8 @@ public class TransportUpdateDatafeedAction extends } @Override - protected PutDatafeedAction.Response newResponse() { - return new PutDatafeedAction.Response(); + protected PutDatafeedAction.Response read(StreamInput in) throws IOException { + return new PutDatafeedAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java index 804f52e7a73..49d83886691 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java @@ -56,8 +56,7 @@ public class TransportUpdateFilterAction extends HandledTransportAction { +import java.io.IOException; + +public class TransportUpdateJobAction extends TransportMasterNodeAction { private final JobManager jobManager; @@ -28,8 +31,8 @@ public class TransportUpdateJobAction extends StreamableTransportMasterNodeActio public TransportUpdateJobAction(TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, JobManager jobManager) { - super(UpdateJobAction.NAME, transportService, clusterService, threadPool, actionFilters, - indexNameExpressionResolver, UpdateJobAction.Request::new); + super(UpdateJobAction.NAME, transportService, clusterService, threadPool, actionFilters, UpdateJobAction.Request::new, + indexNameExpressionResolver); this.jobManager = jobManager; } @@ -39,8 +42,8 @@ public class TransportUpdateJobAction extends StreamableTransportMasterNodeActio } @Override - protected PutJobAction.Response newResponse() { - return new PutJobAction.Response(); + protected PutJobAction.Response read(StreamInput in) throws IOException { + return new PutJobAction.Response(in); } @Override diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java index 1847159b9be..41908969745 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java @@ -42,7 +42,7 @@ public class TransportUpdateModelSnapshotAction extends HandledTransportAction