diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ParametrizedFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ParametrizedFieldMapper.java index 9486ff854920b..530d8c2e3adb4 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ParametrizedFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ParametrizedFieldMapper.java @@ -105,13 +105,15 @@ protected final void mergeOptions(FieldMapper other, List conflicts) { @Override public final XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - builder.startObject(simpleName()); + return super.toXContent(builder, params); + } + + @Override + protected final void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException { builder.field("type", contentType()); - boolean includeDefaults = params.paramAsBoolean("include_defaults", false); getMergeBuilder().toXContent(builder, includeDefaults); multiFields.toXContent(builder, params); copyTo.toXContent(builder, params); - return builder.endObject(); } /**