[ML] Remove duplicated test classes (elastic/x-pack-elasticsearch#1850)

Original commit: elastic/x-pack-elasticsearch@cb5a1b544a

plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.Action;
@@ -23,7 +22,6 @@ import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.inject.Inject;
@@ -32,7 +30,6 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.discovery.Discovery;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xpack.ml.MlMetadata;

plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteJobAction.java

@@ -38,8 +38,8 @@ import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xpack.ml.MachineLearning;
 import org.elasticsearch.xpack.ml.MlMetadata;
-import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.JobManager;
+import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.persistence.JobStorageDeletionTask;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData;

plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetDatafeedsAction.java

@@ -28,9 +28,9 @@ import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
+import org.elasticsearch.xpack.ml.MlMetadata;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
-import org.elasticsearch.xpack.ml.MlMetadata;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
 
 import java.io.IOException;

plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java

@@ -29,9 +29,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
+import org.elasticsearch.xpack.ml.MlMetadata;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedUpdate;
-import org.elasticsearch.xpack.ml.MlMetadata;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData;
 
 import java.io.IOException;

plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateJobAction.java

@@ -28,7 +28,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
-import org.elasticsearch.xpack.ml.MlMetadata;
 import org.elasticsearch.xpack.ml.job.JobManager;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.config.JobUpdate;

plugin/src/main/java/org/elasticsearch/xpack/ml/action/util/PageParams.java

@@ -5,18 +5,18 @@
  */
 package org.elasticsearch.xpack.ml.action.util;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class PageParams extends ToXContentToBytes implements Writeable {
+public class PageParams implements ToXContentObject, Writeable {
 
     public static final ParseField PAGE = new ParseField("page");
     public static final ParseField FROM = new ParseField("from");

plugin/src/main/java/org/elasticsearch/xpack/ml/action/util/QueryPage.java

@@ -6,12 +6,12 @@
 package org.elasticsearch.xpack.ml.action.util;
 
 import org.elasticsearch.ResourceNotFoundException;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
 
@@ -26,7 +26,7 @@ import java.util.Objects;
  * not be equal to the actual length of the {@linkplain #results()} list if from
  * & take or some cursor was used in the database query.
  */
-public final class QueryPage<T extends ToXContent & Writeable> extends ToXContentToBytes implements Writeable {
+public final class QueryPage<T extends ToXContent & Writeable> implements ToXContentObject, Writeable {
 
     public static final ParseField COUNT = new ParseField("count");
     public static final ParseField DEFAULT_RESULTS_FIELD = new ParseField("results_field");

plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/ChunkingConfig.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.datafeed;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -14,6 +13,7 @@ import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
@@ -25,7 +25,7 @@ import java.util.Objects;
 /**
  * The description of how searches should be chunked.
  */
-public class ChunkingConfig extends ToXContentToBytes implements Writeable {
+public class ChunkingConfig implements ToXContentObject, Writeable {
 
     public static final ParseField MODE_FIELD = new ParseField("mode");
     public static final ParseField TIME_SPAN_FIELD = new ParseField("time_span");

plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedConfig.java

@@ -15,7 +15,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.rounding.DateTimeUnit;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ObjectParser;
-import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit;
  * used around integral types and booleans so they can take <code>null</code>
  * values.
  */
-public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements ToXContent {
+public class DatafeedConfig extends AbstractDiffable<DatafeedConfig> implements ToXContentObject {
 
     // Used for QueryPage
     public static final ParseField RESULTS_FIELD = new ParseField("datafeeds");

plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManager.java

@@ -25,7 +25,6 @@ import org.elasticsearch.xpack.ml.action.StartDatafeedAction;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.config.JobState;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
-import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
 import org.elasticsearch.xpack.ml.notifications.Auditor;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData.PersistentTask;

plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedUpdate.java

@@ -13,7 +13,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ObjectParser;
-import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -34,7 +34,7 @@ import java.util.Objects;
  * The main difference between this class and {@link DatafeedConfig} is that here all
  * fields are nullable.
  */
-public class DatafeedUpdate implements Writeable, ToXContent {
+public class DatafeedUpdate implements Writeable, ToXContentObject {
 
     public static final ObjectParser<Builder, Void> PARSER = new ObjectParser<>("datafeed_update", Builder::new);
 

plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorFactory.java

@@ -12,15 +12,12 @@ import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.index.IndexNotFoundException;
-import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.extractor.DataExtractor;
 import org.elasticsearch.xpack.ml.datafeed.extractor.DataExtractorFactory;
-import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
+import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.utils.MlStrings;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 public class ScrollDataExtractorFactory implements DataExtractorFactory {

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/AnalysisConfig.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -13,6 +12,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
  * Object wrappers are used around integral types & booleans so they can take
  * <code>null</code> values.
  */
-public class AnalysisConfig extends ToXContentToBytes implements Writeable {
+public class AnalysisConfig implements ToXContentObject, Writeable {
     /**
      * Serialisation names
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/AnalysisLimits.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
@@ -24,7 +24,7 @@ import java.util.Objects;
  * <p>
  * If an option has not been set it shouldn't be used so the default value is picked up instead.
  */
-public class AnalysisLimits extends ToXContentToBytes implements Writeable {
+public class AnalysisLimits implements ToXContentObject, Writeable {
     /**
      * Serialisation field names
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Condition.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -27,7 +27,7 @@ import java.util.regex.PatternSyntaxException;
  * The {@linkplain Operator} enum defines the available
  * comparisons a condition can use.
  */
-public class Condition extends ToXContentToBytes implements Writeable {
+public class Condition implements ToXContentObject, Writeable {
     public static final ParseField CONDITION_FIELD = new ParseField("condition");
     public static final ParseField FILTER_VALUE_FIELD = new ParseField("value");
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Connective.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import java.io.IOException;
-import java.util.Locale;
-
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 
+import java.io.IOException;
+import java.util.Locale;
+
 public enum Connective implements Writeable {
     OR, AND;
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/DataDescription.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -35,7 +35,7 @@ import java.util.Objects;
  * delineated formats is {@value #DEFAULT_QUOTE_CHAR} but any other character can be
  * used.
  */
-public class DataDescription extends ToXContentToBytes implements Writeable {
+public class DataDescription implements ToXContentObject, Writeable {
     /**
      * Enum of the acceptable data formats.
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/DetectionRule.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -13,6 +12,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -26,7 +26,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class DetectionRule extends ToXContentToBytes implements Writeable {
+public class DetectionRule implements ToXContentObject, Writeable {
 
     public static final ParseField DETECTION_RULE_FIELD = new ParseField("detection_rule");
     public static final ParseField RULE_ACTION_FIELD = new ParseField("rule_action");

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Detector.java

@@ -7,13 +7,13 @@ package org.elasticsearch.xpack.ml.job.config;
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * <code>fieldname</code> must be set and only one of <code>byFieldName</code>
  * and <code>overFieldName</code> should be set.
  */
-public class Detector extends ToXContentToBytes implements Writeable {
+public class Detector implements ToXContentObject, Writeable {
 
     public enum ExcludeFrequent implements Writeable {
         ALL,

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Job.java

@@ -17,6 +17,7 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
 import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -42,7 +43,7 @@ import java.util.concurrent.TimeUnit;
  * data time fields are {@code null} until the job has seen some data or it is
  * finished respectively.
  */
-public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent {
+public class Job extends AbstractDiffable<Job> implements Writeable, ToXContentObject {
 
     public static final String TYPE = "job";
 
@@ -558,7 +559,7 @@ public class Job extends AbstractDiffable<Job> implements Writeable, ToXContent
         return compatibleTypes;
     }
 
-    public static class Builder implements Writeable, ToXContent  {
+    public static class Builder implements Writeable, ToXContentObject {
 
         private String id;
         private String jobType = ANOMALY_DETECTOR_JOB_TYPE;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobTaskStatus.java

@@ -82,6 +82,11 @@ public class JobTaskStatus implements Task.Status {
         out.writeLong(allocationId);
     }
 
+    @Override
+    public boolean isFragment() {
+        return false;
+    }
+
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/JobUpdate.java

@@ -14,6 +14,7 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
 
@@ -22,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-public class JobUpdate implements Writeable, ToXContent {
+public class JobUpdate implements Writeable, ToXContentObject {
     public static final ParseField DETECTORS = new ParseField("detectors");
 
     public static final ConstructingObjectParser<Builder, Void> PARSER = new ConstructingObjectParser<>(

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/MlFilter.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-public class MlFilter extends ToXContentToBytes implements Writeable {
+public class MlFilter implements ToXContentObject, Writeable {
 
     public static final String DOCUMENT_ID_PREFIX = "filter_";
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/ModelPlotConfig.java

@@ -5,18 +5,18 @@
  */
 package org.elasticsearch.xpack.ml.job.config;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class ModelPlotConfig extends ToXContentToBytes implements Writeable {
+public class ModelPlotConfig implements ToXContentObject, Writeable {
 
     private static final ParseField TYPE_FIELD = new ParseField("model_plot_config");
     private static final ParseField ENABLED_FIELD = new ParseField("enabled");

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Operator.java

@@ -9,12 +9,9 @@ import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.xpack.ml.job.messages.Messages;
 
 import java.io.IOException;
-import java.util.EnumSet;
 import java.util.Locale;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/RuleCondition.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.config;
 
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.EnumSet;
 import java.util.Objects;
 
-public class RuleCondition extends ToXContentToBytes implements Writeable {
+public class RuleCondition implements ToXContentObject, Writeable {
     public static final ParseField CONDITION_TYPE_FIELD = new ParseField("condition_type");
     public static final ParseField RULE_CONDITION_FIELD = new ParseField("rule_condition");
     public static final ParseField FIELD_NAME_FIELD = new ParseField("field_name");

plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/RuleConditionType.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.config;
 
 
-import java.io.IOException;
-import java.util.Locale;
-
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 
+import java.io.IOException;
+import java.util.Locale;
+
 public enum RuleConditionType implements Writeable {
     CATEGORICAL,
     NUMERICAL_ACTUAL,

plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/BucketsQueryBuilder.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.ml.job.persistence;
 
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.xpack.ml.job.results.Bucket;
 import org.elasticsearch.xpack.ml.job.results.Result;
 
 import java.util.Objects;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobStorageDeletionTask.java

@@ -10,10 +10,6 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.reindex.BulkByScrollResponse;
-import org.elasticsearch.index.reindex.DeleteByQueryAction;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.Client;
@@ -23,7 +19,11 @@ import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.query.ConstantScoreQueryBuilder;
+import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
+import org.elasticsearch.index.reindex.BulkByScrollResponse;
+import org.elasticsearch.index.reindex.DeleteByQueryAction;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.rest.action.admin.indices.AliasesNotFoundException;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.tasks.Task;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/DataCountsReporter.java

@@ -11,9 +11,9 @@ import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.persistence.JobDataCountsPersister;
+import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 
 import java.util.Date;
 import java.util.Locale;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectBuilder.java

@@ -10,15 +10,15 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.xpack.ml.job.config.AnalysisLimits;
 import org.elasticsearch.xpack.ml.job.config.Job;
+import org.elasticsearch.xpack.ml.job.config.MlFilter;
 import org.elasticsearch.xpack.ml.job.config.ModelPlotConfig;
 import org.elasticsearch.xpack.ml.job.process.NativeController;
 import org.elasticsearch.xpack.ml.job.process.ProcessCtrl;
 import org.elasticsearch.xpack.ml.job.process.ProcessPipes;
+import org.elasticsearch.xpack.ml.job.process.autodetect.state.Quantiles;
 import org.elasticsearch.xpack.ml.job.process.autodetect.writer.AnalysisLimitsWriter;
 import org.elasticsearch.xpack.ml.job.process.autodetect.writer.FieldConfigWriter;
 import org.elasticsearch.xpack.ml.job.process.autodetect.writer.ModelPlotConfigWriter;
-import org.elasticsearch.xpack.ml.job.process.autodetect.state.Quantiles;
-import org.elasticsearch.xpack.ml.job.config.MlFilter;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectCommunicator.java

@@ -19,7 +19,6 @@ import org.elasticsearch.xpack.ml.job.config.DataDescription;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.config.JobUpdate;
 import org.elasticsearch.xpack.ml.job.config.ModelPlotConfig;
-import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
 import org.elasticsearch.xpack.ml.job.persistence.StateStreamer;
 import org.elasticsearch.xpack.ml.job.process.CountingInputStream;
 import org.elasticsearch.xpack.ml.job.process.DataCountsReporter;
@@ -35,7 +34,6 @@ import org.elasticsearch.xpack.ml.job.process.autodetect.writer.DataToProcessWri
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.List;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcess.java

@@ -7,9 +7,7 @@ package org.elasticsearch.xpack.ml.job.process.autodetect;
 
 import org.elasticsearch.xpack.ml.job.config.DetectionRule;
 import org.elasticsearch.xpack.ml.job.config.ModelPlotConfig;
-import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
 import org.elasticsearch.xpack.ml.job.persistence.StateStreamer;
-import org.elasticsearch.xpack.ml.job.process.NativeController;
 import org.elasticsearch.xpack.ml.job.process.autodetect.params.DataLoadParams;
 import org.elasticsearch.xpack.ml.job.process.autodetect.params.InterimResultsParams;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessFactory.java

@@ -6,9 +6,9 @@
 package org.elasticsearch.xpack.ml.job.process.autodetect;
 
 import org.elasticsearch.xpack.ml.job.config.Job;
+import org.elasticsearch.xpack.ml.job.config.MlFilter;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.Quantiles;
-import org.elasticsearch.xpack.ml.job.config.MlFilter;
 
 import java.util.Set;
 import java.util.concurrent.ExecutorService;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/FlushAcknowledgement.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.output;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -19,7 +19,7 @@ import java.util.Objects;
 /**
  * Simple class to parse and store a flush ID.
  */
-public class FlushAcknowledgement extends ToXContentToBytes implements Writeable {
+public class FlushAcknowledgement implements ToXContentObject, Writeable {
     /**
      * Field Names
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/StateProcessor.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.output;
 
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.bytes.BytesArray;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/state/DataCounts.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.state;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -34,7 +34,7 @@ import java.util.Objects;
  * so the field is visible.
  */
 
-public class DataCounts extends ToXContentToBytes implements Writeable {
+public class DataCounts implements ToXContentObject, Writeable {
 
     private static final String DOCUMENT_SUFFIX = "_data_counts";
     public static final String PROCESSED_RECORD_COUNT_STR = "processed_record_count";

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/state/ModelSizeStats.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.state;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -26,7 +26,7 @@ import java.util.Objects;
 /**
  * Provide access to the C++ model memory usage numbers for the Java process.
  */
-public class ModelSizeStats extends ToXContentToBytes implements Writeable {
+public class ModelSizeStats implements ToXContentObject, Writeable {
 
     /**
      * Result type

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/state/ModelSnapshot.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.ml.job.process.autodetect.state;
 
 import org.elasticsearch.ElasticsearchParseException;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -15,6 +14,7 @@ import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -32,7 +32,7 @@ import java.util.Objects;
 /**
  * ModelSnapshot Result POJO
  */
-public class ModelSnapshot extends ToXContentToBytes implements Writeable {
+public class ModelSnapshot implements ToXContentObject, Writeable {
     /**
      * Field Names
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/state/Quantiles.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.state;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.job.config.Job;
 
@@ -22,7 +22,7 @@ import java.util.Objects;
 /**
  * Quantiles Result POJO
  */
-public class Quantiles extends ToXContentToBytes implements Writeable {
+public class Quantiles implements ToXContentObject, Writeable {
 
     /**
      * Field Names

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AbstractDataToProcessWriter.java

@@ -19,7 +19,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/AnalysisLimitsWriter.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.writer;
 
+import org.elasticsearch.xpack.ml.job.config.AnalysisLimits;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.Objects;
 
-import org.elasticsearch.xpack.ml.job.config.AnalysisLimits;
-
 import static org.elasticsearch.xpack.ml.job.process.autodetect.writer.WriterConstants.EQUALS;
 import static org.elasticsearch.xpack.ml.job.process.autodetect.writer.WriterConstants.NEW_LINE;
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/CsvRecordWriter.java

@@ -5,16 +5,15 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.writer;
 
-import java.io.IOException;
+import org.supercsv.io.CsvListWriter;
+import org.supercsv.prefs.CsvPreference;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import org.supercsv.io.CsvListWriter;
-import org.supercsv.prefs.CsvPreference;
-
 /**
  * Write the records to the outputIndex stream as UTF 8 encoded CSV
  */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/FieldConfigWriter.java

@@ -5,7 +5,17 @@
  */
 package org.elasticsearch.xpack.ml.job.process.autodetect.writer;
 
-import static org.elasticsearch.xpack.ml.job.process.autodetect.writer.WriterConstants.EQUALS;
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.xpack.ml.job.config.AnalysisConfig;
+import org.elasticsearch.xpack.ml.job.config.DefaultDetectorDescription;
+import org.elasticsearch.xpack.ml.job.config.DetectionRule;
+import org.elasticsearch.xpack.ml.job.config.Detector;
+import org.elasticsearch.xpack.ml.job.config.MlFilter;
+import org.elasticsearch.xpack.ml.utils.MlStrings;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -13,18 +23,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.logging.log4j.Logger;
+import static org.elasticsearch.xpack.ml.job.process.autodetect.writer.WriterConstants.EQUALS;
-
-import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.xpack.ml.job.config.AnalysisConfig;
-import org.elasticsearch.xpack.ml.job.config.Detector;
-import org.elasticsearch.xpack.ml.job.config.DefaultDetectorDescription;
-import org.elasticsearch.xpack.ml.job.config.DetectionRule;
-import org.elasticsearch.xpack.ml.job.config.MlFilter;
-import org.elasticsearch.xpack.ml.utils.MlStrings;
 
 public class FieldConfigWriter {
     private static final String DETECTOR_PREFIX = "detector.";

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/XContentRecordReader.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.ml.job.process.autodetect.writer;
 
 import com.fasterxml.jackson.core.JsonParseException;
-
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.xcontent.XContentParser;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/logging/CppLogMessage.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.process.logging;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.util.Objects;
 /**
  * Provide access to the C++ log messages that arrive via a named pipe in JSON format.
  */
-public class CppLogMessage extends ToXContentToBytes implements Writeable {
+public class CppLogMessage implements ToXContentObject, Writeable {
     /**
      * Field Names (these are defined by log4cxx; we have no control over them)
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/NativeNormalizerProcess.java

@@ -10,8 +10,8 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
-import org.elasticsearch.xpack.ml.job.process.logging.CppLogMessageHandler;
 import org.elasticsearch.xpack.ml.job.process.autodetect.writer.LengthEncodedWriter;
+import org.elasticsearch.xpack.ml.job.process.logging.CppLogMessageHandler;
 import org.elasticsearch.xpack.ml.job.process.normalizer.output.NormalizerResultHandler;
 import org.elasticsearch.xpack.ml.utils.ExceptionsHelper;
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/NormalizerResult.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.process.normalizer;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.util.Objects;
  *
  * {"probability":0.01,"normalized_score":2.2}
  */
-public class NormalizerResult extends ToXContentToBytes implements Writeable {
+public class NormalizerResult implements ToXContentObject, Writeable {
     static final ParseField LEVEL_FIELD = new ParseField("level");
     static final ParseField PARTITION_FIELD_NAME_FIELD = new ParseField("partition_field_name");
     static final ParseField PARTITION_FIELD_VALUE_FIELD = new ParseField("partition_field_value");

plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/noop/NoOpRenormalizer.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.job.process.normalizer.noop;
 
-import org.elasticsearch.xpack.ml.job.process.normalizer.Renormalizer;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.Quantiles;
+import org.elasticsearch.xpack.ml.job.process.normalizer.Renormalizer;
 
 /**
  * A {@link Renormalizer} implementation that does absolutely nothing

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyCause.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.results;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.util.Objects;
  * Anomaly Cause POJO.
  * Used as a nested level inside population anomaly records.
  */
-public class AnomalyCause extends ToXContentToBytes implements Writeable {
+public class AnomalyCause implements ToXContentObject, Writeable {
     public static final ParseField ANOMALY_CAUSE = new ParseField("anomaly_cause");
     /**
      * Result fields

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AnomalyRecord.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -14,6 +13,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Detector;
@@ -35,7 +35,7 @@ import java.util.Objects;
  * Uses the object wrappers Boolean and Double so <code>null</code> values
  * can be returned if the members have not been set.
  */
-public class AnomalyRecord extends ToXContentToBytes implements Writeable {
+public class AnomalyRecord implements ToXContentObject, Writeable {
 
     /**
      * Result type

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/AutodetectResult.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.job.results;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.job.process.autodetect.output.FlushAcknowledgement;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSizeStats;
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
-public class AutodetectResult extends ToXContentToBytes implements Writeable {
+public class AutodetectResult implements ToXContentObject, Writeable {
 
     public static final ParseField TYPE = new ParseField("autodetect_result");
 

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Bucket.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -30,7 +30,7 @@ import java.util.Optional;
 /**
  * Bucket Result POJO
  */
-public class Bucket extends ToXContentToBytes implements Writeable {
+public class Bucket implements ToXContentObject, Writeable {
     /*
      * Field Names
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/BucketInfluencer.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
 
-public class BucketInfluencer extends ToXContentToBytes implements Writeable {
+public class BucketInfluencer implements ToXContentObject, Writeable {
     /**
      * Result type
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/CategoryDefinition.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.results;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.ml.job.config.Job;
 
@@ -22,7 +22,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
-public class CategoryDefinition extends ToXContentToBytes implements Writeable {
+public class CategoryDefinition implements ToXContentObject, Writeable {
 
     /**
      * Legacy type, now used only as a discriminant in the document ID

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influence.java

@@ -5,12 +5,12 @@
  */
 package org.elasticsearch.xpack.ml.job.results;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.util.Objects;
 /**
  * Influence field name and list of influence field values/score pairs
  */
-public class Influence extends ToXContentToBytes implements Writeable {
+public class Influence implements ToXContentObject, Writeable {
 
     /**
      * Note all publicly exposed field names are "influencer" not "influence"

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/Influencer.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
 
-public class Influencer extends ToXContentToBytes implements Writeable {
+public class Influencer implements ToXContentObject, Writeable {
     /**
      * Result type
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ModelPlot.java

@@ -6,13 +6,13 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -25,7 +25,7 @@ import java.util.Objects;
 /**
  * Model Plot POJO.
  */
-public class ModelPlot extends ToXContentToBytes implements Writeable {
+public class ModelPlot implements ToXContentObject, Writeable {
     /**
      * Result type
      */

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/PartitionScore.java

@@ -5,18 +5,18 @@
  */
 package org.elasticsearch.xpack.ml.job.results;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class PartitionScore extends ToXContentToBytes implements Writeable {
+public class PartitionScore implements ToXContentObject, Writeable {
     public static final ParseField PARTITION_SCORE = new ParseField("partition_score");
 
     private final String partitionFieldValue;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/results/ReservedFieldNames.java

@@ -6,11 +6,11 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.xpack.ml.job.config.Detector;
-import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 import org.elasticsearch.xpack.ml.job.config.Job;
+import org.elasticsearch.xpack.ml.job.persistence.ElasticsearchMappings;
+import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSizeStats;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot;
-import org.elasticsearch.xpack.ml.job.persistence.ElasticsearchMappings;
 
 import java.util.Arrays;
 import java.util.HashSet;

plugin/src/main/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemover.java

@@ -7,15 +7,15 @@ package org.elasticsearch.xpack.ml.job.retention;
 
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.index.reindex.BulkByScrollResponse;
-import org.elasticsearch.index.reindex.DeleteByQueryAction;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.BulkByScrollResponse;
+import org.elasticsearch.index.reindex.DeleteByQueryAction;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.messages.Messages;

plugin/src/main/java/org/elasticsearch/xpack/ml/notifications/AuditMessage.java

@@ -5,13 +5,13 @@
  */
 package org.elasticsearch.xpack.ml.notifications;
 
-import org.elasticsearch.action.support.ToXContentToBytes;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser.ValueType;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
 
-public class AuditMessage extends ToXContentToBytes implements Writeable {
+public class AuditMessage implements ToXContentObject, Writeable {
     public static final ParseField TYPE = new ParseField("audit_message");
 
     public static final ParseField MESSAGE = new ParseField("message");

plugin/src/test/java/org/elasticsearch/xpack/ml/MlMetadataTests.java

@@ -8,14 +8,19 @@ package org.elasticsearch.xpack.ml;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.ResourceAlreadyExistsException;
 import org.elasticsearch.ResourceNotFoundException;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.search.SearchModule;
+import org.elasticsearch.test.AbstractSerializingTestCase;
 import org.elasticsearch.xpack.ml.action.OpenJobAction;
 import org.elasticsearch.xpack.ml.action.StartDatafeedAction;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
@@ -26,7 +31,6 @@ import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.config.JobState;
 import org.elasticsearch.xpack.ml.job.config.JobTaskStatus;
 import org.elasticsearch.xpack.ml.job.config.JobTests;
-import org.elasticsearch.xpack.ml.support.AbstractSerializingTestCase;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData;
 
 import java.io.IOException;
@@ -74,22 +78,20 @@ public class MlMetadataTests extends AbstractSerializingTestCase<MlMetadata> {
     }
 
     @Override
-    protected MlMetadata parseInstance(XContentParser parser) {
+    protected MlMetadata doParseInstance(XContentParser parser) {
         return MlMetadata.ML_METADATA_PARSER.apply(parser, null).build();
     }
 
     @Override
-    protected XContentBuilder toXContent(MlMetadata instance, XContentType contentType) throws IOException {
+    protected NamedWriteableRegistry getNamedWriteableRegistry() {
-        XContentBuilder builder = XContentFactory.contentBuilder(contentType);
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
-        if (randomBoolean()) {
+        return new NamedWriteableRegistry(searchModule.getNamedWriteables());
-            builder.prettyPrint();
     }
-        // In Metadata.Builder#toXContent(...) custom metadata always gets wrapped in an start and end object,
+
-        // so we simulate that here. The MlMetadata depends on that as it direct starts to write a start array.
+    @Override
-        builder.startObject();
+    protected NamedXContentRegistry xContentRegistry() {
-        instance.toXContent(builder, ToXContent.EMPTY_PARAMS);
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
-        builder.endObject();
+        return new NamedXContentRegistry(searchModule.getNamedXContents());
-        return builder;
     }
 
     public void testPutJob() {

plugin/src/test/java/org/elasticsearch/xpack/ml/action/CloseJobActionRequestTests.java

@@ -19,6 +19,7 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.tasks.Task;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xpack.ml.MlMetadata;
@@ -26,7 +27,6 @@ import org.elasticsearch.xpack.ml.action.CloseJobAction.Request;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedState;
 import org.elasticsearch.xpack.ml.job.config.JobState;
 import org.elasticsearch.xpack.ml.notifications.Auditor;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.support.BaseMlIntegTestCase;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData;
 import org.elasticsearch.xpack.persistent.PersistentTasksCustomMetaData.Assignment;
@@ -64,7 +64,7 @@ public class CloseJobActionRequestTests extends AbstractStreamableXContentTestCa
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return Request.parseRequest(null, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/CloseJobActionResponseTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.CloseJobAction.Response;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class CloseJobActionResponseTests extends AbstractStreamableTestCase<Response> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedRequestTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.DeleteDatafeedAction.Request;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class DeleteDatafeedRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/DeleteExpiredDataActionResponseTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.DeleteExpiredDataAction.Response;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class DeleteExpiredDataActionResponseTests extends AbstractStreamableTestCase<Response> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/DeleteJobRequestTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.DeleteJobAction.Request;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class DeleteJobRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetBucketActionRequestTests.java

@@ -6,11 +6,11 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.GetBucketsAction.Request;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
-public class GetBucketActionRequestTests extends AbstractStreamableXContentTestCase<GetBucketsAction.Request> {
+public class GetBucketActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
     @Override
     protected Request createTestInstance() {
@@ -57,7 +57,7 @@ public class GetBucketActionRequestTests extends AbstractStreamableXContentTestC
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return GetBucketsAction.Request.parseRequest(null, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetBucketActionResponseTests.java

@@ -5,20 +5,20 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetBucketsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.results.AnomalyRecord;
 import org.elasticsearch.xpack.ml.job.results.Bucket;
 import org.elasticsearch.xpack.ml.job.results.BucketInfluencer;
 import org.elasticsearch.xpack.ml.job.results.PartitionScore;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-public class GetBucketActionResponseTests extends AbstractStreamableTestCase<GetBucketsAction.Response> {
+public class GetBucketActionResponseTests extends AbstractStreamableTestCase<Response> {
 
     @Override
     protected Response createTestInstance() {

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetCategoriesRequestTests.java

@@ -6,8 +6,8 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
 public class GetCategoriesRequestTests extends AbstractStreamableXContentTestCase<GetCategoriesAction.Request> {
 
@@ -32,7 +32,7 @@ public class GetCategoriesRequestTests extends AbstractStreamableXContentTestCas
     }
 
     @Override
-    protected GetCategoriesAction.Request parseInstance(XContentParser parser) {
+    protected GetCategoriesAction.Request doParseInstance(XContentParser parser) {
         return GetCategoriesAction.Request.parseRequest(null, parser);
     }
 }

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetCategoriesResponseTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.results.CategoryDefinition;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.Collections;
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetDatafeedStatsActionRequestTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetDatafeedsStatsAction.Request;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class GetDatafeedStatsActionRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetDatafeedStatsActionResponseTests.java

@@ -8,11 +8,11 @@ package org.elasticsearch.xpack.ml.action;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetDatafeedsStatsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedState;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.net.InetAddress;
 import java.util.ArrayList;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetDatafeedsActionRequestTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetDatafeedsAction.Request;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class GetDatafeedsActionRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetDatafeedsActionResponseTests.java

@@ -5,13 +5,17 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.search.SearchModule;
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetDatafeedsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfigTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class GetDatafeedsActionResponseTests extends AbstractStreamableTestCase<Response> {
@@ -30,4 +34,10 @@ public class GetDatafeedsActionResponseTests extends AbstractStreamableTestCase<
     protected Response createBlankInstance() {
         return new Response();
     }
+
+    @Override
+    protected NamedWriteableRegistry getNamedWriteableRegistry() {
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
+        return new NamedWriteableRegistry(searchModule.getNamedWriteables());
+    }
 }

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetFiltersActionRequestTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetFiltersAction.Request;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class GetFiltersActionRequestTests extends AbstractStreamableTestCase<GetFiltersAction.Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetFiltersActionResponseTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetFiltersAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.config.MlFilter;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.Collections;
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetInfluencersActionRequestTests.java

@@ -6,14 +6,14 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.GetInfluencersAction.Request;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
-public class GetInfluencersActionRequestTests extends AbstractStreamableXContentTestCase<GetInfluencersAction.Request> {
+public class GetInfluencersActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return GetInfluencersAction.Request.parseRequest(null, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetInfluencersActionResponseTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetInfluencersAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.results.Influencer;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
 import java.util.Date;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetJobStatsActionRequestTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetJobsStatsAction.Request;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class GetJobStatsActionRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetJobStatsActionResponseTests.java

@@ -9,6 +9,7 @@ import org.elasticsearch.Version;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetJobsStatsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.config.Job;
@@ -16,7 +17,6 @@ import org.elasticsearch.xpack.ml.job.config.JobState;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCountsTests;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSizeStats;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.net.InetAddress;
 import java.util.ArrayList;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetJobsActionRequestTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetJobsAction.Request;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class GetJobsActionRequestTests extends AbstractStreamableTestCase<GetJobsAction.Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetJobsActionResponseTests.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetJobsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.config.Job;
 import org.elasticsearch.xpack.ml.job.config.JobTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
 import java.util.List;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetJobsStatsActionTests.java

@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Optional;
 
 import static org.elasticsearch.xpack.ml.action.GetJobsStatsAction.TransportAction.determineNonDeletedJobIdsWithoutLiveStats;
-
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsActionRequestTests.java

@@ -6,14 +6,14 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.GetModelSnapshotsAction.Request;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
-public class GetModelSnapshotsActionRequestTests extends AbstractStreamableXContentTestCase<GetModelSnapshotsAction.Request> {
+public class GetModelSnapshotsActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return GetModelSnapshotsAction.Request.parseRequest(null, null, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetModelSnapshotsActionResponseTests.java

@@ -5,11 +5,11 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetModelSnapshotsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshotTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
 import java.util.List;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetRecordsActionRequestTests.java

@@ -6,14 +6,14 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.GetRecordsAction.Request;
 import org.elasticsearch.xpack.ml.action.util.PageParams;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
-public class GetRecordsActionRequestTests extends AbstractStreamableXContentTestCase<GetRecordsAction.Request> {
+public class GetRecordsActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return GetRecordsAction.Request.parseRequest(null, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/GetRecordsActionResponseTests.java

@@ -5,10 +5,10 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.GetRecordsAction.Response;
 import org.elasticsearch.xpack.ml.action.util.QueryPage;
 import org.elasticsearch.xpack.ml.job.results.AnomalyRecord;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.ArrayList;
 import java.util.Date;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/OpenJobActionRequestTests.java

@@ -7,8 +7,8 @@ package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.OpenJobAction.Request;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
 public class OpenJobActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
@@ -30,7 +30,7 @@ public class OpenJobActionRequestTests extends AbstractStreamableXContentTestCas
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return Request.parseRequest(null, parser);
     }
 }

plugin/src/test/java/org/elasticsearch/xpack/ml/action/OpenJobActionTests.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.Version;

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PostDataActionRequestTests.java

@@ -7,9 +7,9 @@ package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.job.config.DataDescription;
 import org.elasticsearch.xpack.ml.job.config.DataDescription.DataFormat;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class PostDataActionRequestTests extends AbstractStreamableTestCase<PostDataAction.Request> {
     @Override

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PostDataActionResponseTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCounts;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.DataCountsTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class PostDataActionResponseTests extends AbstractStreamableTestCase<PostDataAction.Response> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PostDataFlushRequestTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.FlushJobAction.Request;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class PostDataFlushRequestTests extends AbstractStreamableTestCase<Request> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PostDataFlushResponseTests.java

@@ -5,8 +5,8 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.FlushJobAction.Response;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 public class PostDataFlushResponseTests extends AbstractStreamableTestCase<Response> {
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutDatafeedActionRequestTests.java

@@ -5,14 +5,19 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+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.xpack.ml.action.PutDatafeedAction.Request;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfigTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 import org.junit.Before;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 public class PutDatafeedActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
@@ -37,8 +42,19 @@ public class PutDatafeedActionRequestTests extends AbstractStreamableXContentTes
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return Request.parseRequest(datafeedId, parser);
     }
 
+    @Override
+    protected NamedWriteableRegistry getNamedWriteableRegistry() {
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
+        return new NamedWriteableRegistry(searchModule.getNamedWriteables());
+    }
+
+    @Override
+    protected NamedXContentRegistry xContentRegistry() {
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
+        return new NamedXContentRegistry(searchModule.getNamedXContents());
+    }
 }

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutDatafeedActionResponseTests.java

@@ -5,12 +5,16 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.search.SearchModule;
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.PutDatafeedAction.Response;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfig;
 import org.elasticsearch.xpack.ml.datafeed.DatafeedConfigTests;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 public class PutDatafeedActionResponseTests extends AbstractStreamableTestCase<Response> {
 
@@ -28,4 +32,9 @@ public class PutDatafeedActionResponseTests extends AbstractStreamableTestCase<R
         return new Response();
     }
 
+    @Override
+    protected NamedWriteableRegistry getNamedWriteableRegistry() {
+        SearchModule searchModule = new SearchModule(Settings.EMPTY, false, Collections.emptyList());
+        return new NamedWriteableRegistry(searchModule.getNamedWriteables());
+    }
 }

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutFilterActionRequestTests.java

@@ -6,14 +6,14 @@
 package org.elasticsearch.xpack.ml.action;
 
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.PutFilterAction.Request;
 import org.elasticsearch.xpack.ml.job.config.MlFilter;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class PutFilterActionRequestTests extends AbstractStreamableXContentTestCase<PutFilterAction.Request> {
+public class PutFilterActionRequestTests extends AbstractStreamableXContentTestCase<Request> {
 
     private final String filterId = randomAlphaOfLengthBetween(1, 20);
 
@@ -34,7 +34,7 @@ public class PutFilterActionRequestTests extends AbstractStreamableXContentTestC
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return PutFilterAction.Request.parseRequest(filterId, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutJobActionRequestTests.java

@@ -10,9 +10,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.test.AbstractStreamableXContentTestCase;
 import org.elasticsearch.xpack.ml.action.PutJobAction.Request;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableXContentTestCase;
 
 import java.io.IOException;
 import java.util.Date;
@@ -36,7 +36,7 @@ public class PutJobActionRequestTests extends AbstractStreamableXContentTestCase
     }
 
     @Override
-    protected Request parseInstance(XContentParser parser) {
+    protected Request doParseInstance(XContentParser parser) {
         return Request.parseRequest(jobId, parser);
     }
 

plugin/src/test/java/org/elasticsearch/xpack/ml/action/PutJobActionResponseTests.java

@@ -5,9 +5,9 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
+import org.elasticsearch.test.AbstractStreamableTestCase;
 import org.elasticsearch.xpack.ml.action.PutJobAction.Response;
 import org.elasticsearch.xpack.ml.job.config.Job;
-import org.elasticsearch.xpack.ml.support.AbstractStreamableTestCase;
 
 import static org.elasticsearch.xpack.ml.job.config.JobTests.buildJobBuilder;
 import static org.elasticsearch.xpack.ml.job.config.JobTests.randomValidJobId;