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

Merge branch '2.1.x'

Browse Source 
Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java
View File

@@ -48,8 +48,7 @@ public class CustomerController {
@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
HttpEntity<CollectionModel<Customer>> showCustomers() {
CollectionModel<Customer> resources = new CollectionModel<>(
this.repository.findAll());
CollectionModel<Customer> resources = new CollectionModel<>(this.repository.findAll());
resources.add(this.entityLinks.linkToCollectionResource(Customer.class));
return new ResponseEntity<>(resources, HttpStatus.OK);
}

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

@@ -39,11 +39,9 @@ class SampleHateoasApplicationTests {
@Test
void hasHalLinks() {
ResponseEntity<String> entity = this.restTemplate.getForEntity("/customers/1",
String.class);
ResponseEntity<String> entity = this.restTemplate.getForEntity("/customers/1", String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(entity.getBody()).startsWith(
"{\"id\":1,\"firstName\":\"Oliver\"" + ",\"lastName\":\"Gierke\"");
assertThat(entity.getBody()).startsWith("{\"id\":1,\"firstName\":\"Oliver\"" + ",\"lastName\":\"Gierke\"");
assertThat(entity.getBody()).contains("_links\":{\"self\":{\"href\"");
}
@@ -52,11 +50,10 @@ class SampleHateoasApplicationTests {
HttpHeaders headers = new HttpHeaders();
headers.set(HttpHeaders.ACCEPT, "application/xml;q=0.9,application/json;q=0.8");
HttpEntity<?> request = new HttpEntity<>(headers);
ResponseEntity<String> response = this.restTemplate.exchange("/customers/1",
HttpMethod.GET, request, String.class);
ResponseEntity<String> response = this.restTemplate.exchange("/customers/1", HttpMethod.GET, request,
String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(response.getHeaders().getContentType())
.isEqualTo(MediaType.parseMediaType("application/json"));
assertThat(response.getHeaders().getContentType()).isEqualTo(MediaType.parseMediaType("application/json"));
}
}