浏览代码

[ML] Remove unnecessary BWC constants (#58002)

After merging #58001 the BWC constants added in #57978 are no
longer needed.
David Roberts 5 年之前
父节点
当前提交
990ce0dc08

+ 2 - 9
x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/results/AutodetectResult.java

@@ -5,7 +5,6 @@
  */
  */
 package org.elasticsearch.xpack.ml.job.results;
 package org.elasticsearch.xpack.ml.job.results;
 
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -143,11 +142,7 @@ public class AutodetectResult implements ToXContentObject, Writeable {
         } else {
         } else {
             this.categoryDefinition = null;
             this.categoryDefinition = null;
         }
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
-            this.categorizerStats = in.readOptionalWriteable(CategorizerStats::new);
-        } else {
-            this.categorizerStats = null;
-        }
+        this.categorizerStats = in.readOptionalWriteable(CategorizerStats::new);
         if (in.readBoolean()) {
         if (in.readBoolean()) {
             this.flushAcknowledgement = new FlushAcknowledgement(in);
             this.flushAcknowledgement = new FlushAcknowledgement(in);
         } else {
         } else {
@@ -176,9 +171,7 @@ public class AutodetectResult implements ToXContentObject, Writeable {
         writeNullable(modelPlot, out);
         writeNullable(modelPlot, out);
         writeNullable(annotation, out);
         writeNullable(annotation, out);
         writeNullable(categoryDefinition, out);
         writeNullable(categoryDefinition, out);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
-            out.writeOptionalWriteable(categorizerStats);
-        }
+        out.writeOptionalWriteable(categorizerStats);
         writeNullable(flushAcknowledgement, out);
         writeNullable(flushAcknowledgement, out);
         writeNullable(forecast, out);
         writeNullable(forecast, out);
         writeNullable(forecastRequestStats, out);
         writeNullable(forecastRequestStats, out);