2 files changed, 11 insertions, 9 deletions
diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java
index da52358d3c..958b9e5222 100644
--- a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java
+++ b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java
@@ -23,6 +23,7 @@ import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.test.ESTestCase;
@@ -92,7 +93,8 @@ public class RestAnalyzeActionTests extends ESTestCase {
 
     public void testParseXContentForAnalyzeRequestWithInvalidJsonThrowsException() throws Exception {
         RestAnalyzeAction action = new RestAnalyzeAction(Settings.EMPTY, mock(RestController.class));
-        RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray("{invalid_json}")).build();
+        RestRequest request = new FakeRestRequest.Builder(xContentRegistry())
+            .withContent(new BytesArray("{invalid_json}"), XContentType.JSON).build();
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> action.handleRequest(request, null, null));
         assertThat(e.getMessage(), equalTo("Failed to parse request body"));
     }
diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java b/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java
index 38ed76cae5..4f7bc1bedd 100644
--- a/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java
+++ b/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java
@@ -104,35 +104,35 @@ public class RestTableTests extends ESTestCase {
     }
 
     public void testThatWeUseTheAcceptHeaderJson() throws Exception {
-        assertResponse(Collections.singletonMap(ACCEPT, APPLICATION_JSON),
+        assertResponse(Collections.singletonMap(ACCEPT, Collections.singletonList(APPLICATION_JSON)),
                 APPLICATION_JSON,
                 JSON_TABLE_BODY);
     }
 
     public void testThatWeUseTheAcceptHeaderYaml() throws Exception {
-        assertResponse(Collections.singletonMap(ACCEPT, APPLICATION_YAML),
+        assertResponse(Collections.singletonMap(ACCEPT, Collections.singletonList(APPLICATION_YAML)),
                 APPLICATION_YAML,
                 YAML_TABLE_BODY);
     }
 
     public void testThatWeUseTheAcceptHeaderSmile() throws Exception {
-        assertResponseContentType(Collections.singletonMap(ACCEPT, APPLICATION_SMILE),
+        assertResponseContentType(Collections.singletonMap(ACCEPT, Collections.singletonList(APPLICATION_SMILE)),
                 APPLICATION_SMILE);
     }
 
     public void testThatWeUseTheAcceptHeaderCbor() throws Exception {
-        assertResponseContentType(Collections.singletonMap(ACCEPT, APPLICATION_CBOR),
+        assertResponseContentType(Collections.singletonMap(ACCEPT, Collections.singletonList(APPLICATION_CBOR)),
                 APPLICATION_CBOR);
     }
 
     public void testThatWeUseTheAcceptHeaderText() throws Exception {
-        assertResponse(Collections.singletonMap(ACCEPT, TEXT_PLAIN),
+        assertResponse(Collections.singletonMap(ACCEPT, Collections.singletonList(TEXT_PLAIN)),
                 TEXT_PLAIN,
                 TEXT_TABLE_BODY);
     }
 
     public void testIgnoreContentType() throws Exception {
-        assertResponse(Collections.singletonMap(CONTENT_TYPE, APPLICATION_JSON),
+        assertResponse(Collections.singletonMap(CONTENT_TYPE, Collections.singletonList(APPLICATION_JSON)),
                 TEXT_PLAIN,
                 TEXT_TABLE_BODY);
     }
@@ -252,7 +252,7 @@ public class RestTableTests extends ESTestCase {
         assertEquals(Arrays.asList(1,0,2), rowOrder);
     }
 
-    private RestResponse assertResponseContentType(Map<String, String> headers, String mediaType) throws Exception {
+    private RestResponse assertResponseContentType(Map<String, List<String>> headers, String mediaType) throws Exception {
         FakeRestRequest requestWithAcceptHeader = new FakeRestRequest.Builder(xContentRegistry()).withHeaders(headers).build();
         table.startRow();
         table.addCell("foo");
@@ -274,7 +274,7 @@ public class RestTableTests extends ESTestCase {
         return response;
     }
 
-    private void assertResponse(Map<String, String> headers, String mediaType, String body) throws Exception {
+    private void assertResponse(Map<String, List<String>> headers, String mediaType, String body) throws Exception {
         RestResponse response = assertResponseContentType(headers, mediaType);
         assertThat(response.content().utf8ToString(), equalTo(body));
     }