From 080a2f5c3bc67d13bc61e8a0664e6ae0fe68da01 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 28 May 2019 10:58:23 +0100 Subject: [PATCH] =?UTF-8?q?Align=20with=20Framework=E2=80=99s=20removal=20?= =?UTF-8?q?of=20charset=20attribute=20from=20application/json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-16979 --- .../servlet/CloudFoundryActuatorAutoConfigurationTests.java | 5 ++--- .../servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java | 4 ++-- .../java/sample/hateoas/SampleHateoasApplicationTests.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java index 1b113bfbd32..610af2f6e10 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java @@ -110,9 +110,8 @@ public class CloudFoundryActuatorAutoConfigurationTests { "vcap.application.cf_api:https://my-cloud-controller.com") .run((context) -> { MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); - mockMvc.perform(get("/cloudfoundryapplication")) - .andExpect(header().string("Content-Type", - ActuatorMediaType.V2_JSON + ";charset=UTF-8")); + mockMvc.perform(get("/cloudfoundryapplication")).andExpect( + header().string("Content-Type", ActuatorMediaType.V2_JSON)); }); } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java index 37917941eff..f6de85b4b77 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java @@ -44,8 +44,8 @@ public class WebMvcTestHateoasIntegrationTests { @Test public void plainResponse() throws Exception { - this.mockMvc.perform(get("/hateoas/plain")).andExpect(header() - .string(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8")); + this.mockMvc.perform(get("/hateoas/plain")) + .andExpect(header().string(HttpHeaders.CONTENT_TYPE, "application/json")); } @Test diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java index 7ee25425220..0d429928931 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java @@ -56,7 +56,7 @@ class SampleHateoasApplicationTests { HttpMethod.GET, request, String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(response.getHeaders().getContentType()) - .isEqualTo(MediaType.parseMediaType("application/json;charset=UTF-8")); + .isEqualTo(MediaType.parseMediaType("application/json")); } }