root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Align with Framework’s removal of charset attribute from application/json 

Closes gh-16979
This commit is contained in:
Andy Wilkinson 2019-05-28 10:58:23 +01:00
parent 892e517c21
commit 080a2f5c3b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java
View File

@ -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));
});
}

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestHateoasIntegrationTests.java
View File

@ -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

2
spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java
View File

@ -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"));
}
}