From d633130e1bbc6ad3965b0c7d006dd62bef0b6629 Mon Sep 17 00:00:00 2001
From: Julie Tibshirani <julie.tibshirani@elastic.co>
Date: Fri, 27 Apr 2018 09:47:11 -0700
Subject: [PATCH] Convert FieldCapabilitiesResponse to a ToXContentObject.
 (#30182)

---
 .../action/fieldcaps/FieldCapabilitiesResponse.java |  9 +++++----
 .../rest/action/RestFieldCapabilitiesAction.java    | 13 +------------
 .../fieldcaps/FieldCapabilitiesResponseTests.java   |  4 +---
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java
index 5e2202ac073af..959b4e572b714 100644
--- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java
@@ -26,7 +26,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
+import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
@@ -41,7 +41,7 @@
 /**
  * Response for {@link FieldCapabilitiesRequest} requests.
  */
-public class FieldCapabilitiesResponse extends ActionResponse implements ToXContentFragment {
+public class FieldCapabilitiesResponse extends ActionResponse implements ToXContentObject {
     private static final ParseField FIELDS_FIELD = new ParseField("fields");
 
     private Map<String, Map<String, FieldCapabilities>> responseMap;
@@ -123,8 +123,9 @@ private static void writeField(StreamOutput out,
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.field(FIELDS_FIELD.getPreferredName(), responseMap);
-        return builder;
+        return builder.startObject()
+            .field(FIELDS_FIELD.getPreferredName(), responseMap)
+            .endObject();
     }
 
     public static FieldCapabilitiesResponse fromXContent(XContentParser parser) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java
index b2aac8d50ea08..4c477334265f6 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java
@@ -81,17 +81,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request,
         fieldRequest.indicesOptions(
             IndicesOptions.fromRequest(request, fieldRequest.indicesOptions())
         );
-        return channel -> client.fieldCaps(fieldRequest,
-            new RestBuilderListener<FieldCapabilitiesResponse>(channel) {
-            @Override
-            public RestResponse buildResponse(FieldCapabilitiesResponse response,
-                                              XContentBuilder builder) throws Exception {
-                RestStatus status = OK;
-                builder.startObject();
-                response.toXContent(builder, request);
-                builder.endObject();
-                return new BytesRestResponse(status, builder);
-            }
-        });
+        return channel -> client.fieldCaps(fieldRequest, new RestToXContentListener<>(channel));
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
index c8bd5d5188b67..61556fd9b28ed 100644
--- a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
+++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
@@ -110,10 +110,8 @@ protected Predicate<String> getRandomFieldsExcludeFilter() {
     public void testToXContent() throws IOException {
         FieldCapabilitiesResponse response = createSimpleResponse();
 
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON)
-            .startObject();
+        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
         response.toXContent(builder, ToXContent.EMPTY_PARAMS);
-        builder.endObject();
 
         String generatedResponse = BytesReference.bytes(builder).utf8ToString();
         assertEquals((