From 7cb489166456874271827b1c2089ab90d51186a6 Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Fri, 15 Jun 2018 10:48:45 +0100 Subject: [PATCH] Add comment and remove unused imports --- .../elasticsearch/xpack/core/ml/job/config/DetectionRule.java | 1 - .../org/elasticsearch/xpack/core/ml/job/config/Operator.java | 2 -- .../rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java index bd48dd277b395..4b3a87d1ef1d4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java @@ -18,7 +18,6 @@ import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.EnumMap; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Operator.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Operator.java index bfe9b0e3589ba..ee156847d063b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Operator.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Operator.java @@ -12,8 +12,6 @@ import java.io.IOException; import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Enum representing logical comparisons on doubles diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml index 3a90a0e3a894b..53ea8d757fe9f 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml @@ -175,7 +175,7 @@ - skip: version: " - 6.1.99" - reason: "Rules replaced by custom_rules on 6.4.0" + reason: "This creates a job with the same name as the rules job to ensure that job is not missing in the upgraded cluster; also some of the rule fields were deprecated in 6.2 so we using the dummy from 6.2 onwards" - do: xpack.ml.put_job: