diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/AbstractAucRoc.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/AbstractAucRoc.java index e6c008493b4b8..7e470cfbc276c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/AbstractAucRoc.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/AbstractAucRoc.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification; -import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -246,11 +245,7 @@ public Result(double score, Long docCount, List curve) { public Result(StreamInput in) throws IOException { this.score = in.readDouble(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { - this.docCount = in.readOptionalLong(); - } else { - this.docCount = null; - } + this.docCount = in.readOptionalLong(); this.curve = in.readList(AucRocPoint::new); } @@ -279,9 +274,7 @@ public String getMetricName() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeDouble(score); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { - out.writeOptionalLong(docCount); - } + out.writeOptionalLong(docCount); out.writeList(curve); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/Classification.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/Classification.java index 0edbc0bf1375e..680cda5396779 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/Classification.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/classification/Classification.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.xpack.core.ml.dataframe.evaluation.classification; -import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -97,18 +96,14 @@ private static List defaultMetrics() { } public Classification(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { - this.fields = - new EvaluationFields( - in.readString(), - in.readOptionalString(), - in.readOptionalString(), - in.readOptionalString(), - in.readOptionalString(), - true); - } else { - this.fields = new EvaluationFields(in.readString(), in.readString(), null, null, null, true); - } + this.fields = + new EvaluationFields( + in.readString(), + in.readOptionalString(), + in.readOptionalString(), + in.readOptionalString(), + in.readOptionalString(), + true); this.metrics = in.readNamedWriteableList(EvaluationMetric.class); } @@ -135,14 +130,10 @@ public String getWriteableName() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(fields.getActualField()); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { - out.writeOptionalString(fields.getPredictedField()); - out.writeOptionalString(fields.getTopClassesField()); - out.writeOptionalString(fields.getPredictedClassField()); - out.writeOptionalString(fields.getPredictedProbabilityField()); - } else { - out.writeString(fields.getPredictedField()); - } + out.writeOptionalString(fields.getPredictedField()); + out.writeOptionalString(fields.getTopClassesField()); + out.writeOptionalString(fields.getPredictedClassField()); + out.writeOptionalString(fields.getPredictedProbabilityField()); out.writeNamedWriteableList(metrics); }