rebase old PR to master. initial round of updates

Author: nknize

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

@@ -294,8 +294,7 @@ protected static List<List<List<GeoPoint>>> parseMultiPolygon(XContentParser par
         return polygons;
     }
 
-    public static GeoPolygonQueryBuilder fromXContent(QueryParseContext parseContext) throws IOException {
-        XContentParser parser = parseContext.parser();
+    public static GeoPolygonQueryBuilder fromXContent(XContentParser parser) throws IOException {
         String fieldName = null;
 
         List shell = null;
@@ -322,7 +321,7 @@ public static GeoPolygonQueryBuilder fromXContent(QueryParseContext parseContext
                             while ((token = parser.nextToken()) != Token.END_ARRAY) {
                                 shell.add(GeoUtils.parseGeoPoint(parser));
                             }
-                        } else if (parseContext.getParseFieldMatcher().match(currentFieldName, MULTIPOLYGON_FIELD)) {
+                        } else if (MULTIPOLYGON_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
                             // parse a multipolygon as defined in the GeoJSON spec
                             //   Note: shape validation is not performed, possible todo but perhaps overkill
                             shell = parseMultiPolygon(parser);

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

@@ -196,15 +196,31 @@ public void testParsingAndToQuery4() throws IOException {
     }
 
     public void testParsingAndToQuery5() throws IOException {
-        assumeTrue("test runs only when at least a type is registered", getCurrentTypes().length > 0);
         String query = "{\n" +
             "    \"geo_polygon\":{\n" +
             "        \"" + GEO_POINT_FIELD_NAME + "\":{\n" +
-            "            \"multipolygon\":[ [ [\n" +
-            "                [-70, 40],\n" +
-            "                [-80, 30],\n" +
-            "                [-90, 20]\n" +
-            "            ] ] ]\n" +
+            "            \"multipolygon\":[\n" +
+            "                [\n" +
+            "                  [[-70, 40],\n" +
+            "                  [-80, 30],\n" +
+            "                  [-90, 20]]\n" +
+            "                ],\n" +
+            "                [\n" +
+            "                  [[70, 40],\n" +
+            "                  [80, 30],\n" +
+            "                  [90, 20]]\n" +
+            "                ],\n" +
+            "                [\n" +
+            "                  [[-10, -10],\n" +
+            "                  [10, -10],\n" +
+            "                  [10, 10],\n" +
+            "                  [-10, 10]],\n" +
+            "                  [[-5, -5],\n" +
+            "                  [5, -5],\n" +
+            "                  [5, 5],\n" +
+            "                  [-5, 5]]\n" +
+            "                ]\n" +
+            "            ]\n" +
             "        }\n" +
             "    }\n" +
             "}\n";