DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-15 12:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix content negotiation for /vets

Browse source 
See gh-326
This commit is contained in:
Aiden-at-508687582768 2018-05-27 01:40:43 -04:00 committed by Stephane Nicoll
parent 6905e38c1f
commit 8eb5074770
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/springframework/samples/petclinic/vet/VetController.java
View file

@ -48,7 +48,7 @@ class VetController {
return "vets/vetList";
}
@GetMapping({ "/vets.json", "/vets.xml" })
@GetMapping({ "/vets" })
public @ResponseBody Vets showResourcesVetList() {
// Here we are returning an object of type 'Vets' rather than a collection of Vet
// objects so it is simpler for JSon/Object mapping

3
src/main/resources/templates/vets/vetList.html
View file

@ -26,8 +26,7 @@
<table class="table-buttons">
<tr>
<td><a th:href="@{/vets.xml}">View as XML</a></td>
<td><a th:href="@{/vets.json}">View as JSON</a></td>
<td><a th:href="@{/vets}">View as XML</a></td>
</tr>
</table>

4
src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
View file

@ -65,7 +65,7 @@ public class VetControllerTests {
@Test
public void testShowResourcesVetList() throws Exception {
ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON))
ResultActions actions = mockMvc.perform(get("/vets").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
actions.andExpect(content().contentType("application/json;charset=UTF-8"))
.andExpect(jsonPath("$.vetList[0].id").value(1));
@ -73,7 +73,7 @@ public class VetControllerTests {
@Test
public void testShowVetListXml() throws Exception {
mockMvc.perform(get("/vets.xml").accept(MediaType.APPLICATION_XML))
mockMvc.perform(get("/vets").accept(MediaType.APPLICATION_XML))
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_XML_VALUE))
.andExpect(content().node(hasXPath("/vets/vetList[id=1]/id")));