Merge pull request #326 from aidenchiavatti:json-fix

* pr/326:
  Polish "Fix content negotiation for /vets"
  Fix content negotiation for /vets

src/main/java/org/springframework/samples/petclinic/vet/VetController.java

 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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

src/main/resources/templates/vets/vetList.html

@@ -23,13 +23,5 @@
       </tr>
     </tbody>
   </table>
-
-  <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>
-    </tr>
-  </table>
-
 </body>
 </html>

src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java

@@ -17,10 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
-import org.springframework.samples.petclinic.vet.Specialty;
-import org.springframework.samples.petclinic.vet.Vet;
-import org.springframework.samples.petclinic.vet.VetController;
-import org.springframework.samples.petclinic.vet.VetRepository;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
@@ -65,15 +61,15 @@ public class VetControllerTests {
 
     @Test
     public void testShowResourcesVetList() throws Exception {
-        ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk());
+        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));
     }
 
     @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")));