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

Polish text.

Browse Source 
* Replace "mediatype" with "media type".
* Remove usage of "produces" clauses in Spring MVC route definitions, since XML support was removed from Spring HATEOAS.
This commit is contained in:
Greg Turnquist
2019-02-04 11:34:54 -06:00
parent b42758025d
commit dd57e0a515
13 changed files with 47 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
basics/src/main/java/org/springframework/hateoas/examples/EmployeeController.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.hateoas.examples;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.Resource;
import org.springframework.hateoas.Resources;
import org.springframework.http.ResponseEntity;
@@ -47,15 +46,12 @@ class EmployeeController {
* Look up all employees, and transform them into a REST collection resource using
* {@link EmployeeResourceAssembler#toResources(Iterable)}. Then return them through
* Spring Web's {@link ResponseEntity} fluent API.
*
* NOTE: cURL will fetch things as HAL JSON directly, but browsers issue a different
* default accept header, which allows XML to get requested first, so "produces"
* forces it to HAL JSON for all clients.
*/
@GetMapping(value = "/employees", produces = MediaTypes.HAL_JSON_VALUE)
@GetMapping("/employees")
public ResponseEntity<Resources<Resource<Employee>>> findAll() {
return ResponseEntity.ok(
assembler.toResources(repository.findAll()));
this.assembler.toResources(this.repository.findAll()));
}
@@ -64,15 +60,13 @@ class EmployeeController {
* {@link EmployeeResourceAssembler#toResource(Object)}. Then return it through
* Spring Web's {@link ResponseEntity} fluent API.
*
* See {@link #findAll()} to explain {@link GetMapping}'s "produces" argument.
*
* @param id
*/
@GetMapping(value = "/employees/{id}", produces = MediaTypes.HAL_JSON_VALUE)
@GetMapping("/employees/{id}")
public ResponseEntity<Resource<Employee>> findOne(@PathVariable long id) {
return repository.findById(id)
.map(assembler::toResource)
return this.repository.findById(id)
.map(this.assembler::toResource)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}