Fix mappings and test

Author: davidkyle

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappings.java

@@ -216,14 +216,16 @@ public static void addJobConfigFields(XContentBuilder builder) throws IOExceptio
                                 .endObject()
                                 .startObject(DetectionRule.CONDITIONS_FIELD.getPreferredName())
                                     .field(TYPE, NESTED)
-                                    .startObject(RuleCondition.APPLIES_TO_FIELD.getPreferredName())
-                                        .field(TYPE, KEYWORD)
-                                    .endObject()
-                                    .startObject(Operator.OPERATOR_FIELD.getPreferredName())
-                                        .field(TYPE, KEYWORD)
-                                    .endObject()
-                                    .startObject(RuleCondition.VALUE_FIELD.getPreferredName())
-                                        .field(TYPE, DOUBLE)
+                                    .startObject(PROPERTIES)
+                                        .startObject(RuleCondition.APPLIES_TO_FIELD.getPreferredName())
+                                            .field(TYPE, KEYWORD)
+                                        .endObject()
+                                        .startObject(Operator.OPERATOR_FIELD.getPreferredName())
+                                            .field(TYPE, KEYWORD)
+                                        .endObject()
+                                        .startObject(RuleCondition.VALUE_FIELD.getPreferredName())
+                                            .field(TYPE, DOUBLE)
+                                        .endObject()
                                     .endObject()
                                 .endObject()
                             .endObject()

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/ReservedFieldNames.java

@@ -198,7 +198,6 @@ public final class ReservedFieldNames {
             Job.RESULTS_RETENTION_DAYS.getPreferredName(),
             Job.MODEL_SNAPSHOT_ID.getPreferredName(),
             Job.RESULTS_INDEX_NAME.getPreferredName(),
-            Job.DELETED.getPreferredName(),
 
             AnalysisConfig.BUCKET_SPAN.getPreferredName(),
             AnalysisConfig.CATEGORIZATION_FIELD_NAME.getPreferredName(),

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/results/ReservedFieldNamesTests.java

@@ -6,7 +6,6 @@
 package org.elasticsearch.xpack.ml.job.results;
 
 import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.xpack.core.ml.job.config.Job;
 import org.elasticsearch.xpack.core.ml.job.results.AnomalyRecord;
 import org.elasticsearch.xpack.core.ml.job.results.ReservedFieldNames;