msm can be string or number

Author: romseygeek

server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java

@@ -284,7 +284,8 @@ private static void doXArrayContent(ParseField field, List<QueryBuilder> clauses
         PARSER.declareObjectArray((builder, clauses) -> clauses.forEach(builder::filter), (p, c) -> parseInnerQueryBuilder(p),
             FILTER);
         PARSER.declareBoolean(BoolQueryBuilder::adjustPureNegative, ADJUST_PURE_NEGATIVE);
-        PARSER.declareString(BoolQueryBuilder::minimumShouldMatch, MINIMUM_SHOULD_MATCH);
+        PARSER.declareField(BoolQueryBuilder::minimumShouldMatch, (p, c) -> p.text(),
+            MINIMUM_SHOULD_MATCH, ObjectParser.ValueType.VALUE);
         PARSER.declareString(BoolQueryBuilder::queryName, NAME_FIELD);
         PARSER.declareFloat(BoolQueryBuilder::boost, BOOST_FIELD);
     }

server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java

@@ -277,6 +277,12 @@ public void testFromJson() throws IOException {
         assertEquals(query, "kimchy", ((TermQueryBuilder)queryBuilder.must().get(0)).value());
     }
 
+    public void testMinimumShouldMatchNumber() throws IOException {
+        String query = "{\"bool\" : {\"must\" : { \"term\" : { \"field\" : \"value\" } }, \"minimum_should_match\" : 1 } }";
+        BoolQueryBuilder builder = (BoolQueryBuilder) parseQuery(query);
+        assertEquals("1", builder.minimumShouldMatch());
+    }
+
     /**
      * test that unknown query names in the clauses throw an error
      */