Spring/spring-hateoas-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop UTF8 charset extension.

Browse Source
This commit is contained in:
Greg Turnquist
2019-08-20 13:41:18 -05:00
parent 5bc20d4ab1
commit c118a4d1eb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basics/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
View File

@@ -59,7 +59,7 @@ public class EmployeeControllerTests {
mvc.perform(get("/employees").accept(MediaTypes.HAL_JSON_VALUE)) //
.andDo(print()) //
.andExpect(status().isOk()) //
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE + ";charset=UTF-8"))
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE))
.andExpect(jsonPath("$._embedded.employees[0].id", is(1)))
.andExpect(jsonPath("$._embedded.employees[0].firstName", is("Frodo")))
.andExpect(jsonPath("$._embedded.employees[0].lastName", is("Baggins")))

8
pom.xml
View File

@@ -53,7 +53,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -72,8 +72,8 @@
<java.version>1.8</java.version>
<evo.version>1.2.2</evo.version>
<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
<!--<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>-->
<!--<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>-->
</properties>
<profiles>
@@ -90,7 +90,7 @@
</repository>
</repositories>
</profile>
</profiles>
<developers>

2
simplified/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
View File

@@ -57,7 +57,7 @@ public class EmployeeControllerTests {
mvc.perform(get("/employees").accept(MediaTypes.HAL_JSON_VALUE)) //
.andDo(print()) //
.andExpect(status().isOk()) //
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_UTF8_VALUE))
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE))
.andExpect(jsonPath("$._embedded.employees[0].id", is(1)))
.andExpect(jsonPath("$._embedded.employees[0].firstName", is("Frodo")))
.andExpect(jsonPath("$._embedded.employees[0].lastName", is("Baggins")))