fixed hash_type and a possible nullref

Author: nyurik

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml

@@ -127,7 +127,7 @@
           aggregations:
             mygrid:
               geohash_grid:
-                type: geohash
+                hash_type: geohash
                 field : location
                 precision : 1
   - match: { hits.total: 6 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java

@@ -111,7 +111,7 @@ public static GeoGridAggregationBuilder parse(String aggregationName, XContentPa
     public GeoGridAggregationBuilder(String name, GeoHashType type) {
         super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
         this.type = type == null ? GeoHashType.DEFAULT : type;
-        this.precision = type.getHandler().getDefaultPrecision();
+        this.precision = this.type.getHandler().getDefaultPrecision();
     }
 
     protected GeoGridAggregationBuilder(GeoGridAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {

server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java

@@ -59,7 +59,7 @@ public static int maxPrecision(GeoHashType type) {
     @Override
     protected GeoGridAggregationBuilder createTestAggregatorBuilder() {
         String name = randomAlphaOfLengthBetween(3, 20);
-        String type = randomBoolean() ? randomType().toString() : null;
+        GeoHashType type = randomBoolean() ? randomType() : null;
         GeoGridAggregationBuilder factory = new GeoGridAggregationBuilder(name, type);
         if (randomBoolean()) {
             factory.precision(randomPrecision(factory.type()));

server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java

@@ -35,7 +35,7 @@ public void testParseValidFromInts() throws Exception {
         GeoHashType type = GeoHashGridTests.randomType();
         int precision = GeoHashGridTests.randomPrecision(type);
         XContentParser stParser = createParser(JsonXContent.jsonXContent,
-                "{\"field\":\"my_loc\", \"type\":\"" + type + "\", \"precision\":" + precision +
+                "{\"field\":\"my_loc\", \"hash_type\":\"" + type + "\", \"precision\":" + precision +
                     ", \"size\": 500, \"shard_size\": 550}");
         XContentParser.Token token = stParser.nextToken();
         assertSame(XContentParser.Token.START_OBJECT, token);
@@ -47,7 +47,7 @@ public void testParseValidFromStrings() throws Exception {
         GeoHashType type = GeoHashGridTests.randomType();
         int precision = GeoHashGridTests.randomPrecision(type);
         XContentParser stParser = createParser(JsonXContent.jsonXContent,
-                "{\"field\":\"my_loc\", \"type\":\"" + type + "\", \"precision\":\"" + precision +
+                "{\"field\":\"my_loc\", \"hash_type\":\"" + type + "\", \"precision\":\"" + precision +
                     "\", \"size\": \"500\", \"shard_size\": \"550\"}");
         XContentParser.Token token = stParser.nextToken();
         assertSame(XContentParser.Token.START_OBJECT, token);
@@ -112,7 +112,7 @@ public void testParseDistanceUnitPrecisionTooSmall() throws Exception {
     public void testParseErrorOnBooleanPrecision() throws Exception {
         GeoHashType type = GeoHashGridTests.randomType();
         XContentParser stParser = createParser(JsonXContent.jsonXContent,
-            "{\"field\":\"my_loc\", \"type\":\"" + type + "\", \"precision\":false}");
+            "{\"field\":\"my_loc\", \"hash_type\":\"" + type + "\", \"precision\":false}");
         XContentParser.Token token = stParser.nextToken();
         assertSame(XContentParser.Token.START_OBJECT, token);
         XContentParseException ex = expectThrows(XContentParseException.class,
@@ -129,7 +129,7 @@ public void testParseErrorOnPrecisionOutOfRange() throws Exception {
         final GeoHashType type = GeoHashGridTests.randomType();
         final int precision = GeoHashGridTests.maxPrecision(type) + 1;
         XContentParser stParser = createParser(JsonXContent.jsonXContent,
-            "{\"field\":\"my_loc\", \"type\":\"" + type + "\", \"precision\":\""+ precision +"\"}");
+            "{\"field\":\"my_loc\", \"hash_type\":\"" + type + "\", \"precision\":\""+ precision +"\"}");
         XContentParser.Token token = stParser.nextToken();
         assertSame(XContentParser.Token.START_OBJECT, token);
         try {