Mappings: Fix Get field mapping api with pretty flag

Fix two review comments Closes elastic#6552
johtani · Dec 8, 2014 · 75bd751 · 75bd751
1 parent dd58d10
commit 75bd751
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/...va/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java b/...va/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.rest.action.admin.indices.mapping.get;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
@@ -29,7 +28,6 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.*;
 import org.elasticsearch.rest.action.support.RestBuilderListener;
@@ -82,8 +80,7 @@ public RestResponse buildResponse(GetFieldMappingsResponse response, XContentBui
                     status = NOT_FOUND;
                 }
                 builder.startObject();
-                Map<String, String> param = Maps.newHashMap();
-                response.toXContent(builder, new ToXContent.DelegatingMapParams(param, request));
+                response.toXContent(builder, request);
                 builder.endObject();
                 return new BytesRestResponse(status, builder);
             }

diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
@@ -166,7 +166,6 @@ public void simpleGetFieldMappingsWithPretty() throws Exception {
 
         assertTrue(responseStrings.contains("\"mapping\" : {\n"));
 
-        // pretty=false
         params.put("pretty", "false");
 
         response = client().admin().indices().prepareGetFieldMappings("index").setTypes("type").setFields("field1","obj.subfield").get();