From 2a33afee1ddf63e71d6b483b61cc6643115dad49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <cbuescher@posteo.de>
Date: Thu, 13 Dec 2018 20:42:09 +0100
Subject: [PATCH] Warn for `use_dis_max` in `multi_match`

The rest parameter is already deprecated at least since 6.0, we should also add
a warnign when the parameter gets used via the query DSL.

Relates to #36488
---
 .../index/query/MultiMatchQueryBuilder.java      |  2 +-
 .../index/query/MultiMatchQueryBuilderTests.java | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
index 01580201911d5..fe3a4be57fbb0 100644
--- a/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
@@ -67,7 +67,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatchQuery
     private static final ParseField LENIENT_FIELD = new ParseField("lenient");
     private static final ParseField CUTOFF_FREQUENCY_FIELD = new ParseField("cutoff_frequency");
     private static final ParseField TIE_BREAKER_FIELD = new ParseField("tie_breaker");
-    private static final ParseField USE_DIS_MAX_FIELD = new ParseField("use_dis_max");
+    private static final ParseField USE_DIS_MAX_FIELD = new ParseField("use_dis_max").withAllDeprecated("use tie_breaker instead");
     private static final ParseField FUZZY_REWRITE_FIELD = new ParseField("fuzzy_rewrite");
     private static final ParseField MINIMUM_SHOULD_MATCH_FIELD = new ParseField("minimum_should_match");
     private static final ParseField OPERATOR_FIELD = new ParseField("operator");
diff --git a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
index 0c27b7c39cf65..4dce3fd53b71b 100644
--- a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
@@ -124,9 +124,6 @@ protected MultiMatchQueryBuilder doCreateTestQueryBuilder() {
         if (randomBoolean()) {
             query.fuzzyRewrite(getRandomRewriteMethod());
         }
-        if (randomBoolean()) {
-            query.useDisMax(randomBoolean());
-        }
         if (randomBoolean()) {
             query.tieBreaker(randomFloat());
         }
@@ -476,6 +473,19 @@ public void testWithStopWords() throws Exception {
         assertEquals(expected, query);
     }
 
+    public void testDisMaxDeprecation() throws Exception {
+        String json =
+                "{\n" +
+                "  \"multi_match\" : {\n" +
+                "    \"query\" : \"foo:bar\",\n" +
+                "    \"use_dis_max\" : true\n" +
+                "  }\n" +
+                "}";
+
+        parseQuery(json);
+        assertWarnings("Deprecated field [use_dis_max] used, replaced by [use tie_breaker instead]");
+    }
+
     private static IndexMetaData newIndexMeta(String name, Settings oldIndexSettings, Settings indexSettings) {
         Settings build = Settings.builder().put(oldIndexSettings)
             .put(indexSettings)