From 8eb5074770eb8d943e0aee0bcdc28f62149e7344 Mon Sep 17 00:00:00 2001
From: Aiden-at-508687582768 <aidenchiavatti@gmail.com>
Date: Sun, 27 May 2018 01:40:43 -0400
Subject: [PATCH] Fix content negotiation for /vets
See gh-326
---
.../springframework/samples/petclinic/vet/VetController.java | 2 +-
src/main/resources/templates/vets/vetList.html | 3 +--
.../samples/petclinic/vet/VetControllerTests.java | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
index 7ce8374..562bbfc 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
@@ -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
diff --git a/src/main/resources/templates/vets/vetList.html b/src/main/resources/templates/vets/vetList.html
index 842411e..4c1c1c9 100644
--- a/src/main/resources/templates/vets/vetList.html
+++ b/src/main/resources/templates/vets/vetList.html
@@ -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>
diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
index ce6adf8..bc3b6c0 100644
--- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
@@ -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")));
--
GitLab